Author: davsclaus
Date: Tue Dec 11 12:03:50 2012
New Revision: 1420115
URL: http://svn.apache.org/viewvc?rev=1420115&view=rev
Log:
CAMEL-5816: Polished
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1420112
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java?rev=1420115&r1=1420114&r2=1420115&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
Tue Dec 11 12:03:50 2012
@@ -64,6 +64,8 @@ public class ContextInfo extends OsgiCom
System.out.println(StringEscapeUtils.unescapeJava("\tUptime: " +
camelContext.getUptime()));
// the statistics are in the mbeans
+ System.out.println("");
+
System.out.println(StringEscapeUtils.unescapeJava("\u001B[1mStatistics\u001B[0m"));
ObjectName contextMBean = null;
ManagementAgent agent =
camelContext.getManagementStrategy().getManagementAgent();
if (agent != null) {
@@ -136,8 +138,8 @@ public class ContextInfo extends OsgiCom
} else {
System.out.println("");
- System.out.println(StringEscapeUtils.unescapeJava("\u001B[31mJMX
Agent of Camel is not reachable. Maybe it has been disabled on the camel
Context"));
- System.out.println(StringEscapeUtils.unescapeJava("In consequence,
the statistics are not available.\u001B[0m"));
+ System.out.println(StringEscapeUtils.unescapeJava("\u001B[31mJMX
Agent of Camel is not reachable. Maybe it has been disabled on the Camel
context"));
+ System.out.println(StringEscapeUtils.unescapeJava("In consequence,
some statistics are not available.\u001B[0m"));
}
System.out.println("");
Modified:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java?rev=1420115&r1=1420114&r2=1420115&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java
Tue Dec 11 12:03:50 2012
@@ -68,7 +68,7 @@ public class ContextList extends OsgiCom
private static Map<String, Integer> computeColumnWidths(final
Iterable<CamelContext> camelContexts) throws Exception {
if (camelContexts == null) {
- throw new IllegalArgumentException("unable to determine column
widths from null Iterable<CamelContext>");
+ throw new IllegalArgumentException("Unable to determine column
widths from null Iterable<CamelContext>");
} else {
int maxNameLen = 0;
int maxStatusLen = 0;
Modified:
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java?rev=1420115&r1=1420114&r2=1420115&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
(original)
+++
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
Tue Dec 11 12:03:50 2012
@@ -123,8 +123,8 @@ public class RouteInfo extends OsgiComma
}
} else {
System.out.println("");
-
System.out.println(StringEscapeUtils.unescapeJava("\u001B[31mJMX Agent of Camel
is not reachable. Maybe it has been disabled on the camel Context"));
- System.out.println(StringEscapeUtils.unescapeJava("In
consequence, the statistics are not available.\u001B[0m"));
+
System.out.println(StringEscapeUtils.unescapeJava("\u001B[31mJMX Agent of Camel
is not reachable. Maybe it has been disabled on the Camel context"));
+ System.out.println(StringEscapeUtils.unescapeJava("In
consequence, some statistics are not available.\u001B[0m"));
}
System.out.println("");