You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/05/09 12:53:10 UTC
svn commit: r1100950 [1/2] - in /karaf/cellar/trunk:
core/src/main/java/org/apache/karaf/cellar/core/
core/src/main/java/org/apache/karaf/cellar/core/completers/
core/src/main/java/org/apache/karaf/cellar/core/control/
core/src/main/java/org/apache/kar...
Author: jbonofre
Date: Mon May 9 10:53:06 2011
New Revision: 1100950
URL: http://svn.apache.org/viewvc?rev=1100950&view=rev
Log:
Apply Apache checkstyle convertion in all file.
Fix some type mistakes.
Added:
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java
- copied, changed from r1100904, karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSuppot.java
Removed:
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSuppot.java
Modified:
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Configurations.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Consumer.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Dispatcher.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Group.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/GroupManager.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Handler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/HandlerRegistry.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Node.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Producer.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Synchronizer.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/AllNodeCompleter.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResult.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResultHandler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommand.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResult.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResultHandler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/Switch.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/SwitchStatus.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/Event.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventConsumer.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatcher.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandler.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistryDispatcher.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventProducer.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventTracker.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventType.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/CellarCommandSupport.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/AllGroupsCompleter.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/GroupCompleterSupport.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/LocalGroupsCompleter.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/OtherGroupsCompleter.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/Constants.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeatureInfo.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteFeaturesEvent.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java
karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationFactory.java
karaf/cellar/trunk/hazelcast/src/main/resources/META-INF/spring/beans.xml
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStartCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStatusCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerStopCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupCreateCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupJoinCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupListCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupQuitCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSetCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStartCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStatusCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerStopCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java
karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
karaf/cellar/trunk/src/main/resources/feature.xml
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/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import org.apache.karaf.cellar.core.event.EventType;
@@ -27,7 +26,7 @@ import java.util.HashSet;
import java.util.Set;
/**
- * @author iocanel
+ * Cellar support.
*/
public class CellarSupport {
@@ -207,4 +206,5 @@ public class CellarSupport {
public void setGroupManager(GroupManager groupManager) {
this.groupManager = groupManager;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/ClusterManager.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import org.apache.karaf.cellar.core.event.EventProducer;
@@ -22,7 +21,7 @@ import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Cluster manager interface.
*/
public interface ClusterManager {
@@ -109,4 +108,5 @@ public interface ClusterManager {
* Restarts the clustering support on the {@link Node}.
*/
public void restart();
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Configurations.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Configurations.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Configurations.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Configurations.java Mon May 9 10:53:06 2011
@@ -11,13 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
/**
- * @author: iocanel
+ * Configurations.
*/
public class Configurations {
+
public static final String DEFAULT_GROUP_NAME = "default";
public static final String GROUP = "org.apache.karaf.cellar.groups";
public static final String GROUPS_KEY = "groups";
@@ -29,4 +29,5 @@ public class Configurations {
public static final String PARENT = "parent";
public static final String WHITELIST = "whitelist";
public static final String BLACKLIST = "blacklist";
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Consumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Consumer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Consumer.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Consumer.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import org.apache.karaf.cellar.core.control.Switch;
@@ -19,9 +18,7 @@ import org.apache.karaf.cellar.core.cont
import java.io.Serializable;
/**
- * Generic Consumer Interface
- *
- * @author iocanel
+ * Generic consumer interface.
*/
public interface Consumer<T extends Serializable> {
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Dispatcher.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Dispatcher.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Dispatcher.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Dispatcher.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import java.io.Serializable;
/**
- * @author iocanel
+ * Generic dispatcher interface.
*/
public interface Dispatcher<T extends Serializable> {
@@ -27,4 +26,5 @@ public interface Dispatcher<T extends Se
* @param obj
*/
public void dispatch(T obj);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Group.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Group.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Group.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Group.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import java.io.Serializable;
@@ -19,14 +18,13 @@ import java.util.HashSet;
import java.util.Set;
/**
- * @author: iocanel
+ * Cellar group.
*/
public class Group implements Serializable {
private String name;
private Set<Node> members = new HashSet<Node>();
-
/**
* Constructor
*
@@ -68,4 +66,5 @@ public class Group implements Serializab
public int hashCode() {
return name != null ? name.hashCode() : 0;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/GroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/GroupManager.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/GroupManager.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/GroupManager.java Mon May 9 10:53:06 2011
@@ -11,14 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import java.util.Map;
import java.util.Set;
/**
- * @author: iocanel
+ * Generic group manager interface.
*/
public interface GroupManager {
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Handler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Handler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Handler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Handler.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import org.apache.karaf.cellar.core.control.Switch;
@@ -19,11 +18,10 @@ import org.apache.karaf.cellar.core.cont
import java.io.Serializable;
/**
- * @author iocanel
+ * Generic handler.
*/
public interface Handler<T extends Serializable> {
-
/**
* Returns the Class of the object that is to be handled.
*
@@ -37,4 +35,5 @@ public interface Handler<T extends Seria
* @return
*/
public Switch getSwitch();
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/HandlerRegistry.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/HandlerRegistry.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/HandlerRegistry.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/HandlerRegistry.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import java.io.Serializable;
/**
- * @author iocanel
+ * Handler registry interface.
*/
public interface HandlerRegistry<T extends Serializable, H extends Handler<T>> {
@@ -28,4 +27,5 @@ public interface HandlerRegistry<T exten
* @return
*/
public H getHandler(T obj);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Node.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Node.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Node.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Node.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import java.io.Serializable;
/**
- * @author iocanel
+ * Generic cluster node interface.
*/
public interface Node extends Serializable {
@@ -41,4 +40,5 @@ public interface Node extends Serializab
* @return
*/
public int getPort();
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Producer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Producer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Producer.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Producer.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
import org.apache.karaf.cellar.core.control.Switch;
@@ -19,9 +18,7 @@ import org.apache.karaf.cellar.core.cont
import java.io.Serializable;
/**
- * Generic Producer Interface.
- *
- * @author iocanel
+ * Generic producer interface.
*/
public interface Producer<T extends Serializable> {
@@ -38,4 +35,5 @@ public interface Producer<T extends Seri
* @return
*/
public Switch getSwitch();
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Synchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Synchronizer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Synchronizer.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/Synchronizer.java Mon May 9 10:53:06 2011
@@ -11,11 +11,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core;
/**
- * @author: iocanel
+ * Generic synchronizer interface.
*/
public interface Synchronizer {
@@ -35,4 +34,5 @@ public interface Synchronizer {
* @return
*/
public Boolean isSyncEnabled(Group group);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/AllNodeCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/AllNodeCompleter.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/AllNodeCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/AllNodeCompleter.java Mon May 9 10:53:06 2011
@@ -13,7 +13,6 @@
*/
package org.apache.karaf.cellar.core.completers;
-
import org.apache.karaf.cellar.core.Node;
/**
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
import org.apache.karaf.cellar.core.Consumer;
@@ -25,7 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author iocanel
+ * Manage handlers command handler.
*/
public class ManageHandlersCommandHandler extends CommandHandler<ManageHandlersCommand, ManageHandlersResult> {
@@ -84,4 +83,5 @@ public class ManageHandlersCommandHandle
public Switch getSwitch() {
return getSwitch();
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResult.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResult.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResult.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResult.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
@@ -21,7 +20,7 @@ import java.util.HashMap;
import java.util.Map;
/**
- * @author iocanel
+ * Manage handlers result.
*/
public class ManageHandlersResult extends Result {
@@ -43,4 +42,5 @@ public class ManageHandlersResult extend
public void setHandlers(Map<String, String> handlers) {
this.handlers = handlers;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResultHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResultHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResultHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersResultHandler.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
import org.apache.karaf.cellar.core.command.ResultHandler;
/**
- * @author iocanel
+ * Manage handlers result handler.
*/
public class ManageHandlersResultHandler extends ResultHandler<ManageHandlersResult> {
@@ -25,4 +24,5 @@ public class ManageHandlersResultHandler
public Class<ManageHandlersResult> getType() {
return ManageHandlersResult.class;
}
+
}
\ No newline at end of file
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommand.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommand.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
import org.apache.karaf.cellar.core.command.Command;
/**
- * @author iocanel
+ * Producer switch command.
*/
public class ProducerSwitchCommand extends Command<ProducerSwitchResult> {
@@ -60,4 +59,5 @@ public class ProducerSwitchCommand exten
public void setStatus(SwitchStatus status) {
this.status = status;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java Mon May 9 10:53:06 2011
@@ -11,14 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
import org.apache.karaf.cellar.core.Producer;
import org.apache.karaf.cellar.core.command.CommandHandler;
/**
- * @author iocanel
+ * Producer switch command handler.
*/
public class ProducerSwitchCommandHandler extends CommandHandler<ProducerSwitchCommand, ProducerSwitchResult> {
@@ -69,4 +68,5 @@ public class ProducerSwitchCommandHandle
public void setProducer(Producer producer) {
this.producer = producer;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResult.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResult.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResult.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResult.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
import org.apache.karaf.cellar.core.command.Result;
/**
- * @author iocanel
+ * Producer switch result.
*/
public class ProducerSwitchResult extends Result {
@@ -72,4 +71,5 @@ public class ProducerSwitchResult extend
public void setStatus(Boolean status) {
this.status = status;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResultHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResultHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResultHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchResultHandler.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
import org.apache.karaf.cellar.core.command.ResultHandler;
/**
- * @author iocanel
+ * Producer switch result handler.
*/
public class ProducerSwitchResultHandler extends ResultHandler<ProducerSwitchResult> {
@@ -25,4 +24,5 @@ public class ProducerSwitchResultHandler
public Class<ProducerSwitchResult> getType() {
return ProducerSwitchResult.class;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/Switch.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/Switch.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/Switch.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/Switch.java Mon May 9 10:53:06 2011
@@ -11,13 +11,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
/**
* An interface that describes objects that can be turned on/off and act like a switch.
- *
- * @author iocanel
*/
public interface Switch {
@@ -44,4 +41,5 @@ public interface Switch {
* @return
*/
public SwitchStatus getStatus();
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/SwitchStatus.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/SwitchStatus.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/SwitchStatus.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/SwitchStatus.java Mon May 9 10:53:06 2011
@@ -11,11 +11,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.control;
/**
- * @author iocanel
+ * Switch status enum.
*/
public enum SwitchStatus {
@@ -35,4 +34,5 @@ public enum SwitchStatus {
public void setValue(Boolean value) {
this.value = value;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/Event.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/Event.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/Event.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/Event.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.apache.karaf.cellar.core.Group;
@@ -23,8 +22,6 @@ import java.util.Set;
/**
* Represents an event that is broadcasted to the cluster.
* The event is always generated by a single node (source) but can have none or multiple destinations.
- *
- * @author: iocanel
*/
public class Event implements Serializable {
@@ -91,4 +88,5 @@ public class Event implements Serializab
public void setPostPublish(Boolean postPublish) {
this.postPublish = postPublish;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventConsumer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventConsumer.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventConsumer.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.apache.karaf.cellar.core.Consumer;
/**
- * @author iocanel
+ * Event consumer.
*/
public interface EventConsumer<E extends Event> extends Consumer<E> {
@@ -27,4 +26,5 @@ public interface EventConsumer<E extends
* @param event
*/
public void consume(E event);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatchTask.java Mon May 9 10:53:06 2011
@@ -11,14 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author iocanel
+ * Event dispatcher task.
*/
public class EventDispatchTask<E extends Event> implements Runnable {
@@ -103,4 +102,5 @@ public class EventDispatchTask<E extends
public void setInterval(long interval) {
this.interval = interval;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatcher.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatcher.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatcher.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventDispatcher.java Mon May 9 10:53:06 2011
@@ -11,23 +11,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.apache.karaf.cellar.core.Dispatcher;
/**
* A dispatcher which dispatches each event to the appropriate Handler.
- *
- * @author iocanel
*/
public interface EventDispatcher<E extends Event> extends Dispatcher<E> {
-
/**
* Dispatches the Event to the appropriate handler.
*
* @param event
*/
public void dispatch(E event);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandler.java Mon May 9 10:53:06 2011
@@ -11,12 +11,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.apache.karaf.cellar.core.Handler;
+/**
+ * Event handler interface.
+ */
public interface EventHandler<E extends Event> extends Handler<E> {
public static String MANAGED_FILTER = "(managed=true)";
@@ -25,4 +27,5 @@ public interface EventHandler<E extends
* Called to handle {@code Event}.
*/
public void handle(E event);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.osgi.framework.BundleContext;
@@ -22,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author iocanel
+ * Event handler service registry.
*/
public class EventHandlerServiceRegistry<E extends Event> implements EventHandlerRegistry<E> {
@@ -60,4 +59,5 @@ public class EventHandlerServiceRegistry
}
return null;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistryDispatcher.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistryDispatcher.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistryDispatcher.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistryDispatcher.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.slf4j.Logger;
@@ -21,7 +20,7 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
/**
- * @author iocanel
+ * Event handler service registry dispatcher.
*/
public class EventHandlerServiceRegistryDispatcher<E extends Event> implements EventDispatcher<E> {
@@ -64,4 +63,5 @@ public class EventHandlerServiceRegistry
public void setThreadPool(ExecutorService threadPool) {
this.threadPool = threadPool;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventProducer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventProducer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventProducer.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventProducer.java Mon May 9 10:53:06 2011
@@ -11,15 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
import org.apache.karaf.cellar.core.Producer;
/**
* Transmits events to the cluster.
- *
- * @author iocanel
*/
public interface EventProducer<E extends Event> extends Producer<E> {
@@ -29,4 +26,5 @@ public interface EventProducer<E extends
* @param event
*/
public void produce(E event);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventTracker.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventTracker.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventTracker.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventTracker.java Mon May 9 10:53:06 2011
@@ -11,11 +11,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
/**
- * @author iocanel
+ * Event tracker interface.
*/
public interface EventTracker<E extends Event> {
@@ -40,4 +39,5 @@ public interface EventTracker<E extends
* @return
*/
public Boolean isPending(E event);
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventType.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventType.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventType.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/event/EventType.java Mon May 9 10:53:06 2011
@@ -11,13 +11,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.event;
/**
- * @author iocanel
+ * Event type enum.
*/
public enum EventType {
+
INBOUND,
OUTBOUND;
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/CellarCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/CellarCommandSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/CellarCommandSupport.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/CellarCommandSupport.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.shell;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -19,7 +18,7 @@ import org.apache.karaf.cellar.core.Grou
import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
- * @author: iocanel
+ * Abstract Cellar command.
*/
public abstract class CellarCommandSupport extends OsgiCommandSupport {
@@ -42,4 +41,5 @@ public abstract class CellarCommandSuppo
public void setGroupManager(GroupManager groupManager) {
this.groupManager = groupManager;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/AllGroupsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/AllGroupsCompleter.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/AllGroupsCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/AllGroupsCompleter.java Mon May 9 10:53:06 2011
@@ -11,17 +11,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.shell.completers;
import org.apache.karaf.cellar.core.Group;
/**
- * @author iocanel
+ * All groups completer.
*/
public class AllGroupsCompleter extends GroupCompleterSupport {
+
@Override
protected boolean acceptsGroup(Group group) {
return true;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/GroupCompleterSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/GroupCompleterSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/GroupCompleterSupport.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/GroupCompleterSupport.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.shell.completers;
import org.apache.karaf.cellar.core.Group;
@@ -22,7 +21,7 @@ import org.apache.karaf.shell.console.co
import java.util.List;
/**
- * @author: iocanel
+ * Abstract group completer.
*/
public abstract class GroupCompleterSupport implements Completer {
@@ -55,4 +54,5 @@ public abstract class GroupCompleterSupp
public void setGroupManager(GroupManager groupManager) {
this.groupManager = groupManager;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/LocalGroupsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/LocalGroupsCompleter.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/LocalGroupsCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/LocalGroupsCompleter.java Mon May 9 10:53:06 2011
@@ -11,16 +11,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.shell.completers;
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.Node;
/**
- * @author: iocanel
+ * Local groups completer.
*/
public class LocalGroupsCompleter extends GroupCompleterSupport {
+
@Override
protected boolean acceptsGroup(Group group) {
Node node = groupManager.getNode();
@@ -28,4 +28,5 @@ public class LocalGroupsCompleter extend
return true;
else return false;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/OtherGroupsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/OtherGroupsCompleter.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/OtherGroupsCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/OtherGroupsCompleter.java Mon May 9 10:53:06 2011
@@ -11,16 +11,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.shell.completers;
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.Node;
/**
- * @author: iocanel
+ * Other groups completer.
*/
public class OtherGroupsCompleter extends GroupCompleterSupport {
+
@Override
protected boolean acceptsGroup(Group group) {
Node node = groupManager.getNode();
@@ -28,4 +28,5 @@ public class OtherGroupsCompleter extend
return false;
else return true;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/Constants.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/Constants.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/Constants.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/Constants.java Mon May 9 10:53:06 2011
@@ -11,13 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
/**
- * @author iocanel
+ * Features constants.
*/
public class Constants {
+
public static final String REPOSITORIES = "org.apache.karaf.cellar.repositories";
public static final String FEATURES = "org.apache.karaf.cellar.features";
public static final String REPOSITORIES_CATEGORY = "repositories";
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeatureInfo.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeatureInfo.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeatureInfo.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeatureInfo.java Mon May 9 10:53:06 2011
@@ -11,13 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import java.io.Serializable;
/**
- * @author iocanel
+ * Feature info.
*/
public class FeatureInfo implements Serializable {
@@ -64,4 +63,5 @@ public class FeatureInfo implements Seri
result = 31 * result + (version != null ? version.hashCode() : 0);
return result;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java Mon May 9 10:53:06 2011
@@ -11,10 +11,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
-
import org.apache.karaf.cellar.core.control.BasicSwitch;
import org.apache.karaf.cellar.core.control.Switch;
import org.apache.karaf.cellar.core.event.EventHandler;
@@ -24,7 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author iocanel
+ * Features event handler.
*/
public class FeaturesEventHandler extends FeaturesSupport implements EventHandler<RemoteFeaturesEvent> {
@@ -80,4 +78,5 @@ public class FeaturesEventHandler extend
public Switch getSwitch() {
return eventSwitch;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSupport.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import org.apache.karaf.cellar.core.CellarSupport;
@@ -29,7 +28,7 @@ import java.util.List;
import java.util.Map;
/**
- * @author iocanel
+ * Features support.
*/
public class FeaturesSupport extends CellarSupport {
@@ -37,7 +36,6 @@ public class FeaturesSupport extends Cel
protected FeaturesService featuresService;
-
/**
* Initialization method
*/
@@ -72,7 +70,6 @@ public class FeaturesSupport extends Cel
return false;
}
-
/**
* Pushes a {@code Feature} and its status to the distributed list of features.
*
@@ -128,7 +125,6 @@ public class FeaturesSupport extends Cel
}
}
-
public FeaturesService getFeaturesService() {
return featuresService;
}
@@ -136,4 +132,5 @@ public class FeaturesSupport extends Cel
public void setFeaturesService(FeaturesService featuresService) {
this.featuresService = featuresService;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import org.apache.karaf.cellar.core.ClusterManager;
@@ -36,7 +35,7 @@ import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Features synchronizer.
*/
public class FeaturesSynchronizer extends FeaturesSupport implements Synchronizer {
@@ -171,7 +170,6 @@ public class FeaturesSynchronizer extend
}
}
-
@Override
public Boolean isSyncEnabled(Group group) {
Boolean result = Boolean.FALSE;
@@ -213,4 +211,5 @@ public class FeaturesSynchronizer extend
public void setFeaturesService(FeaturesService featuresService) {
this.featuresService = featuresService;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import org.apache.karaf.cellar.core.Group;
@@ -28,7 +27,7 @@ import java.util.List;
import java.util.Set;
/**
- * @author iocanel
+ * Local features listener.
*/
public class LocalFeaturesListener extends FeaturesSupport implements org.apache.karaf.features.FeaturesListener {
@@ -119,4 +118,5 @@ public class LocalFeaturesListener exten
public void setProducerList(List<EventProducer> producerList) {
this.producerList = producerList;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteFeaturesEvent.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteFeaturesEvent.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteFeaturesEvent.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteFeaturesEvent.java Mon May 9 10:53:06 2011
@@ -11,14 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import org.apache.karaf.cellar.core.event.Event;
import org.apache.karaf.features.FeatureEvent.EventType;
/**
- * @author iocanel
+ * Remove features event.
*/
public class RemoteFeaturesEvent extends Event {
@@ -46,4 +45,5 @@ public class RemoteFeaturesEvent extends
public EventType getType() {
return type;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java Mon May 9 10:53:06 2011
@@ -11,14 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import org.apache.karaf.cellar.core.event.Event;
import org.apache.karaf.features.RepositoryEvent.EventType;
/**
- * @author iocanel
+ * Remote repository event.
*/
public class RemoteRepositoryEvent extends Event {
@@ -32,4 +31,5 @@ public class RemoteRepositoryEvent exten
public EventType getType() {
return type;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features;
import org.apache.karaf.cellar.core.control.BasicSwitch;
@@ -24,7 +23,7 @@ import org.slf4j.LoggerFactory;
import java.net.URI;
/**
- * @author iocanel
+ * Repository event handler.
*/
public class RepositoryEventHandler extends FeaturesSupport implements EventHandler<RemoteRepositoryEvent> {
@@ -66,4 +65,5 @@ public class RepositoryEventHandler exte
public Switch getSwitch() {
return eventSwitch;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/FeatureCommandSupport.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features.shell;
import org.apache.karaf.cellar.core.Configurations;
@@ -29,7 +28,7 @@ import org.slf4j.LoggerFactory;
import java.util.Map;
/**
- * @author: iocanel
+ * Abstract feature command.
*/
@Command(scope = "cluster", name = "feature-install", description = "Installs a feature to all members of a group")
public abstract class FeatureCommandSupport extends CellarCommandSupport {
@@ -39,7 +38,6 @@ public abstract class FeatureCommandSupp
protected FeaturesService featuresService;
protected BundleContext bundleContext;
-
/**
* Forces the features status for a specific group.
* Why? Its required if no group member currently in the cluster.
@@ -108,4 +106,5 @@ public abstract class FeatureCommandSupp
public void setFeaturesService(FeaturesService featuresService) {
this.featuresService = featuresService;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/InstallFeatureCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features.shell;
import org.apache.karaf.cellar.core.Group;
@@ -22,7 +21,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.features.FeatureEvent;
/**
- * @author: iocanel
+ * Install feature command.
*/
@Command(scope = "cluster", name = "features-install", description = "Installs a feature to the group")
public class InstallFeatureCommand extends FeatureCommandSupport {
@@ -48,4 +47,5 @@ public class InstallFeatureCommand exten
updateFeatureStatus(groupName, feature, version, true);
return null;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/ListGroupFeatures.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features.shell;
import org.apache.karaf.cellar.core.Configurations;
@@ -23,7 +22,7 @@ import org.apache.felix.gogo.commands.Co
import java.util.Map;
/**
- * iocanel iocanel
+ * List group features command.
*/
@Command(scope = "cluster", name = "features-list", description = "List the features that are assigned to a group")
public class ListGroupFeatures extends FeatureCommandSupport {
@@ -58,4 +57,5 @@ public class ListGroupFeatures extends F
}
return null;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/shell/UninstallFeatureCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.features.shell;
import org.apache.karaf.cellar.core.Group;
@@ -22,7 +21,7 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.features.FeatureEvent;
/**
- * @author: iocanel
+ * Uninstall feature command.
*/
@Command(scope = "cluster", name = "features-uninstall", description = "Uninstalls a feature to the group")
public class UninstallFeatureCommand extends FeatureCommandSupport {
@@ -48,4 +47,5 @@ public class UninstallFeatureCommand ext
updateFeatureStatus(groupName, feature, version, true);
return null;
}
+
}
Modified: karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/blueprint.xml Mon May 9 10:53:06 2011
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,8 +11,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
-
+-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<!-- Cluster Configuration Listener -->
Modified: karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml (original)
+++ karaf/cellar/trunk/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml Mon May 9 10:53:06 2011
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,8 +11,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
-
+-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<!-- Command Bundle -->
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
import com.hazelcast.core.HazelcastInstance;
@@ -26,7 +25,7 @@ import java.util.List;
import java.util.Set;
/**
- * @author: iocanel
+ * Cellar membership listener.
*/
public class CellarMembershipListener implements MembershipListener {
@@ -81,4 +80,5 @@ public class CellarMembershipListener im
public void setSynchronizers(List<? extends Synchronizer> synchronizers) {
this.synchronizers = synchronizers;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/Constants.java Mon May 9 10:53:06 2011
@@ -11,12 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
/**
- * @author: iocanel
+ * Hazelcast constants.
*/
public class Constants {
+
public static final String TOPIC = "org.apache.karaf.cellar.event.topic";
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java Mon May 9 10:53:06 2011
@@ -11,10 +11,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
-
import com.hazelcast.core.Cluster;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.ITopic;
@@ -35,7 +33,7 @@ import java.util.Map;
import java.util.Set;
/**
- * @author iocanel
+ * Hazelcast cluster manager.
*/
public class HazelcastClusterManager implements ClusterManager {
@@ -49,10 +47,8 @@ public class HazelcastClusterManager imp
private List<EventProducer> producerList;
private List<EventConsumer> consumerList;
-
private ConfigurationAdmin configurationAdmin;
-
/**
* Returns a named distributed map.
*
@@ -82,7 +78,6 @@ public class HazelcastClusterManager imp
return producer;
}
-
/**
* Returns the list of Hazelcast Nodes.
*
@@ -196,7 +191,6 @@ public class HazelcastClusterManager imp
instance.restart();
}
-
/**
* Returns the Hazelcast instance.
*
@@ -238,4 +232,5 @@ public class HazelcastClusterManager imp
public void setConsumerList(List<EventConsumer> consumerList) {
this.consumerList = consumerList;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
import com.hazelcast.core.Cluster;
@@ -47,7 +46,7 @@ import java.util.Properties;
import java.util.Set;
/**
- * @author: iocanel
+ * Hazelcast group manager.
*/
public class HazelcastGroupManager implements GroupManager, BundleContextAware {
@@ -64,7 +63,6 @@ public class HazelcastGroupManager imple
private Dispatcher dispatcher;
private ConfigurationAdmin configurationAdmin;
-
public void init() throws Exception {
//Add group to configuration
try {
@@ -377,10 +375,8 @@ public class HazelcastGroupManager imple
} catch (IOException e) {
logger.error("Error reading group configuration ", e);
}
-
}
-
/**
* Utility method which converts a set to a String.
*
@@ -399,7 +395,6 @@ public class HazelcastGroupManager imple
return result;
}
-
/**
* Utility method which converts String to Set.
*
@@ -459,4 +454,5 @@ public class HazelcastGroupManager imple
public void setConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
this.configurationAdmin = configurationAdmin;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java Mon May 9 10:53:06 2011
@@ -11,14 +11,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
-
import org.apache.karaf.cellar.core.Node;
/**
- * @author iocanel
+ * Hazelcast cluster node.
*/
public class HazelcastNode implements Node {
@@ -28,7 +26,7 @@ public class HazelcastNode implements No
private int port;
/**
- * Cosntructor
+ * Constructor
*
* @param host
* @param port
@@ -76,4 +74,5 @@ public class HazelcastNode implements No
public int hashCode() {
return id != null ? id.hashCode() : 0;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
import com.hazelcast.core.HazelcastInstance;
@@ -25,15 +24,11 @@ import org.apache.karaf.cellar.core.cont
import org.apache.karaf.cellar.core.event.Event;
import org.apache.karaf.cellar.core.event.EventConsumer;
-
/**
* Consumes messages from the distributed {@code ITopic} and calls the {@code EventDispatcher}.
- *
- * @author iocanel
*/
public class TopicConsumer<E extends Event> implements EventConsumer<E>, MessageListener<E> {
-
public static final String SWITCH_ID = "org.apache.karaf.cellar.topic.consumer";
private final Switch eventSwitch = new BasicSwitch(SWITCH_ID);
@@ -118,4 +113,5 @@ public class TopicConsumer<E extends Eve
public void setNode(Node node) {
this.node = node;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicProducer.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast;
import com.hazelcast.core.HazelcastInstance;
@@ -24,11 +23,8 @@ import org.apache.karaf.cellar.core.cont
import org.apache.karaf.cellar.core.event.Event;
import org.apache.karaf.cellar.core.event.EventProducer;
-
/**
* Produces {@code Event}s into the distributed {@code ITopic}.
- *
- * @author iocanel
*/
public class TopicProducer<E extends Event> implements EventProducer<E> {
@@ -55,7 +51,6 @@ public class TopicProducer<E extends Eve
public void destroy() {
}
-
/**
* Propagates an event into the distributed {@code ITopic}.
*
@@ -96,4 +91,5 @@ public class TopicProducer<E extends Eve
public void setNode(Node node) {
this.node = node;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationFactory.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationFactory.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationFactory.java Mon May 9 10:53:06 2011
@@ -11,15 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.hazelcast.factory;
import com.hazelcast.config.Config;
import com.hazelcast.config.GroupConfig;
-
/**
- * @author: iocanel
+ * Hazelcast configuration factory.
*/
public class HazelcastConfigurationFactory {
@@ -31,4 +29,5 @@ public class HazelcastConfigurationFacto
config.setGroupConfig(groupConfig);
return config;
}
+
}
Modified: karaf/cellar/trunk/hazelcast/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/resources/META-INF/spring/beans.xml?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/resources/META-INF/spring/beans.xml (original)
+++ karaf/cellar/trunk/hazelcast/src/main/resources/META-INF/spring/beans.xml Mon May 9 10:53:06 2011
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -10,16 +11,16 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- -->
-
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:osgi="http://www.springframework.org/schema/osgi"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
-
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
+ ">
<!-- Hazelcast hazelcast -->
<bean id="hazelcast" class="com.hazelcast.core.Hazelcast" factory-method="newHazelcastInstance"
@@ -151,7 +152,6 @@
<osgi:service ref="manageGroupCommandHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>
<osgi:service ref="manageGroupResultHandler" interface="org.apache.karaf.cellar.core.event.EventHandler"/>
-
<osgi:reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
<!-- Group Consumer & Producer Serices -->
@@ -162,5 +162,4 @@
<osgi:list id="synchronizers" cardinality="0..N" interface="org.apache.karaf.cellar.core.Synchronizer"/>
-
</beans>
Copied: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java (from r1100904, karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSuppot.java)
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java?p2=karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java&p1=karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSuppot.java&r1=1100904&r2=1100950&rev=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSuppot.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ClusterCommandSupport.java Mon May 9 10:53:06 2011
@@ -11,16 +11,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell;
import org.apache.karaf.cellar.core.command.ExecutionContext;
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
/**
- * @author: iocanel
+ * Abstract Cluster command.
*/
-public abstract class ClusterCommandSuppot extends CellarCommandSupport {
+public abstract class ClusterCommandSupport extends CellarCommandSupport {
protected ExecutionContext executionContext;
@@ -31,4 +30,5 @@ public abstract class ClusterCommandSupp
public void setExecutionContext(ExecutionContext executionContext) {
this.executionContext = executionContext;
}
+
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/ListNodesCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell;
import org.apache.karaf.cellar.core.Node;
@@ -20,10 +19,10 @@ import org.apache.felix.gogo.commands.Co
import java.util.Set;
/**
- * @author iocanel
+ * List nodes command.
*/
@Command(scope = "cluster", name = "list-nodes", description = "Lists the nodes of the cluster.")
-public class ListNodesCommand extends ClusterCommandSuppot {
+public class ListNodesCommand extends ClusterCommandSupport {
private static final String LIST_FORMAT = "%1s %4s %-20s %5s %s";
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java?rev=1100950&r1=1100949&r2=1100950&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java Mon May 9 10:53:06 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.shell;
import org.apache.karaf.cellar.core.Node;
@@ -23,10 +22,10 @@ import java.util.Arrays;
import java.util.HashSet;
/**
- * @author iocanel
+ * Ping command.
*/
@Command(scope = "cluster", name = "ping", description = "Pings the nodes of the cluster.")
-public class PingCommand extends ClusterCommandSuppot {
+public class PingCommand extends ClusterCommandSupport {
@Argument(index = 0, name = "node", description = "The id of the node(s) to ping", required = true, multiValued = false)
String nodeId;
@@ -37,7 +36,6 @@ public class PingCommand extends Cluster
@Argument(index = 2, name = "interval", description = "The time in millis to wait between iterations", required = false, multiValued = false)
Long interval = 1000L;
-
@Override
protected Object doExecute() throws Exception {
Node node = clusterManager.findNodeById(nodeId);
@@ -54,4 +52,5 @@ public class PingCommand extends Cluster
}
return null;
}
+
}