Author: cziegeler
Date: Wed Apr 17 13:29:05 2013
New Revision: 1468904
URL: http://svn.apache.org/r1468904
Log:
Rename "own" to "local"
Modified:
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java
Modified:
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java?rev=1468904&r1=1468903&r2=1468904&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
(original)
+++
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
Wed Apr 17 13:29:05 2013
@@ -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();
Modified:
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java?rev=1468904&r1=1468903&r2=1468904&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
(original)
+++
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
Wed Apr 17 13:29:05 2013
@@ -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.
Modified:
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java?rev=1468904&r1=1468903&r2=1468904&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
(original)
+++
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
Wed Apr 17 13:29:05 2013
@@ -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
Modified:
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java?rev=1468904&r1=1468903&r2=1468904&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
(original)
+++
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
Wed Apr 17 13:29:05 2013
@@ -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
*/
Modified:
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java?rev=1468904&r1=1468903&r2=1468904&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java
(original)
+++
sling/trunk/contrib/extensions/discovery/api/src/main/java/org/apache/sling/discovery/impl/NoClusterDiscoveryService.java
Wed Apr 17 13:29:05 2013
@@ -103,7 +103,7 @@ public class NoClusterDiscoveryService i
logger.debug("NoClusterDiscoveryService started.");
final InstanceDescription myDescription = new InstanceDescription() {
- public boolean isOwn() {
+ public boolean isLocal() {
return true;
}
@@ -157,7 +157,7 @@ public class NoClusterDiscoveryService i
};
this.topologyView = new TopologyView() {
- public InstanceDescription getOwnInstance() {
+ public InstanceDescription getLocalInstance() {
return myDescription;
}
