Repository: karaf-cellar Updated Branches: refs/heads/master 09fecf936 -> 9e4259790
Fix DOSGi remote call result handler registration and DOSGi sample shell command Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/9e425979 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/9e425979 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/9e425979 Branch: refs/heads/master Commit: 9e42597901f6da36009da22816cecdb02e8fb8ea Parents: 09fecf9 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Sep 20 08:21:27 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Sep 20 08:21:27 2015 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/cellar/core/internal/osgi/Activator.java | 3 +-- .../org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java | 2 +- .../karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9e425979/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java index 27141ba..0233e93 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/internal/osgi/Activator.java @@ -32,14 +32,13 @@ public class Activator extends BaseActivator { private final static Logger LOGGER = LoggerFactory.getLogger(Activator.class); - private EventHandlerServiceRegistry registry; private ServiceTracker<EventHandler, EventHandler> eventHandlerServiceTracker; @Override public void doStart() throws Exception { LOGGER.debug("CELLAR CORE: register event handler service registry"); - registry = new EventHandlerServiceRegistry(); + final EventHandlerServiceRegistry registry = new EventHandlerServiceRegistry(); register(EventHandlerRegistry.class, registry); LOGGER.debug("CELLAR CORE: starting event handler service tracker"); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9e425979/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java ---------------------------------------------------------------------- diff --git a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java index dd23737..b3c924f 100644 --- a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java +++ b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/internal/osgi/Activator.java @@ -80,7 +80,7 @@ public class Activator extends BaseActivator { LOGGER.debug("CELLAR DOSGI: init remote service result handler"); RemoteServiceResultHandler remoteServiceResultHandler = new RemoteServiceResultHandler(); remoteServiceResultHandler.setCommandStore(commandStore); - register(EventHandler.class, remoteServiceCallHandler); + register(EventHandler.class, remoteServiceResultHandler); LOGGER.debug("CELLAR DOSGI: init import service listener"); importServiceListener = new ImportServiceListener(); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/9e425979/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java ---------------------------------------------------------------------- diff --git a/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java b/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java index 09c8dad..5d33061 100644 --- a/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java +++ b/samples/dosgi-greeter/client/src/main/java/org/apache/karaf/cellar/samples/dosgi/greeter/client/GreetCommand.java @@ -14,6 +14,7 @@ package org.apache.karaf.cellar.samples.dosgi.greeter.client; import org.apache.karaf.cellar.samples.dosgi.greeter.api.Greeter; +import org.apache.karaf.shell.api.action.Action; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.lifecycle.Reference; @@ -21,7 +22,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Service; @Command(scope = "dosgi-greeter", name = "greet", description = "Starts the greet client") @Service -public class GreetCommand { +public class GreetCommand implements Action { @Argument(index = 0, name = "greetMessage", description = "The message that will be sent as the greeting.", required = true, multiValued = false) String greetMessage; @@ -32,7 +33,7 @@ public class GreetCommand { @Reference private Greeter greeter; - protected Object doExecute() throws Exception { + public Object execute() throws Exception { GreeterClient greeterClient = new GreeterClient(greeter, greetMessage,iterations); greeterClient.start(); return null;
