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 2015/07/28 09:11:36 UTC
[1/6] camel git commit: CAMEL-9021: camel-sip: change dependency to
org.opentelecoms.sip / sip-api
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x dbdcd5817 -> dbfd70dbd
refs/heads/camel-2.15.x 3c7d40466 -> 3b38ddc3f
refs/heads/master 72b9df0d9 -> 19ee7717a
CAMEL-9021: camel-sip: change dependency to org.opentelecoms.sip / sip-api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f78ae35f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f78ae35f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f78ae35f
Branch: refs/heads/master
Commit: f78ae35f0a9cfc6a949e87da260a95ca73c45196
Parents: 72b9df0
Author: Daniel Pocock <da...@pocock.pro>
Authored: Mon Jul 27 18:37:32 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 09:12:10 2015 +0200
----------------------------------------------------------------------
components/camel-sip/pom.xml | 8 ++++----
parent/pom.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f78ae35f/components/camel-sip/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index c8532ae..5b0e49c 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -42,10 +42,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jain-sip-api-1.2</artifactId>
- <version>${servicemix-specs-version}</version>
+ <dependency>
+ <groupId>org.opentelecoms.sip</groupId>
+ <artifactId>sip-api-1.2</artifactId>
+ <version>${sip-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/f78ae35f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 10dce62..fe68820 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -431,6 +431,7 @@
<servlet-api-3.0-version>1.0</servlet-api-3.0-version>
<servlet-version-range>[2.5,4)</servlet-version-range>
<shiro-version>1.2.3</shiro-version>
+ <sip-api-version>1.1</sip-api-version>
<!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases -->
<slf4j-api-version>1.6.6</slf4j-api-version>
<slf4j-version>1.7.12</slf4j-version>
[5/6] camel git commit: CAMEL-9021: camel-sip: change dependency to
org.opentelecoms.sip / sip-api
Posted by da...@apache.org.
CAMEL-9021: camel-sip: change dependency to org.opentelecoms.sip / sip-api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b38ddc3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b38ddc3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b38ddc3
Branch: refs/heads/camel-2.15.x
Commit: 3b38ddc3f41f6b56167b2b0ad4569b8870ef51b7
Parents: 3c7d404
Author: Daniel Pocock <da...@pocock.pro>
Authored: Mon Jul 27 18:37:32 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 09:14:29 2015 +0200
----------------------------------------------------------------------
components/camel-sip/pom.xml | 8 ++++----
parent/pom.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3b38ddc3/components/camel-sip/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index 1ebe51a..7dc0b55 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -42,10 +42,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jain-sip-api-1.2</artifactId>
- <version>${servicemix-specs-version}</version>
+ <dependency>
+ <groupId>org.opentelecoms.sip</groupId>
+ <artifactId>sip-api-1.2</artifactId>
+ <version>${sip-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/3b38ddc3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e40aab1..b289917 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -417,6 +417,7 @@
<servlet-api-3.0-version>1.0</servlet-api-3.0-version>
<servlet-version-range>[2.5,4)</servlet-version-range>
<shiro-version>1.2.3</shiro-version>
+ <sip-api-version>1.1</sip-api-version>
<!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases -->
<slf4j-api-version>1.6.6</slf4j-api-version>
<slf4j-version>1.7.12</slf4j-version>
[4/6] camel git commit: Camel commands show more details
Posted by da...@apache.org.
Camel commands show more details
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19ee7717
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19ee7717
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19ee7717
Branch: refs/heads/master
Commit: 19ee7717aa26621acc6479e2c216d2de35181dd4
Parents: d04768e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 28 09:13:19 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 09:13:19 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/commands/EndpointStatisticCommand.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/19ee7717/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index a89f2e2..9e33f12 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -36,7 +36,7 @@ public class EndpointStatisticCommand extends AbstractCamelCommand {
private static final String DIRECTION_COLUMN_LABEL = "Direction";
private static final String STATIC_COLUMN_LABEL = "Static";
private static final String DYNAMIC_COLUMN_LABEL = "Dynamic";
- private static final String HITS_COLUMN_LABEL = "Hits";
+ private static final String HITS_COLUMN_LABEL = "Total #";
private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
private static final String DEFAULT_FIELD_PREAMBLE = " ";
@@ -82,7 +82,7 @@ public class EndpointStatisticCommand extends AbstractCamelCommand {
if (!header) {
out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, URI_COLUMN_LABEL, ROUTE_COLUMN_LABEL, DIRECTION_COLUMN_LABEL, STATIC_COLUMN_LABEL, DYNAMIC_COLUMN_LABEL, HITS_COLUMN_LABEL));
- out.println(String.format(headerFormat, "-------", "---", "--------", "---------", "------", "-------", "----"));
+ out.println(String.format(headerFormat, "-------", "---", "--------", "---------", "------", "-------", "-------"));
header = true;
}
[2/6] camel git commit: Camel commands show more details
Posted by da...@apache.org.
Camel commands show more details
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d04768e0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d04768e0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d04768e0
Branch: refs/heads/master
Commit: d04768e0d25f4aa533d80a7f907c2732d61b6bf9
Parents: 75ef7eb
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 27 19:49:20 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 09:12:11 2015 +0200
----------------------------------------------------------------------
.../camel/commands/AbstractCamelController.java | 21 +++++
.../apache/camel/commands/CamelController.java | 11 ++-
.../commands/EndpointStatisticCommand.java | 91 +++++++++++++-------
.../camel/karaf/commands/EndpointStats.java | 2 +-
4 files changed, 91 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d04768e0/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 2aad27d..cea1b46 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
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.CatalogHelper;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.commands.internal.RegexUtil;
import org.apache.camel.util.JsonSchemaHelper;
@@ -37,6 +38,26 @@ public abstract class AbstractCamelController implements CamelController {
private CamelCatalog catalog = new DefaultCamelCatalog();
@Override
+ public List<Map<String, String>> getCamelContexts(String filter) throws Exception {
+ List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
+
+ List<Map<String, String>> context = getCamelContexts();
+ if (filter != null) {
+ filter = RegexUtil.wildcardAsRegex(filter);
+ } else {
+ filter = "*";
+ }
+ for (Map<String, String> entry : context) {
+ String name = entry.get("name");
+ if (name.equalsIgnoreCase(filter) || CatalogHelper.matchWildcard(name, filter) || name.matches(filter)) {
+ answer.add(entry);
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
public List<Map<String, String>> listEipsCatalog(String filter) throws Exception {
List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
http://git-wip-us.apache.org/repos/asf/camel/blob/d04768e0/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 67030bc..dd807b4 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
@@ -43,6 +43,15 @@ public interface CamelController {
List<Map<String, String>> getCamelContexts() throws Exception;
/**
+ * Get the list of Camel context filter by reg ex.
+ *
+ * @param filter the filter which supports * and ? as wildcards
+ * @return a list of key/value pairs with CamelContext information
+ * @throws java.lang.Exception can be thrown
+ */
+ List<Map<String, String>> getCamelContexts(String filter) throws Exception;
+
+ /**
* Returns detailed CamelContext and route statistics as XML identified by a ID and a Camel context.
*
* @param camelContextName the Camel context.
@@ -193,7 +202,7 @@ public interface CamelController {
/**
* Return endpoint runtime statistics
*
- * @param camelContextName the Camel context.
+ * @param camelContextName the Camel context
* @return a list of key/value pairs with endpoint runtime statistics
* @throws java.lang.Exception can be thrown
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/d04768e0/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index f9427251..a89f2e2 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -19,6 +19,7 @@ package org.apache.camel.commands;
import java.io.PrintStream;
import java.net.URLDecoder;
import java.util.Hashtable;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -27,8 +28,9 @@ import org.apache.camel.util.URISupport;
/**
* Display endpoint runtime statistics for a CamelContext
*/
-public class EndpointStatisticCommand extends AbstractContextCommand {
+public class EndpointStatisticCommand extends AbstractCamelCommand {
+ private static final String CONTEXT_COLUMN_LABEL = "Context";
private static final String URI_COLUMN_LABEL = "Uri";
private static final String ROUTE_COLUMN_LABEL = "Route Id";
private static final String DIRECTION_COLUMN_LABEL = "Direction";
@@ -46,27 +48,43 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
private static final int MAX_COLUMN_WIDTH = 120;
private static final int MIN_COLUMN_WIDTH = 12;
+ String context;
boolean decode = true;
private String[] filter;
public EndpointStatisticCommand(String context, boolean decode, String[] filter) {
- super(context);
+ this.context = context;
this.decode = decode;
this.filter = filter;
}
@Override
- protected Object performContextCommand(CamelController camelController, String contextName, PrintStream out, PrintStream err) throws Exception {
- List<Map<String, String>> endpoints = camelController.getEndpointRuntimeStatistics(contextName);
+ public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
+ List<Map<String, String>> contexts = camelController.getCamelContexts(context);
- final Map<String, Integer> columnWidths = computeColumnWidths(endpoints);
+ boolean header = false;
+
+ Map<String, List<Map<String, String>>> allEndpoints = new LinkedHashMap<>();
+
+ for (Map<String, String> context : contexts) {
+ String contextName = context.get("name");
+ List<Map<String, String>> endpoints = camelController.getEndpointRuntimeStatistics(contextName);
+ allEndpoints.put(contextName, endpoints);
+ }
+
+ final Map<String, Integer> columnWidths = computeColumnWidths(allEndpoints);
final String headerFormat = buildFormatString(columnWidths, true);
final String rowFormat = buildFormatString(columnWidths, false);
- if (endpoints.size() > 0) {
- out.println(String.format(headerFormat, URI_COLUMN_LABEL, ROUTE_COLUMN_LABEL, DIRECTION_COLUMN_LABEL, STATIC_COLUMN_LABEL, DYNAMIC_COLUMN_LABEL, HITS_COLUMN_LABEL));
- out.println(String.format(headerFormat, "---", "--------", "---------", "------", "-------", "----"));
- for (Map<String, String> row : endpoints) {
+ for (Map.Entry<String, List<Map<String, String>>> entry : allEndpoints.entrySet()) {
+ String contextName = entry.getKey();
+ for (Map<String, String> row : entry.getValue()) {
+
+ if (!header) {
+ out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, URI_COLUMN_LABEL, ROUTE_COLUMN_LABEL, DIRECTION_COLUMN_LABEL, STATIC_COLUMN_LABEL, DYNAMIC_COLUMN_LABEL, HITS_COLUMN_LABEL));
+ out.println(String.format(headerFormat, "-------", "---", "--------", "---------", "------", "-------", "----"));
+ header = true;
+ }
String uri = row.get("uri");
if (decode) {
@@ -83,7 +101,7 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
// should we filter
if (isValidRow(direction, isStatic, isDynamic)) {
- out.println(String.format(rowFormat, uri, routeId, direction, isStatic, isDynamic, hits));
+ out.println(String.format(rowFormat, contextName, uri, routeId, direction, isStatic, isDynamic, hits));
}
}
}
@@ -115,10 +133,11 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
return answer;
}
- private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> endpoints) throws Exception {
- if (endpoints == null) {
+ private Map<String, Integer> computeColumnWidths(Map<String, List<Map<String, String>>> allEndpoints) throws Exception {
+ if (allEndpoints == null) {
throw new IllegalArgumentException("Unable to determine column widths from null Iterable<Endpoint>");
} else {
+ int maxContextLen = 0;
int maxUriLen = 0;
int maxRouteIdLen = 0;
int maxDirectionLen = 0;
@@ -126,36 +145,40 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
int maxDynamicLen = 0;
int maxHitsLen = 0;
- for (Map<String, String> row : endpoints) {
- final String name = row.get("camelContextName");
+ for (Map.Entry<String, List<Map<String, String>>> entry : allEndpoints.entrySet()) {
+ String contextName = entry.getKey();
+ for (Map<String, String> row : entry.getValue()) {
+ maxContextLen = Math.max(maxContextLen, contextName == null ? 0 : contextName.length());
- String uri = row.get("uri");
- if (decode) {
- // decode uri so its more human readable
- uri = URLDecoder.decode(uri, "UTF-8");
- }
- // sanitize and mask uri so we dont see passwords
- uri = URISupport.sanitizeUri(uri);
+ String uri = row.get("uri");
+ if (decode) {
+ // decode uri so its more human readable
+ uri = URLDecoder.decode(uri, "UTF-8");
+ }
+ // sanitize and mask uri so we dont see passwords
+ uri = URISupport.sanitizeUri(uri);
- maxUriLen = Math.max(maxUriLen, uri == null ? 0 : uri.length());
+ maxUriLen = Math.max(maxUriLen, uri == null ? 0 : uri.length());
- final String routeId = row.get("routeId");
- maxRouteIdLen = Math.max(maxRouteIdLen, routeId == null ? 0 : routeId.length());
+ final String routeId = row.get("routeId");
+ maxRouteIdLen = Math.max(maxRouteIdLen, routeId == null ? 0 : routeId.length());
- final String direction = row.get("direction");
- maxDirectionLen = Math.max(maxDirectionLen, direction == null ? 0 : direction.length());
+ final String direction = row.get("direction");
+ maxDirectionLen = Math.max(maxDirectionLen, direction == null ? 0 : direction.length());
- final String isStatic = row.get("static");
- maxStaticLen = Math.max(maxStaticLen, isStatic == null ? 0 : isStatic.length());
+ final String isStatic = row.get("static");
+ maxStaticLen = Math.max(maxStaticLen, isStatic == null ? 0 : isStatic.length());
- final String isDynamic = row.get("dynamic");
- maxDynamicLen = Math.max(maxDynamicLen, isDynamic == null ? 0 : isDynamic.length());
+ final String isDynamic = row.get("dynamic");
+ maxDynamicLen = Math.max(maxDynamicLen, isDynamic == null ? 0 : isDynamic.length());
- final String hits = row.get("hits");
- maxHitsLen = Math.max(maxHitsLen, hits == null ? 0 : hits.length());
+ final String hits = row.get("hits");
+ maxHitsLen = Math.max(maxHitsLen, hits == null ? 0 : hits.length());
+ }
}
final Map<String, Integer> retval = new Hashtable<String, Integer>();
+ retval.put(CONTEXT_COLUMN_LABEL, maxContextLen);
retval.put(URI_COLUMN_LABEL, maxUriLen);
retval.put(ROUTE_COLUMN_LABEL, maxRouteIdLen);
retval.put(DIRECTION_COLUMN_LABEL, maxDirectionLen);
@@ -181,6 +204,9 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
}
columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
+ int contextLen = Math.min(columnWidths.get(CONTEXT_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+ contextLen = Math.max(MIN_COLUMN_WIDTH, contextLen);
+
int uriLen = Math.min(columnWidths.get(URI_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
uriLen = Math.max(MIN_COLUMN_WIDTH, uriLen);
@@ -199,6 +225,7 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
// last row does not have min width
final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
+ retval.append(fieldPreamble).append("%-").append(contextLen).append('.').append(contextLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(uriLen).append('.').append(uriLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(routeIdLen).append('.').append(routeIdLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(directionLen).append('.').append(directionLen).append('s').append(fieldPostamble).append(' ');
http://git-wip-us.apache.org/repos/asf/camel/blob/d04768e0/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointStats.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointStats.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointStats.java
index a9b64b6..a06ff4c 100644
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointStats.java
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/EndpointStats.java
@@ -24,7 +24,7 @@ import org.apache.felix.gogo.commands.Option;
@Command(scope = "camel", name = "endpoint-stats", description = "Display endpoint runtime statistics")
public class EndpointStats extends CamelCommandSupport {
- @Argument(index = 0, name = "name", description = "The name of the Camel context", required = true, multiValued = false)
+ @Argument(index = 0, name = "name", description = "The name of the Camel context (support wildcard)", required = false, multiValued = false)
String name;
@Option(name = "--filter", aliases = "-f", description = "Filter the list by in,out,static,dynamic",
[3/6] camel git commit: Camel commands show more details
Posted by da...@apache.org.
Camel commands show more details
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75ef7eb2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75ef7eb2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75ef7eb2
Branch: refs/heads/master
Commit: 75ef7eb214def5f98e003fe48ca405d468fee454
Parents: f78ae35
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 27 19:04:37 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 09:12:11 2015 +0200
----------------------------------------------------------------------
.../camel/commands/ContextListCommand.java | 38 +++++++++++++++++---
.../commands/EndpointStatisticCommand.java | 2 +-
.../jolokia/DefaultJolokiaCamelController.java | 5 ++-
.../commands/internal/CamelControllerImpl.java | 9 +++++
4 files changed, 47 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/75ef7eb2/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
index 4ce3e37..41a4ec1 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextListCommand.java
@@ -28,6 +28,9 @@ public class ContextListCommand extends AbstractCamelCommand {
private static final String CONTEXT_COLUMN_LABEL = "Context";
private static final String STATUS_COLUMN_LABEL = "Status";
+ private static final String TOTAL_COLUMN_LABEL = "Total #";
+ private static final String FAILED_COLUMN_LABEL = "Failed #";
+ private static final String INFLIGHT_COLUMN_LABEL = "Inflight #";
private static final String UPTIME_COLUMN_LABEL = "Uptime";
private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
private static final String DEFAULT_FIELD_PREAMBLE = " ";
@@ -47,10 +50,11 @@ public class ContextListCommand extends AbstractCamelCommand {
final String rowFormat = buildFormatString(columnWidths, false);
if (camelContexts.size() > 0) {
- out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, STATUS_COLUMN_LABEL, UPTIME_COLUMN_LABEL));
- out.println(String.format(headerFormat, "-------", "------", "------"));
+ out.println(String.format(headerFormat, CONTEXT_COLUMN_LABEL, STATUS_COLUMN_LABEL, TOTAL_COLUMN_LABEL, FAILED_COLUMN_LABEL, INFLIGHT_COLUMN_LABEL, UPTIME_COLUMN_LABEL));
+ out.println(String.format(headerFormat, "-------", "------", "-------", "--------", "----------", "------"));
for (Map<String, String> row : camelContexts) {
- out.println(String.format(rowFormat, row.get("name"), row.get("state"), row.get("uptime")));
+ out.println(String.format(rowFormat, row.get("name"), row.get("state"), row.get("exchangesTotal"),
+ row.get("exchangesFailed"), row.get("exchangesInflight"), row.get("uptime")));
}
}
@@ -63,6 +67,9 @@ public class ContextListCommand extends AbstractCamelCommand {
} else {
int maxNameLen = 0;
int maxStatusLen = 0;
+ int maxTotalLen = 0;
+ int maxFailedLen = 0;
+ int maxInflightLen = 0;
int maxUptimeLen = 0;
for (Map<String, String> row : camelContexts) {
@@ -72,13 +79,25 @@ public class ContextListCommand extends AbstractCamelCommand {
final String status = row.get("state");
maxStatusLen = java.lang.Math.max(maxStatusLen, status == null ? 0 : status.length());
+ final String total = row.get("exchangesTotal");
+ maxTotalLen = java.lang.Math.max(maxTotalLen, total == null ? 0 : total.length());
+
+ final String failed = row.get("exchangesFailed");
+ maxFailedLen = java.lang.Math.max(maxFailedLen, failed == null ? 0 : failed.length());
+
+ final String inflight = row.get("exchangesInflight");
+ maxInflightLen = java.lang.Math.max(maxInflightLen, inflight == null ? 0 : inflight.length());
+
final String uptime = row.get("uptime");
maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length());
}
- final Map<String, Integer> retval = new Hashtable<String, Integer>(3);
+ final Map<String, Integer> retval = new Hashtable<String, Integer>();
retval.put(CONTEXT_COLUMN_LABEL, maxNameLen);
retval.put(STATUS_COLUMN_LABEL, maxStatusLen);
+ retval.put(TOTAL_COLUMN_LABEL, maxTotalLen);
+ retval.put(FAILED_COLUMN_LABEL, maxFailedLen);
+ retval.put(INFLIGHT_COLUMN_LABEL, maxInflightLen);
retval.put(UPTIME_COLUMN_LABEL, maxUptimeLen);
return retval;
@@ -101,14 +120,23 @@ public class ContextListCommand extends AbstractCamelCommand {
int contextLen = java.lang.Math.min(columnWidths.get(CONTEXT_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int statusLen = java.lang.Math.min(columnWidths.get(STATUS_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
+ int totalLen = java.lang.Math.min(columnWidths.get(TOTAL_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
+ int failedlLen = java.lang.Math.min(columnWidths.get(FAILED_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
+ int inflightLen = java.lang.Math.min(columnWidths.get(INFLIGHT_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
int uptimeLen = java.lang.Math.min(columnWidths.get(UPTIME_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
contextLen = Math.max(MIN_COLUMN_WIDTH, contextLen);
statusLen = Math.max(MIN_COLUMN_WIDTH, statusLen);
- // last row does not have min width
+ totalLen = Math.max(MIN_COLUMN_WIDTH, totalLen);
+ failedlLen = Math.max(MIN_COLUMN_WIDTH, failedlLen);
+ inflightLen = Math.max(MIN_COLUMN_WIDTH, inflightLen);
+ uptimeLen = Math.max(MIN_COLUMN_WIDTH, uptimeLen);
final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
retval.append(fieldPreamble).append("%-").append(contextLen).append('.').append(contextLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(statusLen).append('.').append(statusLen).append('s').append(fieldPostamble).append(' ');
+ retval.append(fieldPreamble).append("%").append(totalLen).append('.').append(totalLen).append('s').append(fieldPostamble).append(' ');
+ retval.append(fieldPreamble).append("%").append(failedlLen).append('.').append(failedlLen).append('s').append(fieldPostamble).append(' ');
+ retval.append(fieldPreamble).append("%").append(inflightLen).append('.').append(inflightLen).append('s').append(fieldPostamble).append(' ');
retval.append(fieldPreamble).append("%-").append(uptimeLen).append('.').append(uptimeLen).append('s').append(fieldPostamble).append(' ');
return retval.toString();
http://git-wip-us.apache.org/repos/asf/camel/blob/75ef7eb2/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
index fb76655..f9427251 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointStatisticCommand.java
@@ -194,7 +194,7 @@ public class EndpointStatisticCommand extends AbstractContextCommand {
staticLen = Math.max(MIN_COLUMN_WIDTH, staticLen);
int dynamicLen = Math.min(columnWidths.get(DYNAMIC_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
- dynamicLen = Math.max(MIN_COLUMN_WIDTH, staticLen);
+ dynamicLen = Math.max(MIN_COLUMN_WIDTH, dynamicLen);
// last row does not have min width
http://git-wip-us.apache.org/repos/asf/camel/blob/75ef7eb2/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
index 454fbb0..bcf37e2 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
@@ -192,7 +192,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
List<J4pReadRequest> list = new ArrayList<J4pReadRequest>();
for (ObjectName on : sr.getObjectNames()) {
- list.add(new J4pReadRequest(on, "CamelId", "State", "Uptime"));
+ list.add(new J4pReadRequest(on, "CamelId", "State", "Uptime", "ExchangesTotal", "ExchangesInflight", "ExchangesFailed"));
}
List<J4pReadResponse> lrr = jolokia.execute(list);
@@ -201,6 +201,9 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
row.put("name", rr.getValue("CamelId").toString());
row.put("state", rr.getValue("State").toString());
row.put("uptime", rr.getValue("Uptime").toString());
+ row.put("exchangesTotal", rr.getValue("ExchangesTotal").toString());
+ row.put("exchangesInflight", rr.getValue("ExchangesInflight").toString());
+ row.put("exchangesFailed", rr.getValue("ExchangesFailed").toString());
answer.add(row);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/75ef7eb2/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
index b026ff0..25d9ae9 100644
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
@@ -83,6 +83,15 @@ public class CamelControllerImpl extends AbstractLocalCamelController {
row.put("name", camelContext.getName());
row.put("state", camelContext.getStatus().name());
row.put("uptime", camelContext.getUptime());
+ if (camelContext.getManagedCamelContext() != null) {
+ row.put("exchangesTotal", "" + camelContext.getManagedCamelContext().getExchangesTotal());
+ row.put("exchangesInflight", "" + camelContext.getManagedCamelContext().getExchangesInflight());
+ row.put("exchangesFailed", "" + camelContext.getManagedCamelContext().getExchangesFailed());
+ } else {
+ row.put("exchangesTotal", "0");
+ row.put("exchangesInflight", "0");
+ row.put("exchangesFailed", "0");
+ }
answer.add(row);
}
[6/6] camel git commit: CAMEL-9021: camel-sip: change dependency to
org.opentelecoms.sip / sip-api
Posted by da...@apache.org.
CAMEL-9021: camel-sip: change dependency to org.opentelecoms.sip / sip-api
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbfd70db
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbfd70db
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbfd70db
Branch: refs/heads/camel-2.14.x
Commit: dbfd70dbd45950dea78aaebacd5b7ecfd517df5f
Parents: dbdcd58
Author: Daniel Pocock <da...@pocock.pro>
Authored: Mon Jul 27 18:37:32 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 28 09:14:43 2015 +0200
----------------------------------------------------------------------
components/camel-sip/pom.xml | 8 ++++----
parent/pom.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dbfd70db/components/camel-sip/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index 4cee087..9a3eed0 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -42,10 +42,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jain-sip-api-1.2</artifactId>
- <version>${servicemix-specs-version}</version>
+ <dependency>
+ <groupId>org.opentelecoms.sip</groupId>
+ <artifactId>sip-api-1.2</artifactId>
+ <version>${sip-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/dbfd70db/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d0fd871..cd5082b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,6 +386,7 @@
<servlet-api-3.0-version>1.0</servlet-api-3.0-version>
<servlet-version-range>[2.5,4)</servlet-version-range>
<shiro-version>1.2.3</shiro-version>
+ <sip-api-version>1.1</sip-api-version>
<!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases -->
<slf4j-api-version>1.6.6</slf4j-api-version>
<slf4j-version>1.7.12</slf4j-version>