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:26:00 UTC

[sling-org-apache-sling-discovery-api] annotated tag org.apache.sling.discovery.api-1.0.4 created (now 5e51a5b)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to annotated tag org.apache.sling.discovery.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git.


      at 5e51a5b  (tag)
 tagging 13c4faff36e31f21d8eca756be3853313e741bc4 (commit)
      by Stefan Egli
      on Mon Apr 25 09:15:55 2016 +0000

- Log -----------------------------------------------------------------
org.apache.sling.discovery.api-1.0.4
-----------------------------------------------------------------------

This annotated tag includes the following new commits:

     new d47d840  Add new discovery module
     new f33adec  Move discovery api to a different directory to create a structure as discovery consists of several modules
     new 59f1ac4  Set svn ignore
     new ed21de9  Create own directory for all discovery modules
     new 8bfc63b  Create own directory for all discovery modules
     new 0e6b1ef  Clarify contracts
     new 582ea12  svn:ignore
     new 4a29199  Add standard properties and provide an implementation delivering these properties
     new dec2c41  Rename "own" to "local"
     new 2a2a3e7  Rename DiscoveryAware to TopologyEventListener
     new 57d974d  SLING-2827 : javadoc of Type clarified - plus a source code reformat
     new 5f829a8  SLING-2827 : minor rewordings of javadoc of Type
     new b0584cc  SLING-2827 : a minor javadoc typo
     new 5a71c8a  Move discovery to bundles section
     new e021a7b  Correct reactor pom and update to parent pom 16
     new 4c59ab4  [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0
     new a6fd07a  [maven-release-plugin] rollback the release of org.apache.sling.discovery.api-1.0.0
     new d0efb65  Correct/add scm information
     new df64dab  [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0
     new 5cd0f19  [maven-release-plugin] prepare for next development iteration
     new e1e7e01  Create new standalone module
     new ff0fd1d  Create new standalone project
     new a888d83  Create new standalone project
     new 0306312  Create new standalone module
     new 4073ac9  Fix constant
     new 8e87d4d  SLING-2892 and SLING-2901 : added a javadoc note about the fact that the discovery service fails if it detects duplicate sling.id in a cluster
     new 2a04569  [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.0
     new 8cd352f  [maven-release-plugin] prepare for next development iteration
     new cae5709  Update to latest parent pom
     new 1a15a27  Add ProviderType and ConsumerType annotations
     new 9b4bb48  Update to parent pom 18
     new 29d5b53  SLING-3164 : deprecating ClusterView.getId - and adjusting the javadoc accordingly
     new 818f084  SLING-3164 : reverting deprecation of getId and instead adjusted javadoc to reflect the fact that the cluster id is stable
     new 1903724  Update to parent pom v19
     new c7dc67b  Updated to parent version 20
     new a71851d  Update to Sling Parent POM 22 with baselining enabled
     new 6664e6d  [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.2
     new 7040c12  [maven-release-plugin] prepare for next development iteration
     new 90b0754  SLING-4505 Relative paths has been set to correct value.
     new acce237  SLING-4668 : following clarifying note added to getId: 'Addition in 1.0.4: this id must consist only of alphanumeric characters plus dash '-' and underscore '_'.
     new aab8be3  SLING-4668 sneak-in: pure javadoc reformatting, no text change
     new 72870cb  SLING-4669: add a comment that a cluster consists of instances hooked to the same persistence/repository
     new d61040e  SLING-4684 : Stress that handleTopologyEvent() should be lock-free and terminate quickly
     new 4c3e59c  SLING-4698 - Set parent.relativePath to empty for all modules
     new 062d395  Update to Sling Parent 23
     new 7ae319d  set parent version to 24 and add empty relativePath where missing
     new 30c366d  Update the main reactor to parent 25
     new 2d8213c  Switch to parent pom 26
     new 3927e89  SLING-5683 : moved misleading 'duplicate sling.id' comment of DiscoveryService down to more appropriate ClusterView and TopologyView, changing it to state that each instance must have a unique sling.id - as that is indeed what discovery API wants to ensure/guarantee. Also, added a comment about the fact that no topology assumptions whatsoever can be done between TOPOLOGY_CHANGING and TOPOLOGY_CHANGED. Both aren't meant to change the API really but are rather clarificatio [...]
     new 50ba645  [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.4
     new 13c4faf  [maven-release-plugin] copy for tag org.apache.sling.discovery.api-1.0.4

The 51 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-api] 13/14: [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 50ba645bdf696b55086be95e75b2b4e78df826a1
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Apr 25 09:15:42 2016 +0000

    [maven-release-plugin] prepare release org.apache.sling.discovery.api-1.0.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1740782 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3856c5c..388ede1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,12 @@
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
         <version>26</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.discovery.api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4</version>
 
     <name>Apache Sling Discovery API</name>
     <description>
@@ -37,9 +37,9 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.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-api] 01/14: [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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 7040c123b6653bb7a7b36fbd9bdc5ad8772c3270
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Oct 6 16:02:10 2014 +0000

    [maven-release-plugin] prepare for next development iteration
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1629689 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a3e892..4f6818f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <artifactId>org.apache.sling.discovery.api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
 
     <name>Apache Sling Discovery API</name>
     <description>
@@ -37,9 +37,9 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.2</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api</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-api] 07/14: SLING-4698 - Set parent.relativePath to empty for all modules

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 4c3e59c1e0d388a59140c3387c2f49b63fe679ae
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000

    SLING-4698 - Set parent.relativePath to empty for all modules
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 08b87ff..7e6dbf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
         <version>22</version>
-        <relativePath>../../../../parent/pom.xml</relativePath>
+        <relativePath/>
     </parent>
 
     <artifactId>org.apache.sling.discovery.api</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-discovery-api] 03/14: SLING-4668 : following clarifying note added to getId: 'Addition in 1.0.4: this id must consist only of alphanumeric characters plus dash '-' and underscore '_'.

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit acce2378a9021269c541311542862a97bca07a1b
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Apr 27 13:12:03 2015 +0000

    SLING-4668 : following clarifying note added to getId: 'Addition in 1.0.4: this id must consist only of alphanumeric characters plus dash '-' and underscore '_'.
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1676252 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/discovery/ClusterView.java    | 63 +++++++++++-----------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index f50612b..3914fcf 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -31,27 +31,30 @@ import aQute.bnd.annotation.ProviderType;
 @ProviderType
 public interface ClusterView {
 
-	/**
-	 * Returns a stable id of the cluster represented by this
-	 * cluster view.
-	 * <p>
-	 * Similar to the SlingID, this id is persisted and thus
-	 * remains stable accross instance/cluster restarts.
-	 * <p>
-	 * When an instance joins a cluster, it will inherit
-	 * the id from the joined cluster (thus incurs a cluster id
-	 * change).
-	 * <p>
-	 * Note: When instances part from a cluster (eg due to a network
-	 * partitioning) the cluster id is retained. This results in
-	 * potentially multiple clusters with the same id. This 
-	 * fact could be used to detect such partitioning/split brain
-	 * situations. It also implies though that the cluster id
-	 * is not guaranteed to be unique in a topology!
-	 * @return an id of this cluster view
-	 * @see <a href="http://issues.apache.org/jira/browse/SLING-3164">SLING-3164</a>
-	 * @since exists since 1.0.0 - stable since 1.0.2
-	 */
+    /**
+     * Returns a stable id of the cluster represented by this
+     * cluster view.
+     * <p>
+     * Similar to the SlingID, this id is persisted and thus
+     * remains stable accross instance/cluster restarts.
+     * <p>
+     * When an instance joins a cluster, it will inherit
+     * the id from the joined cluster (thus incurs a cluster id
+     * change).
+     * <p>
+     * Note: When instances part from a cluster (eg due to a network
+     * partitioning) the cluster id is retained. This results in
+     * potentially multiple clusters with the same id. This 
+     * fact could be used to detect such partitioning/split brain
+     * situations. It also implies though that the cluster id
+     * is not guaranteed to be unique in a topology!
+     * <p>
+     * Addition in 1.0.4: this id must consist only of alphanumeric
+     * characters plus dash '-' and underscore '_'.
+     * @return an id of this cluster view
+     * @see <a href="http://issues.apache.org/jira/browse/SLING-3164">SLING-3164</a>
+     * @since exists since 1.0.0 - stable since 1.0.2 - alphanumeric + '_' and'-' since 1.0.4
+     */
     String getId();
 
     /**
@@ -64,14 +67,14 @@ public interface ClusterView {
      */
     List<InstanceDescription> getInstances();
 
-	/**
-	 * Provides the InstanceDescription belonging to the leader instance.
-	 * <p>
-	 * Every ClusterView is guaranteed to have one and only one leader.
-	 * <p>
-	 * The leader is stable: once a leader is elected it stays leader
-	 * unless it leaves the cluster (due to shutdown/crash/network problems)
-	 * @return the InstanceDescription belonging to the leader instance
-	 */
+    /**
+     * Provides the InstanceDescription belonging to the leader instance.
+     * <p>
+     * Every ClusterView is guaranteed to have one and only one leader.
+     * <p>
+     * The leader is stable: once a leader is elected it stays leader
+     * unless it leaves the cluster (due to shutdown/crash/network problems)
+     * @return the InstanceDescription belonging to the leader instance
+     */
     InstanceDescription getLeader();
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-discovery-api] 12/14: SLING-5683 : moved misleading 'duplicate sling.id' comment of DiscoveryService down to more appropriate ClusterView and TopologyView, changing it to state that each instance must have a unique sling.id - as that is indeed what discovery API wants to ensure/guarantee. Also, added a comment about the fact that no topology assumptions whatsoever can be done between TOPOLOGY_CHANGING and TOPOLOGY_CHANGED. Both aren't meant to change the API really but are rather clarifications to better reflec [...]

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 3927e895be6ba932aa199d1ab715cf7af0f01aa7
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Apr 25 09:13:27 2016 +0000

    SLING-5683 : moved misleading 'duplicate sling.id' comment of DiscoveryService down to more appropriate ClusterView and TopologyView, changing it to state that each instance must have a unique sling.id - as that is indeed what discovery API wants to ensure/guarantee. Also, added a comment about the fact that no topology assumptions whatsoever can be done between TOPOLOGY_CHANGING and TOPOLOGY_CHANGED. Both aren't meant to change the API really but are rather clarifications to better r [...]
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1740778 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java      | 3 +++
 src/main/java/org/apache/sling/discovery/DiscoveryService.java | 3 ---
 src/main/java/org/apache/sling/discovery/TopologyEvent.java    | 5 +++++
 src/main/java/org/apache/sling/discovery/TopologyView.java     | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 0e77c48..42f47a1 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -30,6 +30,9 @@ import aQute.bnd.annotation.ProviderType;
  * persistence layer/jcr repository.
  * <p>
  * A ClusterView can also consist of just one single instance.
+ * <p>
+ * All instances in a cluster must and do have a unique sling.id.
+ * @see InstanceDescription#getSlingId()
  */
 @ProviderType
 public interface ClusterView {
diff --git a/src/main/java/org/apache/sling/discovery/DiscoveryService.java b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
index 8ad7fa6..eebf0da 100644
--- a/src/main/java/org/apache/sling/discovery/DiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
@@ -26,9 +26,6 @@ import aQute.bnd.annotation.ProviderType;
  * The discovery service is in charge of managing live instances that
  * have announced themselves as being part of a topology view. The exact
  * details of how this announcement occurs is implementation dependent.
- * <p>
- * Note that the discovery service fails if it detects a situation
- * where more than one instance with the same sling.id exists in a cluster.
  */
 @ProviderType
 public interface DiscoveryService {
diff --git a/src/main/java/org/apache/sling/discovery/TopologyEvent.java b/src/main/java/org/apache/sling/discovery/TopologyEvent.java
index 65dc13f..20180e0 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyEvent.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyEvent.java
@@ -42,6 +42,11 @@ public class TopologyEvent {
          * being discovered. Once the discovery is finished, a TOPOLOGY_CHANGED
          * is sent with the new topology view.
          * <p>
+         * After receiving a TOPOLOGY_CHANGING and before receiving a
+         * TOPOLOGY_CHANGED event a TopologyEventListener cannot make any
+         * assumptions wrt the topology whatsoever, including whether or not 
+         * the local instance is part of it at all (partitioning).
+         * <p>
          * An implementation must always send a TOPOLOGY_CHANGING before a
          * TOPOLOGY_CHANGED.
          */
diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java b/src/main/java/org/apache/sling/discovery/TopologyView.java
index 0352efb..c1f3acb 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyView.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyView.java
@@ -25,7 +25,9 @@ import aQute.bnd.annotation.ProviderType;
 /**
  * A topology view is a cross-cluster list of instances and clusters
  * that have announced themselves with the DiscoveryService.
- *
+ * <p>
+ * All instances in a topology must and do have a unique sling.id.
+ * @see InstanceDescription#getSlingId()
  */
 @ProviderType
 public interface TopologyView {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-discovery-api] 02/14: SLING-4505 Relative paths has been set to correct value.

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 90b075497d971ee18736078c3a961947f9e756a0
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Mar 16 13:22:00 2015 +0000

    SLING-4505 Relative paths has been set to correct value.
    
    Submitted-By: Petr_Shypila <pe...@sap.com>
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1666984 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4f6818f..08b87ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
         <version>22</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.sling.discovery.api</artifactId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-discovery-api] 10/14: Update the main reactor to parent 25

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 30c366d41d9a8308e82d33c529548b78469954ee
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000

    Update the main reactor to parent 25
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 355f42d..500540b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>24</version>
+        <version>25</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-api] 08/14: Update to Sling Parent 23

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 062d395113a364f05688b6b775e18946c8155b53
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000

    Update to Sling Parent 23
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7e6dbf9..a43cdfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>22</version>
+        <version>23</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-api] 04/14: SLING-4668 sneak-in: pure javadoc reformatting, no text change

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit aab8be3b8a41a1bc4cf7612e7fc7949ba40e7ca8
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Apr 27 13:18:29 2015 +0000

    SLING-4668 sneak-in: pure javadoc reformatting, no text change
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1676255 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/discovery/TopologyView.java   | 48 +++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java b/src/main/java/org/apache/sling/discovery/TopologyView.java
index b76695a..0352efb 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyView.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyView.java
@@ -30,21 +30,21 @@ import aQute.bnd.annotation.ProviderType;
 @ProviderType
 public interface TopologyView {
 
-	/**
-	 * Checks if this TopologyView is currently valid - or if the
-	 * service knows of a topology change just going on (or another
-	 * uncertainty about the topology such as IOException etc)
-	 * @return true if this TopologyView is currently valid, false
-	 * if the service knows of a topology change just going on (or
-	 * another issue with discovery like IOException etc)
-	 */
-	boolean isCurrent();
+    /**
+     * Checks if this TopologyView is currently valid - or if the
+     * service knows of a topology change just going on (or another
+     * uncertainty about the topology such as IOException etc)
+     * @return true if this TopologyView is currently valid, false
+     * if the service knows of a topology change just going on (or
+     * another issue with discovery like IOException etc)
+     */
+    boolean isCurrent();
 
-	/**
-	 * Provides the InstanceDescription belonging to <b>this</b> instance.
-	 * @return the InstanceDescription belonging to <b>this</b> instance
-	 */
-	InstanceDescription getLocalInstance();
+    /**
+     * Provides the InstanceDescription belonging to <b>this</b> instance.
+     * @return the InstanceDescription belonging to <b>this</b> instance
+     */
+    InstanceDescription getLocalInstance();
 
     /**
      * Provides the set of InstanceDescriptions in the entire topology,
@@ -52,16 +52,16 @@ public interface TopologyView {
      * @return the set of InstanceDescriptions in the entire topology,
      * without any particular order
      */
-	Set<InstanceDescription> getInstances();
+    Set<InstanceDescription> getInstances();
 
-	/**
-	 * Searches through this topology and picks those accepted by the provided
-	 * <code>InstanceFilter</code> - and returns them without any particular order
-	 * @param filter the filter to use
-	 * @return the set of InstanceDescriptions which were accepted by the InstanceFilter,
-	 * without any particular order
-	 */
-	Set<InstanceDescription> findInstances(InstanceFilter filter);
+    /**
+     * Searches through this topology and picks those accepted by the provided
+     * <code>InstanceFilter</code> - and returns them without any particular order
+     * @param filter the filter to use
+     * @return the set of InstanceDescriptions which were accepted by the InstanceFilter,
+     * without any particular order
+     */
+    Set<InstanceDescription> findInstances(InstanceFilter filter);
 
     /**
      * Provides the collection of ClusterViews.
@@ -70,5 +70,5 @@ public interface TopologyView {
      * including InstanceDescriptions that form "a cluster of 1"
      * @return the set of ClusterViews, without any particular order
      */
-	Set<ClusterView> getClusterViews();
+    Set<ClusterView> getClusterViews();
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-discovery-api] 11/14: 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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 2d8213c79da151967660af7398b4cdb6233cb510
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/api@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 500540b..3856c5c 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-api] 14/14: [maven-release-plugin] copy for tag org.apache.sling.discovery.api-1.0.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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 13c4faff36e31f21d8eca756be3853313e741bc4
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Apr 25 09:15:55 2016 +0000

    [maven-release-plugin] copy for tag org.apache.sling.discovery.api-1.0.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.4@1740783 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-api] 06/14: SLING-4684 : Stress that handleTopologyEvent() should be lock-free and terminate quickly

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit d61040e8174cde8a7dd027a5fa505fc4282e41e0
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Apr 30 10:25:07 2015 +0000

    SLING-4684 : Stress that handleTopologyEvent() should be lock-free and terminate quickly
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1676949 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/TopologyEventListener.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
index 8e199ce..71e1ff2 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
@@ -34,6 +34,10 @@ public interface TopologyEventListener {
 	 * Inform the service about an event in the topology - or in the discovery
 	 * of the topology.
 	 * <p>
+	 * Implementors of this method must ensure that this method returns quickly
+	 * and that no locks are being acquired that could cause deadlocks (ie the
+	 * framework might call this method holding locks).
+	 * <p>
 	 * The <code>TopologyEvent</code> contains details about what changed.
 	 * The supported event types are:
 	 * <ul>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-discovery-api] 09/14: set parent version to 24 and add empty relativePath where missing

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 7ae319d9935f1bcf507f187796909da4e88b0f1c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000

    set parent version to 24 and add empty relativePath where missing
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a43cdfb..355f42d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>23</version>
+        <version>24</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-api] 05/14: SLING-4669: add a comment that a cluster consists of instances hooked to the same persistence/repository

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.api-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 72870cb9043fb38222825923eaeb53c724c06364
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Apr 27 13:23:12 2015 +0000

    SLING-4669: add a comment that a cluster consists of instances hooked to the same persistence/repository
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1676256 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 3914fcf..0e77c48 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -26,6 +26,9 @@ import aQute.bnd.annotation.ProviderType;
  * A ClusterView represents the instances of a cluster that are
  * up and running and that all can see each other at a certain point in time.
  * <p>
+ * 'Seeing each other'/A cluster refers to being hooked to the same underlying
+ * persistence layer/jcr repository.
+ * <p>
  * A ClusterView can also consist of just one single instance.
  */
 @ProviderType

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.