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:25:48 UTC

[sling-org-apache-sling-discovery-api] annotated tag org.apache.sling.discovery.api-1.0.2 created (now 07af7aa)

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


      at 07af7aa  (tag)
 tagging bcd9240366ce5610eb6521547baf1d71a1dd19a0 (commit)
      by Carsten Ziegeler
      on Mon Oct 6 16:02:06 2014 +0000

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

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 bcd9240  [maven-release-plugin]  copy for tag org.apache.sling.discovery.api-1.0.2

The 38 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] 02/11: Update to latest parent pom

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

commit cae570942fbab329a5ac44f12924b8a7efbf2e07
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000

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

diff --git a/pom.xml b/pom.xml
index a6f875e..907c7ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>16</version>
+        <version>17</version>
         <relativePath>../../../parent/pom.xml</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/11: Update to parent pom 18

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

commit 9b4bb482dff391ceff2e9cdc8306feb8db7cc427
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000

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

diff --git a/pom.xml b/pom.xml
index 907c7ea..24684c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>17</version>
+        <version>18</version>
         <relativePath>../../../parent/pom.xml</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] 01/11: [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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 8cd352f6af50021f151129276c89a6384390bbe1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 9 13:08:11 2013 +0000

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

diff --git a/pom.xml b/pom.xml
index 79bb295..a6f875e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <artifactId>org.apache.sling.discovery.api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1-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.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.0</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.discovery.api-1.0.0</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] 09/11: Update to Sling Parent POM 22 with baselining enabled

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

commit a71851d3bba76ca649cca92315acdf8e819809d4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000

    Update to Sling Parent POM 22 with baselining enabled
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                    | 2 +-
 src/main/java/org/apache/sling/discovery/package-info.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbc12e2..7347f6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>20</version>
+        <version>22</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/src/main/java/org/apache/sling/discovery/package-info.java b/src/main/java/org/apache/sling/discovery/package-info.java
index 387bb0f..b7e26d4 100644
--- a/src/main/java/org/apache/sling/discovery/package-info.java
+++ b/src/main/java/org/apache/sling/discovery/package-info.java
@@ -23,7 +23,7 @@
  *
  * @version 1.0
  */
-@Version("1.0")
+@Version("1.0.2")
 package org.apache.sling.discovery;
 
 import aQute.bnd.annotation.Version;

-- 
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/11: SLING-3164 : deprecating ClusterView.getId - and adjusting the javadoc accordingly

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

commit 29d5b53de4526ea221fd085d7f49b2af1f7697dd
Author: Stefan Egli <st...@apache.org>
AuthorDate: Mon Oct 14 09:25:32 2013 +0000

    SLING-3164 : deprecating ClusterView.getId - and adjusting the javadoc accordingly
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1531829 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 2b3c75e..07d5f7f 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -32,8 +32,20 @@ import aQute.bnd.annotation.ProviderType;
 public interface ClusterView {
 
 	/**
-	 * Returns an id of this cluster view
+	 * Returns an id of this cluster view.
+	 * <p>
+	 * Note that this id is not guaranteed to be stable between
+	 * instances of ClusterViews. The id is identifying only the
+	 * current view of the cluster, not the cluster itself, and 
+	 * thus if the view changes the id might (or might not) change.
 	 * @return an id of this cluster view
+	 * @deprecated due to the unstable nature of this id - it only
+	 * identifies the current view of the cluster, not the cluster
+	 * itself - this id has been deprecated. If an id of the cluster
+	 * itself is needed, this must be dealt with on an application
+	 * level - for example by letting the cluster leader define
+	 * such an id and taking care of special cases like cluster joins.
+	 * @see <a href="http://issues.apache.org/jira/browse/SLING-3164">SLING-3164</a>
 	 */
     String getId();
 

-- 
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/11: [maven-release-plugin] prepare release org.apache.sling.discovery.api-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.api-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

commit 6664e6d35f7309a96719c8927d95afdb599a5ab2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Oct 6 16:01:48 2014 +0000

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

diff --git a/pom.xml b/pom.xml
index 7347f6d..3a3e892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <artifactId>org.apache.sling.discovery.api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2</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.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>
     </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] 03/11: Add ProviderType and ConsumerType annotations

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

commit 1a15a279f07aa7a439b81d086d31e0697dc68f3d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 09:11:41 2013 +0000

    Add ProviderType and ConsumerType annotations
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1520520 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/discovery/ClusterView.java           | 3 +++
 src/main/java/org/apache/sling/discovery/DiscoveryService.java      | 5 ++++-
 src/main/java/org/apache/sling/discovery/InstanceDescription.java   | 3 +++
 src/main/java/org/apache/sling/discovery/InstanceFilter.java        | 3 +++
 src/main/java/org/apache/sling/discovery/PropertyProvider.java      | 3 +++
 src/main/java/org/apache/sling/discovery/TopologyEventListener.java | 3 +++
 src/main/java/org/apache/sling/discovery/TopologyView.java          | 3 +++
 7 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 64744a1..2b3c75e 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -20,12 +20,15 @@ package org.apache.sling.discovery;
 
 import java.util.List;
 
+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>
  * A ClusterView can also consist of just one single instance.
  */
+@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 3ef52f3..8ad7fa6 100644
--- a/src/main/java/org/apache/sling/discovery/DiscoveryService.java
+++ b/src/main/java/org/apache/sling/discovery/DiscoveryService.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * The discovery service can be used to get the current topology view.
  * <p>
@@ -26,8 +28,9 @@ package org.apache.sling.discovery;
  * 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. 
