CAMEL-8044: Camel commands useable for remote JVMs using jolokia
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55c57091 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55c57091 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55c57091 Branch: refs/heads/master Commit: 55c570919390df0f72b03c0a551561d1c77e3638 Parents: c9a5698 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Dec 16 11:16:34 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Dec 16 11:16:34 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/karaf/commands/AbstractRouteCommand.java | 2 +- .../org/apache/camel/karaf/commands/EndpointExplain.java | 2 +- .../java/org/apache/camel/karaf/commands/EndpointList.java | 2 +- .../org/apache/camel/karaf/commands/RestRegistryList.java | 2 +- .../main/java/org/apache/camel/karaf/commands/RestShow.java | 2 +- .../org/apache/camel/karaf/commands/RouteResetStats.java | 8 ++++++-- .../java/org/apache/camel/karaf/commands/RouteResume.java | 2 +- .../main/java/org/apache/camel/karaf/commands/RouteShow.java | 2 +- .../java/org/apache/camel/karaf/commands/RouteStart.java | 2 +- .../main/java/org/apache/camel/karaf/commands/RouteStop.java | 2 +- .../java/org/apache/camel/karaf/commands/RouteSuspend.java | 2 +- 11 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java index 8d4b00f..ac9ddf6 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java @@ -23,7 +23,7 @@ public abstract class AbstractRouteCommand extends CamelCommandSupport { @Argument(index = 0, name = "route", description = "The Camel route ID or a wildcard expression", required = true, multiValued = false) String route; - @Argument(index = 1, name = "context", description = "The Camel context name.", required = false, multiValued = false) + @Argument(index = 1, name = "context", description = "The Camel context name.", required = true, multiValued = false) String context; } http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java index 88e6f56..be0d312 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointExplain.java @@ -21,7 +21,7 @@ import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; -@Command(scope = "camel", name = "endpoint-explain", description = "Explain all Camel endpoints available in CamelContexts.") +@Command(scope = "camel", name = "endpoint-explain", description = "Explain all Camel endpoints available in the CamelContext") public class EndpointExplain extends CamelCommandSupport { @Argument(index = 0, name = "name", description = "The name of the Camel context", required = true, multiValued = false) http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java index fdb86d5..fca9f76 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointList.java @@ -21,7 +21,7 @@ import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; -@Command(scope = "camel", name = "endpoint-list", description = "Lists Camel endpoints.") +@Command(scope = "camel", name = "endpoint-list", description = "Lists Camel endpoints") public class EndpointList extends CamelCommandSupport { @Argument(index = 0, name = "name", description = "The name of the Camel context", required = true, multiValued = false) http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestRegistryList.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestRegistryList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestRegistryList.java index 41f8da0..2fc92d8 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestRegistryList.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestRegistryList.java @@ -21,7 +21,7 @@ import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; import org.apache.felix.gogo.commands.Option; -@Command(scope = "camel", name = "rest-registry-list", description = "Lists all Camel REST services enlisted in the Rest Registry from all CamelContexts.") +@Command(scope = "camel", name = "rest-registry-list", description = "Lists all Camel REST services enlisted in the Rest Registry from one or more CamelContexts.") public class RestRegistryList extends CamelCommandSupport { @Argument(index = 0, name = "name", description = "The Camel context name where to look for the REST services", required = false, multiValued = false) http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java index 2f4c192..dd5fb63 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RestShow.java @@ -20,7 +20,7 @@ import org.apache.camel.commands.RestShowCommand; import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = "rest-show", description = "Display the Camel REST definition in XML.") +@Command(scope = "camel", name = "rest-show", description = "Display the Camel REST definition in XML") public class RestShow extends CamelCommandSupport { @Argument(index = 0, name = "context", description = "The Camel context name.", required = true, multiValued = false) http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResetStats.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResetStats.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResetStats.java index 3832a8d..cc8bab5 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResetStats.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResetStats.java @@ -17,10 +17,14 @@ package org.apache.camel.karaf.commands; import org.apache.camel.commands.RouteResetStatsCommand; +import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = "route-reset-stats", description = "Reset performance stats on a route or group of routes") -public class RouteResetStats extends AbstractRouteCommand { +@Command(scope = "camel", name = "route-reset-stats", description = "Reset route performance stats from a CamelContext") +public class RouteResetStats extends CamelCommandSupport { + + @Argument(index = 0, name = "context", description = "The name of the Camel context.", required = true, multiValued = false) + String context; @Override protected Object doExecute() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java index 68874db..aa730ca 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java @@ -19,7 +19,7 @@ package org.apache.camel.karaf.commands; import org.apache.camel.commands.RouteResumeCommand; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = "route-resume", description = "Resume a Camel route or a group of routes.") +@Command(scope = "camel", name = "route-resume", description = "Resume a Camel route") public class RouteResume extends AbstractRouteCommand { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteShow.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteShow.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteShow.java index ac1132c..1b421c1 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteShow.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteShow.java @@ -20,7 +20,7 @@ import org.apache.camel.commands.RouteShowCommand; import org.apache.felix.gogo.commands.Argument; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = "route-show", description = "Display the Camel route definition in XML.") +@Command(scope = "camel", name = "route-show", description = "Display the Camel route definition in XML") public class RouteShow extends CamelCommandSupport { @Argument(index = 0, name = "route", description = "The Camel route ID.", required = true, multiValued = false) http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java index adf1041..a19b732 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java @@ -19,7 +19,7 @@ package org.apache.camel.karaf.commands; import org.apache.camel.commands.RouteStartCommand; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = "route-start", description = "Start a Camel route or a group of routes") +@Command(scope = "camel", name = "route-start", description = "Start a Camel route") public class RouteStart extends AbstractRouteCommand { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java index b026a35..e7713b6 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java @@ -19,7 +19,7 @@ package org.apache.camel.karaf.commands; import org.apache.camel.commands.RouteStopCommand; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = " route-stop", description = "Stop a Camel route or a group of routes.") +@Command(scope = "camel", name = " route-stop", description = "Stop a Camel route") public class RouteStop extends AbstractRouteCommand { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/55c57091/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java ---------------------------------------------------------------------- diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java index a5519b0..72ebffb 100644 --- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java +++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java @@ -19,7 +19,7 @@ package org.apache.camel.karaf.commands; import org.apache.camel.commands.RouteSuspendCommand; import org.apache.felix.gogo.commands.Command; -@Command(scope = "camel", name = " route-suspend", description = "Suspend a Camel route or a group of routes.") +@Command(scope = "camel", name = " route-suspend", description = "Suspend a Camel route") public class RouteSuspend extends AbstractRouteCommand { @Override
