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/11 10:53:50 UTC
[2/2] 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/f8b97b4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8b97b4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8b97b4c
Branch: refs/heads/master
Commit: f8b97b4c5fd849a3cd1897978de2db9b4d51e1eb
Parents: 792ce5c
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Dec 11 10:53:40 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Dec 11 10:53:40 2014 +0100
----------------------------------------------------------------------
.../org/apache/camel/commands/ContextInfoCommand.java | 11 ++++++-----
.../org/apache/camel/commands/RouteInfoCommand.java | 13 +++----------
2 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8b97b4c/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
index caa085d..6722ab9 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java
@@ -90,13 +90,14 @@ public class ContextInfoCommand extends AbstractCamelCommand {
out.println(stringEscape.unescapeJava("\t" + key + " = " + entry.getValue()));
}
}
- out.println("");
- out.println(stringEscape.unescapeJava("\u001B[1mAdvanced\u001B[0m"));
- out.println(stringEscape.unescapeJava("\tClassResolver: " + row.get("classResolver")));
- out.println(stringEscape.unescapeJava("\tPackageScanClassResolver: " + row.get("packageScanClassResolver")));
- out.println(stringEscape.unescapeJava("\tApplicationContextClassLoader: " + row.get("applicationContextClassLoader")));
if (verbose) {
+ out.println("");
+ out.println(stringEscape.unescapeJava("\u001B[1mAdvanced\u001B[0m"));
+ out.println(stringEscape.unescapeJava("\tClassResolver: " + row.get("classResolver")));
+ out.println(stringEscape.unescapeJava("\tPackageScanClassResolver: " + row.get("packageScanClassResolver")));
+ out.println(stringEscape.unescapeJava("\tApplicationContextClassLoader: " + row.get("applicationContextClassLoader")));
+
printStatistics(camelController, out);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f8b97b4c/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 24c1238..fb016f3 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
@@ -23,7 +23,6 @@ import java.util.Date;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.RouteStatDump;
import static org.apache.camel.util.ObjectHelper.isEmpty;
@@ -52,8 +51,6 @@ public class RouteInfoCommand extends AbstractRouteCommand {
public void executeOnRoute(CamelController camelController, String contextName, String routeId, PrintStream out, PrintStream err) throws Exception {
out.println(stringEscape.unescapeJava("\u001B[1mCamel Route " + routeId + "\u001B[0m"));
out.println(stringEscape.unescapeJava("\tCamel Context: " + contextName));
- out.println("");
- out.println(stringEscape.unescapeJava("\u001B[1mStatistics\u001B[0m"));
String xml = camelController.getRouteStatsAsXml(routeId, contextName, true, false);
if (xml != null) {
@@ -61,7 +58,10 @@ public class RouteInfoCommand extends AbstractRouteCommand {
Unmarshaller unmarshaller = context.createUnmarshaller();
RouteStatDump route = (RouteStatDump) unmarshaller.unmarshal(new StringReader(xml));
+ out.println(stringEscape.unescapeJava("\tState: " + route.getState()));
+ out.println("");
+ out.println(stringEscape.unescapeJava("\u001B[1mStatistics\u001B[0m"));
long total = route.getExchangesCompleted() + route.getExchangesFailed();
out.println(stringEscape.unescapeJava("\tExchanges Total: " + total));
out.println(stringEscape.unescapeJava("\tExchanges Completed: " + route.getExchangesCompleted()));
@@ -103,13 +103,6 @@ public class RouteInfoCommand extends AbstractRouteCommand {
String text = new SimpleDateFormat(OUTPUT_TIMESTAMP_FORMAT).format(date);
out.println(stringEscape.unescapeJava("\tLast Exchange Date: " + text));
}
-
- out.println("");
- xml = camelController.getRouteModelAsXml(routeId, contextName);
- if (xml != null) {
- out.println(stringEscape.unescapeJava("\u001B[1mDefinition\u001B[0m"));
- out.println(stringEscape.unescapeJava(xml));
- }
}
}
}