You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/12/10 17:32:18 UTC
[08/15] camel git commit: CAMEL-8044: Camel commands should be more
reusable for remote JVMs
CAMEL-8044: Camel commands should be more reusable for remote JVMs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0fe994b4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0fe994b4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0fe994b4
Branch: refs/heads/master
Commit: 0fe994b423314a0f8a4d10da272ba472e25d3403
Parents: 53b4e90
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 10 13:53:44 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 10 13:53:44 2014 +0100
----------------------------------------------------------------------
.../camel/commands/AbstractCamelController.java | 15 +++++++++++++--
.../org/apache/camel/commands/CamelController.java | 6 +++---
.../org/apache/camel/commands/RouteInfoCommand.java | 10 +++++-----
.../org/apache/camel/commands/RouteShowCommand.java | 8 +++-----
4 files changed, 24 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0fe994b4/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
index 43a90c6..f0186ae 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
@@ -115,12 +115,23 @@ public abstract class AbstractCamelController implements CamelController {
}
@SuppressWarnings("deprecation")
- public RouteDefinition getRouteDefinition(String routeId, String camelContextName) {
+ public String getRouteModelAsXml(String routeId, String camelContextName) {
CamelContext context = this.getCamelContext(camelContextName);
if (context == null) {
return null;
}
- return context.getRouteDefinition(routeId);
+ RouteDefinition route = context.getRouteDefinition(routeId);
+ if (route == null) {
+ return null;
+ }
+
+ String xml;
+ try {
+ xml = ModelHelper.dumpModelAsXml(route);
+ } catch (JAXBException e) {
+ throw ObjectHelper.wrapRuntimeCamelException(e);
+ }
+ return xml;
}
@SuppressWarnings("deprecation")
http://git-wip-us.apache.org/repos/asf/camel/blob/0fe994b4/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
index 18ea7f6..ddf4040 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
@@ -74,13 +74,13 @@ public interface CamelController {
Route getRoute(String routeId, String camelContextName);
/**
- * Return the definition of a route identified by a ID and a Camel context.
+ * Return the definition of a route as XML identified by a ID and a Camel context.
*
* @param routeId the route ID.
* @param camelContextName the Camel context.
- * @return the <code>RouteDefinition</code>.
+ * @return the route model as XML
*/
- RouteDefinition getRouteDefinition(String routeId, String camelContextName);
+ String getRouteModelAsXml(String routeId, String camelContextName);
/**
* Return the endpoints
http://git-wip-us.apache.org/repos/asf/camel/blob/0fe994b4/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteInfoCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteInfoCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteInfoCommand.java
index 6a4e663..e648546 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteInfoCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteInfoCommand.java
@@ -27,8 +27,6 @@ import javax.management.ObjectName;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
-import org.apache.camel.model.ModelHelper;
-import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.ManagementAgent;
/**
@@ -136,9 +134,11 @@ public class RouteInfoCommand extends AbstractRouteCommand {
}
out.println("");
- out.println(stringEscape.unescapeJava("\u001B[1mDefinition\u001B[0m"));
- RouteDefinition definition = camelController.getRouteDefinition(camelRoute.getId(), camelRoute.getRouteContext().getCamelContext().getName());
- out.println(stringEscape.unescapeJava(ModelHelper.dumpModelAsXml(definition)));
+ String xml = camelController.getRouteModelAsXml(camelRoute.getId(), camelRoute.getRouteContext().getCamelContext().getName());
+ if (xml != null) {
+ out.println(stringEscape.unescapeJava("\u001B[1mDefinition\u001B[0m"));
+ out.println(stringEscape.unescapeJava(xml));
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0fe994b4/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java
index 8c150c3..af460a3 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteShowCommand.java
@@ -20,8 +20,6 @@ import java.io.PrintStream;
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
-import org.apache.camel.model.ModelHelper;
-import org.apache.camel.model.RouteDefinition;
/**
* Command to show the route marshaled in XML.
@@ -34,10 +32,10 @@ public class RouteShowCommand extends AbstractRouteCommand {
@Override
public void executeOnRoute(CamelController camelController, CamelContext camelContext, Route camelRoute, PrintStream out, PrintStream err) throws Exception {
- RouteDefinition routeDefinition = camelController.getRouteDefinition(camelRoute.getId(), camelRoute.getRouteContext().getCamelContext().getName());
- if (routeDefinition == null) {
+ String xml = camelController.getRouteModelAsXml(camelRoute.getId(), camelRoute.getRouteContext().getCamelContext().getName());
+ if (xml == null) {
err.println("Definition of route " + camelRoute.getId() + " not found.");
}
- System.out.println(ModelHelper.dumpModelAsXml(routeDefinition));
+ System.out.println(xml);
}
}