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.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-api.git
commit dec2c41f714d6682a884b5ff4477a5efc581f394 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Apr 17 13:29:05 2013 +0000 Rename "own" to "local" git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/discovery/api@1468904 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/discovery/DiscoveryService.java | 2 +- src/main/java/org/apache/sling/discovery/InstanceDescription.java | 6 +++--- src/main/java/org/apache/sling/discovery/PropertyProvider.java | 2 +- src/main/java/org/apache/sling/discovery/TopologyView.java | 6 ++---- .../org/apache/sling/discovery/impl/NoClusterDiscoveryService.java | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/sling/discovery/DiscoveryService.java b/src/main/java/org/apache/sling/discovery/DiscoveryService.java index e3a4bfd..6e655d0 100644 --- a/src/main/java/org/apache/sling/discovery/DiscoveryService.java +++ b/src/main/java/org/apache/sling/discovery/DiscoveryService.java @@ -43,7 +43,7 @@ public interface DiscoveryService { * <p> * @return the topology that was last discovered by this service. This will never * be null (ie even if a change in the topology is ongoing at the moment or the - * cluster consists only of the own instance). + * cluster consists only of the local instance). */ TopologyView getTopology(); diff --git a/src/main/java/org/apache/sling/discovery/InstanceDescription.java b/src/main/java/org/apache/sling/discovery/InstanceDescription.java index f3ce846..4e471f2 100644 --- a/src/main/java/org/apache/sling/discovery/InstanceDescription.java +++ b/src/main/java/org/apache/sling/discovery/InstanceDescription.java @@ -75,10 +75,10 @@ public interface InstanceDescription { boolean isLeader(); /** - * Determines whether this InstanceDescription is representing myself, ie my own instance. - * @return whether this InstanceDescription is representing myself, ie my own instance + * Determines whether this InstanceDescription is representing the local instance. + * @return whether this InstanceDescription is representing the local instance. */ - boolean isOwn(); + boolean isLocal(); /** * The identifier of the running Sling instance. diff --git a/src/main/java/org/apache/sling/discovery/PropertyProvider.java b/src/main/java/org/apache/sling/discovery/PropertyProvider.java index 6e7aa8e..2fa21f8 100644 --- a/src/main/java/org/apache/sling/discovery/PropertyProvider.java +++ b/src/main/java/org/apache/sling/discovery/PropertyProvider.java @@ -45,7 +45,7 @@ public interface PropertyProvider { * Retrieves a property that is subsequently set on the local instance * and broadcast to the <code>TopologyView</code> instances. * <p> - * These properties are non-persistent and disappear after my own instance goes down. + * These properties are non-persistent and disappear after the local instance goes down. * * @return The value of the property or <code>null</code>. If the property * value can't be provided or if the provider does not support this diff --git a/src/main/java/org/apache/sling/discovery/TopologyView.java b/src/main/java/org/apache/sling/discovery/TopologyView.java index 8b95f79..cc143ce 100644 --- a/src/main/java/org/apache/sling/discovery/TopologyView.java +++ b/src/main/java/org/apache/sling/discovery/TopologyView.java @@ -18,8 +18,6 @@ */ package org.apache.sling.discovery; -import java.util.Collection; -import java.util.List; import java.util.Set; /** @@ -43,7 +41,7 @@ public interface TopologyView { * Provides the InstanceDescription belonging to <b>this</b> instance. * @return the InstanceDescription belonging to <b>this</b> instance */ - InstanceDescription getOwnInstance(); + InstanceDescription getLocalInstance(); /** * Provides the set of InstanceDescriptions in the entire topology, @@ -65,7 +63,7 @@ public interface TopologyView { /** * Provides the collection of ClusterViews. * <p> - * Note that all InstanceDescriptions belong to exactly one ClusterView - + * Note that all InstanceDescriptions belong to exactly one ClusterView - * including InstanceDescriptions that form "a cluster of 1" * @return the set of ClusterViews, without any particular order */ diff --git a/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java b/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java index 555f118..dfb6976 100644 --- a/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java +++ b/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java @@ -103,7 +103,7 @@ public class NoClusterDiscoveryService implements DiscoveryService { logger.debug("NoClusterDiscoveryService started."); final InstanceDescription myDescription = new InstanceDescription() { - public boolean isOwn() { + public boolean isLocal() { return true; } @@ -157,7 +157,7 @@ public class NoClusterDiscoveryService implements DiscoveryService { }; this.topologyView = new TopologyView() { - public InstanceDescription getOwnInstance() { + public InstanceDescription getLocalInstance() { return myDescription; } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
