svn commit: r1476916 - in /karaf/cellar/trunk/utils/src/main: java/org/apache/karaf/cellar/utils/ping/ resources/OSGI-INF/blueprint/

[jb...@apache.org]

Author: jbonofre
Date: Mon Apr 29 08:24:32 2013
New Revision: 1476916

URL: http://svn.apache.org/r1476916
Log:
Code cleanup.

Modified:
    karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
    karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java
    karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java
    karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java
    karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java?rev=1476916&r1=1476915&r2=1476916&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Ping.java Mon Apr 29 08:24:32 2013
@@ -15,6 +15,9 @@ package org.apache.karaf.cellar.utils.pi
 
 import org.apache.karaf.cellar.core.command.Command;
 
+/**
+ * Cluster ping event.
+ */
 public class Ping extends Command<Pong> {
 
     public Ping(String id) {

Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java?rev=1476916&r1=1476915&r2=1476916&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PingHandler.java Mon Apr 29 08:24:32 2013
@@ -17,6 +17,9 @@ import org.apache.karaf.cellar.core.comm
 import org.apache.karaf.cellar.core.control.BasicSwitch;
 import org.apache.karaf.cellar.core.control.Switch;
 
+/**
+ * Handler for cluster ping event.
+ */
 public class PingHandler extends CommandHandler<Ping, Pong> {
 
     public static final String SWITCH_ID = "org.apache.karaf.cellar.command.ping.switch";

Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java?rev=1476916&r1=1476915&r2=1476916&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/Pong.java Mon Apr 29 08:24:32 2013
@@ -15,6 +15,9 @@ package org.apache.karaf.cellar.utils.pi
 
 import org.apache.karaf.cellar.core.command.Result;
 
+/**
+ * Cluster pong event.
+ */
 public class Pong extends Result {
 
     public Pong(String id) {

Modified: karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java?rev=1476916&r1=1476915&r2=1476916&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java (original)
+++ karaf/cellar/trunk/utils/src/main/java/org/apache/karaf/cellar/utils/ping/PongHandler.java Mon Apr 29 08:24:32 2013
@@ -15,6 +15,9 @@ package org.apache.karaf.cellar.utils.pi
 
 import org.apache.karaf.cellar.core.command.ResultHandler;
 
+/**
+ * Handler for cluster pong event.
+ */
 public class PongHandler extends ResultHandler<Pong> {
 
     @Override

Modified: karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1476916&r1=1476915&r2=1476916&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/utils/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon Apr 29 08:24:32 2013
@@ -15,17 +15,16 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
+    <!-- Handler for the cluster ping event -->
     <bean id="pingHandler" class="org.apache.karaf.cellar.utils.ping.PingHandler">
         <property name="producer" ref="producer"/>
-
     </bean>
+    <service ref="pingHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>
 
+    <!-- Handler for the cluster pong event -->
     <bean id="pongHandler" class="org.apache.karaf.cellar.utils.ping.PongHandler">
         <property name="commandStore" ref="commandStore"/>
     </bean>
-
-    <!-- OSGi Services  & References -->
-    <service ref="pingHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>
     <service ref="pongHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>
 
     <reference id="clusterManager" interface="org.apache.karaf.cellar.core.ClusterManager" availability="optional"/>