+ * 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/InstanceDescription.java b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
index 5baa752..9cde2cf 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceDescription.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceDescription.java
@@ -20,6 +20,8 @@ package org.apache.sling.discovery;
 
 import java.util.Map;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * An InstanceDescription represents and contains information about an
  * instance that is part of a TopologyView.
@@ -30,6 +32,7 @@ import java.util.Map;
  *
  * @see TopologyView
  */
+@ProviderType
 public interface InstanceDescription {
 
     /**
diff --git a/src/main/java/org/apache/sling/discovery/InstanceFilter.java b/src/main/java/org/apache/sling/discovery/InstanceFilter.java
index a6e5a51..f25b771 100644
--- a/src/main/java/org/apache/sling/discovery/InstanceFilter.java
+++ b/src/main/java/org/apache/sling/discovery/InstanceFilter.java
@@ -18,11 +18,14 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ConsumerType;
+
 /**
  * Used to filter InstanceDescriptions in a TopologyView.
  * <p>
  * @see DiscoveryService#findInstances(InstanceFilter)
  */
+@ConsumerType
 public interface InstanceFilter {
 
 	/**
diff --git a/src/main/java/org/apache/sling/discovery/PropertyProvider.java b/src/main/java/org/apache/sling/discovery/PropertyProvider.java
index 2fa21f8..c4b292c 100644
--- a/src/main/java/org/apache/sling/discovery/PropertyProvider.java
+++ b/src/main/java/org/apache/sling/discovery/PropertyProvider.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ConsumerType;
+
 
 /**
  * The <code>PropertyProvider</code> service interface may be implemented by
@@ -30,6 +32,7 @@ package org.apache.sling.discovery;
  * change, the service registration of the provider should be updated.
  * This avoids periodic polling for changes.
  */
+@ConsumerType
 public interface PropertyProvider {
 
     /**
diff --git a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
index aed95c6..8e199ce 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
@@ -18,6 +18,8 @@
  */
 package org.apache.sling.discovery;
 
+import aQute.bnd.annotation.ConsumerType;
+
 /**
  * The <code>TopologyEventListener</code> service interface may be implemented by
  * components interested in being made aware of changes in the topology.
@@ -25,6 +27,7 @@ package org.apache.sling.discovery;
  * Upon registration and whenever changes in the topology occur, this
  * service is informed.
  */
+@ConsumerType
 public interface TopologyEventListener {
 
 	/**
diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java b/src/main/java/org/apache/sling/discovery/TopologyView.java
index cc143ce..b76695a 100644
--- a/src/main/java/org/apache/sling/discovery/TopologyView.java
+++ b/src/main/java/org/apache/sling/discovery/TopologyView.java
@@ -20,11 +20,14 @@ package org.apache.sling.discovery;
 
 import java.util.Set;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * A topology view is a cross-cluster list of instances and clusters
  * that have announced themselves with the DiscoveryService.
  *
  */
+@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] 07/11: Update to parent pom v19

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

commit 19037242ed5633d3a333ce55d1cf379934c89648
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000

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

diff --git a/pom.xml b/pom.xml
index 24684c3..096cdf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>18</version>
+        <version>19</version>
         <relativePath>../../../parent/pom.xml</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/11: Updated to parent version 20

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

commit c7dc67b6c2ae55c5c1e920ae04631b49609bb5dd
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000

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

diff --git a/pom.xml b/pom.xml
index 096cdf3..cbc12e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>19</version>
+        <version>20</version>
         <relativePath>../../../parent/pom.xml</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] 06/11: SLING-3164 : reverting deprecation of getId and instead adjusted javadoc to reflect the fact that the cluster id is stable

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

commit 818f0841265663e8adb8adc5bccfb92c59678a3c
Author: Stefan Egli <st...@apache.org>
AuthorDate: Thu Oct 31 10:33:58 2013 +0000

    SLING-3164 : reverting deprecation of getId and instead adjusted javadoc to reflect the fact that the cluster id is stable
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/api@1537429 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/discovery/ClusterView.java    | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/apache/sling/discovery/ClusterView.java b/src/main/java/org/apache/sling/discovery/ClusterView.java
index 07d5f7f..f50612b 100644
--- a/src/main/java/org/apache/sling/discovery/ClusterView.java
+++ b/src/main/java/org/apache/sling/discovery/ClusterView.java
@@ -32,20 +32,25 @@ import aQute.bnd.annotation.ProviderType;
 public interface ClusterView {
 
 	/**
-	 * Returns an id of this cluster view.
+	 * Returns a stable id of the cluster represented by this
+	 * cluster view.
 	 * <p>
-	 * Note that this id is not guaranteed to be stable between
-	 * instances of ClusterViews. The id is identifying only the
-	 * current view of the cluster, not the cluster itself, and 
-	 * thus if the view changes the id might (or might not) change.
+	 * 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
-	 * @deprecated due to the unstable nature of this id - it only
-	 * identifies the current view of the cluster, not the cluster
-	 * itself - this id has been deprecated. If an id of the cluster
-	 * itself is needed, this must be dealt with on an application
-	 * level - for example by letting the cluster leader define
-	 * such an id and taking care of special cases like cluster joins.
 	 * @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
 	 */
     String getId();
 

-- 
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/11: [maven-release-plugin] copy for tag org.apache.sling.discovery.api-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.api-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git

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

    [maven-release-plugin]  copy for tag org.apache.sling.discovery.api-1.0.2
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.discovery.api-1.0.2@1629687 13f79535-47bb-0310-9956-ffa450edef68

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