Author: iocanel
Date: Sat Aug 27 10:14:25 2011
New Revision: 1162319
URL: http://svn.apache.org/viewvc?rev=1162319&view=rev
Log:
Merged from trunk
Applied some findBugs and PMD hints. Also refactored some of the packages to
match the existing package naming scheme. [from revision 1102000]
Added:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/completer/
- copied from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/exception/
- copied from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/
- copied from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllGroupsCompleter.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllGroupsCompleter.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.java
- copied unchanged from r1102000,
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.java
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
karaf/cellar/branches/cellar-2.2.x/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/completers/
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
karaf/cellar/branches/cellar-2.2.x/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 27 10:14:25 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766
Modified:
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
Sat Aug 27 10:14:25 2011
@@ -89,7 +89,6 @@ public class ConfigurationSynchronizer e
//Update the configuration.
if (conf != null) {
//Mark the remote configuration event.
- RemoteConfigurationEvent event = new
RemoteConfigurationEvent(conf.getPid());
conf.update(preparePull(dictionary));
}
LOGGER.info("CELLAR CONFIGURATION EVENT: read
remote configuration.");
Modified:
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
Sat Aug 27 10:14:25 2011
@@ -42,7 +42,6 @@ public class PropSetCommand extends Conf
@Override
protected Object doExecute() throws Exception {
- Group group = groupManager.findGroupByName(groupName);
Map<String, Properties> configurationTable =
clusterManager.getMap(Constants.CONFIGURATION_MAP + Configurations.SEPARATOR +
groupName);
Properties properties = configurationTable.get(pid);
if (properties == null) {
Modified:
karaf/cellar/branches/cellar-2.2.x/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
(original)
+++
karaf/cellar/branches/cellar-2.2.x/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
Sat Aug 27 10:14:25 2011
@@ -45,7 +45,7 @@
</command-bundle>
- <bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completers.AllGroupsCompleter">
+ <bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.AllGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
Sat Aug 27 10:14:25 2011
@@ -134,7 +134,6 @@ public class CellarSupport {
*/
public Boolean isAllowed(Group group, String category, String event,
EventType type) {
Boolean result = true;
- Node node = clusterManager.getNode();
Set<String> whiteList = getListEntries(Configurations.WHITELIST,
group, category, type);
Set<String> blackList = getListEntries(Configurations.BLACKLIST,
group, category, type);
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
Sat Aug 27 10:14:25 2011
@@ -15,6 +15,8 @@ package org.apache.karaf.cellar.core.com
import org.apache.karaf.cellar.core.Node;
import org.apache.karaf.cellar.core.Producer;
+import org.apache.karaf.cellar.core.exception.ProducerNotFoundException;
+import org.apache.karaf.cellar.core.exception.StoreNotFoundException;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
@@ -32,21 +34,20 @@ public class ClusteredExecutionContext i
private ScheduledExecutorService timeoutScheduler = new
ScheduledThreadPoolExecutor(10);
- public <R extends Result, C extends Command<R>> Map<Node, R> execute(C
command) throws Exception {
+ public <R extends Result, C extends Command<R>> Map<Node, R> execute(C
command) throws StoreNotFoundException, ProducerNotFoundException,
InterruptedException {
if (command == null) {
- throw new Exception("Command store not found");
+ throw new StoreNotFoundException("Command store not found");
} else {
commandStore.getPending().put(command.getId(), command);
TimeoutTask timeoutTask = new TimeoutTask(command, commandStore);
- ScheduledFuture<?> timeoutFuture =
timeoutScheduler.schedule(timeoutTask, command.getTimeout(),
TimeUnit.MILLISECONDS);
+ timeoutScheduler.schedule(timeoutTask, command.getTimeout(),
TimeUnit.MILLISECONDS);
}
if (producer != null) {
producer.produce(command);
- Map<Node, R> result = command.getResult();
- return result;
+ return command.getResult();
}
- throw new Exception("Command producer not found");
+ throw new ProducerNotFoundException("Command producer not found");
}
public Producer getProducer() {
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
Sat Aug 27 10:14:25 2011
@@ -84,9 +84,10 @@ public class Command<R extends Result> e
* @return
* @throws Exception
*/
- public Map<Node, R> getResult() throws Exception {
+ public Map<Node, R> getResult() throws InterruptedException {
+ Map<Node, R> nodeResults = null;
if (this.resultQueue != null) {
- Map<Node, R> nodeResults = resultQueue.poll(timeout,
TimeUnit.MILLISECONDS);
+ nodeResults = resultQueue.poll(timeout, TimeUnit.MILLISECONDS);
}
return nodeResults;
}
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java
Sat Aug 27 10:14:25 2011
@@ -34,23 +34,19 @@ public class ConsumerSwitchCommandHandle
public ConsumerSwitchResult execute(ConsumerSwitchCommand command) {
//Query
if (command.getStatus() == null) {
- ConsumerSwitchResult result = new
ConsumerSwitchResult(command.getId(), Boolean.TRUE,
consumer.getSwitch().getStatus().getValue());
- return result;
+ return new ConsumerSwitchResult(command.getId(), Boolean.TRUE,
consumer.getSwitch().getStatus().getValue());
}
//Turn on the switch
if (command.getStatus().equals(SwitchStatus.ON)) {
consumer.getSwitch().turnOn();
- ConsumerSwitchResult result = new
ConsumerSwitchResult(command.getId(), Boolean.TRUE, Boolean.TRUE);
- return result;
+ return new ConsumerSwitchResult(command.getId(), Boolean.TRUE,
Boolean.TRUE);
}
//Turn on the switch
else if (command.getStatus().equals(SwitchStatus.OFF)) {
consumer.getSwitch().turnOff();
- ConsumerSwitchResult result = new
ConsumerSwitchResult(command.getId(), Boolean.TRUE, Boolean.FALSE);
- return result;
+ return new ConsumerSwitchResult(command.getId(), Boolean.TRUE,
Boolean.FALSE);
} else {
- ConsumerSwitchResult result = new
ConsumerSwitchResult(command.getId(), Boolean.FALSE,
consumer.getSwitch().getStatus().getValue());
- return result;
+ return new ConsumerSwitchResult(command.getId(), Boolean.FALSE,
consumer.getSwitch().getStatus().getValue());
}
}
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ManageHandlersCommandHandler.java
Sat Aug 27 10:14:25 2011
@@ -81,7 +81,6 @@ public class ManageHandlersCommandHandle
@Override
public Switch getSwitch() {
- return getSwitch();
+ return commandSwitch;
}
-
}
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/control/ProducerSwitchCommandHandler.java
Sat Aug 27 10:14:25 2011
@@ -32,23 +32,19 @@ public class ProducerSwitchCommandHandle
public ProducerSwitchResult execute(ProducerSwitchCommand command) {
//Query
if (command.getStatus() == null) {
- ProducerSwitchResult result = new
ProducerSwitchResult(command.getId(), Boolean.TRUE,
producer.getSwitch().getStatus().getValue());
- return result;
+ return new ProducerSwitchResult(command.getId(), Boolean.TRUE,
producer.getSwitch().getStatus().getValue());
}
//Turn on the switch
else if (command.getStatus().equals(SwitchStatus.ON)) {
producer.getSwitch().turnOn();
- ProducerSwitchResult result = new
ProducerSwitchResult(command.getId(), Boolean.TRUE, Boolean.TRUE);
- return result;
+ return new ProducerSwitchResult(command.getId(), Boolean.TRUE,
Boolean.TRUE);
}
//Turn on the switch
else if (command.getStatus().equals(SwitchStatus.OFF)) {
producer.getSwitch().turnOff();
- ProducerSwitchResult result = new
ProducerSwitchResult(command.getId(), Boolean.TRUE, Boolean.FALSE);
- return result;
+ return new ProducerSwitchResult(command.getId(), Boolean.TRUE,
Boolean.FALSE);
} else {
- ProducerSwitchResult result = new
ProducerSwitchResult(command.getId(), Boolean.FALSE,
producer.getSwitch().getStatus().getValue());
- return result;
+ return new ProducerSwitchResult(command.getId(), Boolean.FALSE,
producer.getSwitch().getStatus().getValue());
}
}
Modified:
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/event/EventHandlerServiceRegistry.java
Sat Aug 27 10:14:25 2011
@@ -14,6 +14,7 @@
package org.apache.karaf.cellar.core.event;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleReference;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
Modified:
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
Sat Aug 27 10:14:25 2011
@@ -136,7 +136,7 @@ public class FeaturesSynchronizer extend
public void push(Group group) {
if (group != null) {
String groupName = group.getName();
- List<String> repositories =
clusterManager.getList(Constants.REPOSITORIES + Configurations.SEPARATOR +
groupName);
+ //List<String> repositories =
clusterManager.getList(Constants.REPOSITORIES + Configurations.SEPARATOR +
groupName);
Map<FeatureInfo, Boolean> features =
clusterManager.getMap(Constants.FEATURES + Configurations.SEPARATOR +
groupName);
clusterManager.getList(Constants.FEATURES +
Configurations.SEPARATOR + groupName);
Modified:
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/LocalFeaturesListener.java
Sat Aug 27 10:14:25 2011
@@ -93,8 +93,6 @@ public class LocalFeaturesListener exten
*/
public void repositoryEvent(RepositoryEvent event) {
if (event != null && event.getRepository() != null) {
-
- Node node = clusterManager.getNode();
Set<Group> groups = groupManager.listLocalGroups();
if (groups != null && !groups.isEmpty()) {
Modified:
karaf/cellar/branches/cellar-2.2.x/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml
(original)
+++
karaf/cellar/branches/cellar-2.2.x/features/src/main/resources/OSGI-INF/blueprint/shell-features.xml
Sat Aug 27 10:14:25 2011
@@ -48,7 +48,7 @@
</command>
</command-bundle>
- <bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completers.AllGroupsCompleter">
+ <bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.AllGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
Modified:
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
Sat Aug 27 10:14:25 2011
@@ -102,8 +102,7 @@ public class HazelcastClusterManager ext
Cluster cluster = instance.getCluster();
if (cluster != null) {
Member member = cluster.getLocalMember();
- HazelcastNode node = new
HazelcastNode(member.getInetSocketAddress().getHostName(),
member.getInetSocketAddress().getPort());
- return node;
+ return new
HazelcastNode(member.getInetSocketAddress().getHostName(),
member.getInetSocketAddress().getPort());
} else {
return null;
}
Modified:
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
(original)
+++
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/TopicConsumer.java
Sat Aug 27 10:14:25 2011
@@ -66,13 +66,10 @@ public class TopicConsumer<E extends Eve
*/
public void consume(E event) {
//Check if event has a specified destination.
- if (event.getDestination() == null ||
event.getDestination().contains(node)) {
- //Check is switch is on.
- if (eventSwitch.getStatus().equals(SwitchStatus.ON) ||
event.getForce()) {
+ if ((event.getDestination() == null ||
event.getDestination().contains(node)) &&
(eventSwitch.getStatus().equals(SwitchStatus.ON) || event.getForce())) {
dispatcher.dispatch(event);
}
}
- }
public void onMessage(E message) {
consume(message);
Modified:
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1162319&r1=1162318&r2=1162319&view=diff
==============================================================================
---
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
(original)
+++
karaf/cellar/branches/cellar-2.2.x/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Sat Aug 27 10:14:25 2011
@@ -199,19 +199,19 @@
<reference id="executionContext"
interface="org.apache.karaf.cellar.core.command.ExecutionContext"
availability="optional"/>
<!-- Completers -->
- <bean id="allNodesCompleter"
class="org.apache.karaf.cellar.core.completers.AllNodeCompleter">
+ <bean id="allNodesCompleter"
class="org.apache.karaf.cellar.core.completer.AllNodeCompleter">
<property name="clusterManager" ref="clusterManager"/>
</bean>
- <bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completers.AllGroupsCompleter">
+ <bean id="allGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.AllGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
- <bean id="localGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completers.LocalGroupsCompleter">
+ <bean id="localGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.LocalGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
- <bean id="otherGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completers.OtherGroupsCompleter">
+ <bean id="otherGroupCompleter"
class="org.apache.karaf.cellar.core.shell.completer.OtherGroupsCompleter">
<property name="groupManager" ref="groupManager"/>
</bean>
