You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/05/11 19:54:44 UTC
svn commit: r1102000 - in /karaf/cellar/trunk:
config/src/main/java/org/apache/karaf/cellar/config/
config/src/main/java/org/apache/karaf/cellar/config/shell/
config/src/main/resources/OSGI-INF/blueprint/
core/src/main/java/org/apache/karaf/cellar/core...
Author: iocanel
Date: Wed May 11 17:54:43 2011
New Revision: 1102000
URL: http://svn.apache.org/viewvc?rev=1102000&view=rev
Log:
Applied some findBugs and PMD hints. Also refactored some of the packages to match the existing package naming scheme.
Added:
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/
- copied from r1101960, karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/
- copied from r1101960, karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/
Removed:
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completers/
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completers/
Modified:
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
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/command/ClusteredExecutionContext.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.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/ProducerSwitchCommandHandler.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/shell/completer/AllGroupsCompleter.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.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/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/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/TopicConsumer.java
karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Wed May 11 17:54:43 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));
}
} catch (IOException ex) {
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java Wed May 11 17:54:43 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/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml (original)
+++ karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml Wed May 11 17:54:43 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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -30,7 +30,7 @@ import java.util.Set;
*/
public class CellarSupport {
- protected static Logger logger = LoggerFactory.getLogger(CellarSupport.class);
+ protected static final Logger logger = LoggerFactory.getLogger(CellarSupport.class);
protected ClusterManager clusterManager;
protected GroupManager groupManager;
@@ -135,7 +135,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/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java Wed May 11 17:54:43 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/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java Wed May 11 17:54:43 2011
@@ -85,9 +85,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/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java?rev=1102000&r1=1101960&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java Wed May 11 17:54:43 2011
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cellar.core.completers;
+package org.apache.karaf.cellar.core.completer;
import org.apache.karaf.cellar.core.Node;
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java?rev=1102000&r1=1101960&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java Wed May 11 17:54:43 2011
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cellar.core.completers;
+package org.apache.karaf.cellar.core.completer;
import org.apache.karaf.cellar.core.ClusterManager;
import org.apache.karaf.cellar.core.Node;
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ConsumerSwitchCommandHandler.java Wed May 11 17:54:43 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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -81,7 +81,6 @@ public class ManageHandlersCommandHandle
@Override
public Switch getSwitch() {
- return getSwitch();
+ return commandSwitch;
}
-
}
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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -33,23 +33,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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -36,7 +36,7 @@ public class EventHandlerServiceRegistry
public EventHandler<E> getHandler(E event) {
BundleContext bundleContext = ((BundleReference) getClass().getClassLoader()).getBundle().getBundleContext();
- ServiceReference[] references = new ServiceReference[0];
+ ServiceReference[] references;
try {
references = bundleContext.getServiceReferences("org.apache.karaf.cellar.core.event.EventHandler", null);
if (references != null && references.length > 0) {
Added: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java?rev=1102000&view=auto
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java (added)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/ProducerNotFoundException.java Wed May 11 17:54:43 2011
@@ -0,0 +1,22 @@
+package org.apache.karaf.cellar.core.exception;
+
+/**
+ * @author: iocanel
+ */
+public class ProducerNotFoundException extends Exception {
+
+ public ProducerNotFoundException() {
+ }
+
+ public ProducerNotFoundException(String message) {
+ super(message);
+ }
+
+ public ProducerNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public ProducerNotFoundException(Throwable cause) {
+ super(cause);
+ }
+}
Added: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java?rev=1102000&view=auto
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java (added)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/exception/StoreNotFoundException.java Wed May 11 17:54:43 2011
@@ -0,0 +1,22 @@
+package org.apache.karaf.cellar.core.exception;
+
+/**
+ * @author: iocanel
+ */
+public class StoreNotFoundException extends Exception {
+
+ public StoreNotFoundException() {
+ }
+
+ public StoreNotFoundException(String message) {
+ super(message);
+ }
+
+ public StoreNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public StoreNotFoundException(Throwable cause) {
+ super(cause);
+ }
+}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllGroupsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllGroupsCompleter.java?rev=1102000&r1=1101960&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllGroupsCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllGroupsCompleter.java Wed May 11 17:54:43 2011
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cellar.core.shell.completers;
+package org.apache.karaf.cellar.core.shell.completer;
import org.apache.karaf.cellar.core.Group;
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java?rev=1102000&r1=1101960&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/GroupCompleterSupport.java Wed May 11 17:54:43 2011
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cellar.core.shell.completers;
+package org.apache.karaf.cellar.core.shell.completer;
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.GroupManager;
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java?rev=1102000&r1=1101960&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/LocalGroupsCompleter.java Wed May 11 17:54:43 2011
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cellar.core.shell.completers;
+package org.apache.karaf.cellar.core.shell.completer;
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.Node;
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.java?rev=1102000&r1=1101960&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/OtherGroupsCompleter.java Wed May 11 17:54:43 2011
@@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cellar.core.shell.completers;
+package org.apache.karaf.cellar.core.shell.completer;
import org.apache.karaf.cellar.core.Group;
import org.apache.karaf.cellar.core.Node;
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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -133,7 +133,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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -92,8 +92,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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -43,16 +43,14 @@ public class CellarMembershipListener im
Member member = membershipEvent.getMember();
Member local = instance.getCluster().getLocalMember();
- if (local.equals(member)) {
- if (synchronizers != null && !synchronizers.isEmpty()) {
- Set<Group> groups = groupManager.listLocalGroups();
- if (groups != null && !groups.isEmpty()) {
- for (Group group : groups) {
- for (Synchronizer synchronizer : synchronizers) {
- if (synchronizer.isSyncEnabled(group)) {
- synchronizer.pull(group);
- synchronizer.push(group);
- }
+ if (local.equals(member) && synchronizers != null && !synchronizers.isEmpty()) {
+ Set<Group> groups = groupManager.listLocalGroups();
+ if (groups != null && !groups.isEmpty()) {
+ for (Group group : groups) {
+ for (Synchronizer synchronizer : synchronizers) {
+ if (synchronizer.isSyncEnabled(group)) {
+ synchronizer.pull(group);
+ synchronizer.push(group);
}
}
}
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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -108,8 +108,7 @@ public class HazelcastClusterManager imp
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/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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -384,15 +384,15 @@ public class HazelcastGroupManager imple
* @return
*/
protected String convertSetToString(Set<String> set) {
- String result = "";
+ StringBuffer result = new StringBuffer();
Iterator<String> groupIterator = set.iterator();
while (groupIterator.hasNext()) {
String name = groupIterator.next();
- result = result + name;
+ result.append(name);
if (groupIterator.hasNext())
- result = result + ",";
+ result.append(",");
}
- return result;
+ return result.toString();
}
/**
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=1102000&r1=1101999&r2=1102000&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 Wed May 11 17:54:43 2011
@@ -66,11 +66,8 @@ 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);
- }
}
}
Modified: karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml?rev=1102000&r1=1101999&r2=1102000&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml (original)
+++ karaf/cellar/trunk/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml Wed May 11 17:54:43 2011
@@ -188,19 +188,19 @@
<reference id="executionContext" interface="org.apache.karaf.cellar.core.command.ExecutionContext"/>
<!-- 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>