Author: cziegeler
Date: Fri Sep 6 09:11:41 2013
New Revision: 1520520
URL: http://svn.apache.org/r1520520
Log:
Add ProviderType and ConsumerType annotations
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/ClusterView.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/DiscoveryService.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceDescription.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/InstanceFilter.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/PropertyProvider.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyEventListener.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
Modified:
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java?rev=1520520&r1=1520519&r2=1520520&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
(original)
+++
sling/trunk/bundles/extensions/discovery/api/src/main/java/org/apache/sling/discovery/TopologyView.java
Fri Sep 6 09:11:41 2013
@@ -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 {
/**
