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/01/17 08:27:37 UTC
[1/4] camel git commit: CAMEL-8196 Add labels for all the model
classes
Repository: camel
Updated Branches:
refs/heads/master 3cad8db9b -> 059aaf024
CAMEL-8196 Add labels for all the model classes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc2a1d08
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc2a1d08
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc2a1d08
Branch: refs/heads/master
Commit: bc2a1d08e0b28a0bc07acef17094f82daa1a3ef5
Parents: 3cad8db
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 16 17:29:35 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 16 17:29:35 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/management/ManagedCamelContextTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bc2a1d08/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index b86766b..ebf91fb 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -267,7 +267,7 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
String json = (String) mbeanServer.invoke(on, "explainEipJson", new Object[]{"transform", false}, new String[]{"java.lang.String", "boolean"});
assertNotNull(json);
- assertTrue(json.contains("\"label\": \"transformation\""));
+ assertTrue(json.contains("\"label\": \"eip,transformation\""));
assertTrue(json.contains("\"expression\": { \"kind\": \"element\", \"required\": \"true\", \"type\": \"object\""));
}
[2/4] camel git commit: CAMEL-8252: Add inflight exchanges to jmx
performance counters as that is similar to the other stats,
instead of having to filter all inflights to find per processor.
Posted by da...@apache.org.
CAMEL-8252: Add inflight exchanges to jmx performance counters as that is similar to the other stats, instead of having to filter all inflights to find per processor.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0581024
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0581024
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0581024
Branch: refs/heads/master
Commit: e0581024441efc99cfaf4e1aa59e6c94f38f078c
Parents: bc2a1d0
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 16 17:44:44 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 16 17:44:44 2015 +0100
----------------------------------------------------------------------
.../api/management/PerformanceCounter.java | 7 +++++
.../mbean/ManagedCamelContextMBean.java | 3 ++
.../mbean/ManagedPerformanceCounterMBean.java | 3 ++
.../api/management/mbean/ManagedRouteMBean.java | 4 +++
.../management/CompositePerformanceCounter.java | 10 ++++++
.../management/DelegatePerformanceCounter.java | 10 +++++-
.../management/InstrumentationProcessor.java | 9 ++++++
.../management/mbean/ManagedCamelContext.java | 32 ++------------------
.../mbean/ManagedPerformanceCounter.java | 11 +++++++
.../camel/management/mbean/ManagedRoute.java | 2 +-
.../camel/management/mbean/Statistic.java | 4 +++
.../camel/processor/CamelInternalProcessor.java | 10 +++++-
12 files changed, 73 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
index d1779d8..91d25e1 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/PerformanceCounter.java
@@ -26,6 +26,13 @@ import org.apache.camel.Exchange;
public interface PerformanceCounter {
/**
+ * Executed when an {@link org.apache.camel.Exchange} is about to be processed.
+ *
+ * @param exchange the exchange
+ */
+ void processExchange(Exchange exchange);
+
+ /**
* Executed when an {@link org.apache.camel.Exchange} is complete.
*
* @param exchange the exchange
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
index aa4efeb..c803cdf 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
@@ -81,6 +81,9 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean
@ManagedAttribute(description = "Tracing")
void setTracing(Boolean tracing);
+ /**
+ * @deprecated use {@link #getExchangesInflight()}
+ */
@ManagedAttribute(description = "Current number of inflight Exchanges")
Integer getInflightExchanges();
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
index 5b83614..613f3b5 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
@@ -29,6 +29,9 @@ public interface ManagedPerformanceCounterMBean extends ManagedCounterMBean {
@ManagedAttribute(description = "Number of failed exchanges")
long getExchangesFailed() throws Exception;
+ @ManagedAttribute(description = "Number of inflight exchanges")
+ long getExchangesInflight() throws Exception;
+
@ManagedAttribute(description = "Number of failures handled")
long getFailuresHandled() throws Exception;
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
index f577320..148c688 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
@@ -33,7 +33,11 @@ public interface ManagedRouteMBean extends ManagedPerformanceCounterMBean {
@ManagedAttribute(description = "Route State")
String getState();
+ /**
+ * @deprecated use {@link #getExchangesInflight()}
+ */
@ManagedAttribute(description = "Current number of inflight Exchanges")
+ @Deprecated
Integer getInflightExchanges();
@ManagedAttribute(description = "Camel ID")
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/CompositePerformanceCounter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/CompositePerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/management/CompositePerformanceCounter.java
index 49067a2..2e93b1c 100644
--- a/camel-core/src/main/java/org/apache/camel/management/CompositePerformanceCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/CompositePerformanceCounter.java
@@ -37,6 +37,16 @@ public class CompositePerformanceCounter implements PerformanceCounter {
}
@Override
+ public void processExchange(Exchange exchange) {
+ if (counter1.isStatisticsEnabled()) {
+ counter1.processExchange(exchange);
+ }
+ if (counter2.isStatisticsEnabled()) {
+ counter2.processExchange(exchange);
+ }
+ }
+
+ @Override
public void completedExchange(Exchange exchange, long time) {
if (counter1.isStatisticsEnabled()) {
counter1.completedExchange(exchange, time);
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
index ef84417..0a0dbff 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DelegatePerformanceCounter.java
@@ -47,8 +47,16 @@ public class DelegatePerformanceCounter implements PerformanceCounter {
this.counter.setStatisticsEnabled(statisticsEnabled);
}
+ public void processExchange(Exchange exchange) {
+ if (counter != null) {
+ counter.processExchange(exchange);
+ }
+ }
+
public void completedExchange(Exchange exchange, long time) {
- counter.completedExchange(exchange, time);
+ if (counter != null) {
+ counter.completedExchange(exchange, time);
+ }
}
public void failedExchange(Exchange exchange) {
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java b/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
index ab6859f..4c4d7dc 100644
--- a/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
@@ -69,6 +69,11 @@ public class InstrumentationProcessor extends DelegateAsyncProcessor {
// only record time if stats is enabled
final StopWatch watch = (counter != null && counter.isStatisticsEnabled()) ? new StopWatch() : null;
+ // mark beginning to process the exchange
+ if (watch != null) {
+ beginTime(exchange);
+ }
+
return processor.process(exchange, new AsyncCallback() {
public void done(boolean doneSync) {
try {
@@ -89,6 +94,10 @@ public class InstrumentationProcessor extends DelegateAsyncProcessor {
});
}
+ protected void beginTime(Exchange exchange) {
+ counter.processExchange(exchange);
+ }
+
protected void recordTime(Exchange exchange, long duration) {
if (LOG.isTraceEnabled()) {
LOG.trace("{}Recording duration: {} millis for exchange: {}", new Object[]{type != null ? type + ": " : "", duration, exchange});
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index be1a69f..c74d391 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -57,7 +57,6 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
-import org.apache.camel.spi.InflightRepository;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.JsonSchemaHelper;
import org.apache.camel.util.ObjectHelper;
@@ -140,7 +139,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
}
public Integer getInflightExchanges() {
- return context.getInflightRepository().size();
+ return (int) super.getExchangesInflight();
}
public Integer getTotalRoutes() {
@@ -398,11 +397,6 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
}
Collections.sort(processors, new OrderProcessorMBeans());
- Collection<InflightRepository.InflightExchange> inflights = null;
- if (fullStats) {
- inflights = context.getInflightRepository().browse();
- }
-
// loop the routes, and append the processor stats if needed
sb.append(" <routeStats>\n");
for (ObjectName on : routes) {
@@ -410,7 +404,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
sb.append(" <routeStat").append(String.format(" id=\"%s\" state=\"%s\"", route.getRouteId(), route.getState()));
// use substring as we only want the attributes
stat = route.dumpStatsAsXml(fullStats);
- sb.append(" exchangesInflight=\"").append(context.getInflightRepository().size(route.getRouteId())).append("\"");
+ sb.append(" exchangesInflight=\"").append(route.getExchangesInflight()).append("\"");
sb.append(" ").append(stat.substring(7, stat.length() - 2)).append(">\n");
// add processor details if needed
@@ -422,10 +416,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
sb.append(" <processorStat").append(String.format(" id=\"%s\" index=\"%s\" state=\"%s\"", processor.getProcessorId(), processor.getIndex(), processor.getState()));
// use substring as we only want the attributes
stat = processor.dumpStatsAsXml(fullStats);
- if (fullStats) {
- // only include this in full stats as it may be more expensive to compute
- sb.append(" exchangesInflight=\"").append(inflightSizeAtProcessor(inflights, processor.getProcessorId())).append("\"");
- }
+ sb.append(" exchangesInflight=\"").append(processor.getExchangesInflight()).append("\"");
sb.append(" ").append(stat.substring(7)).append("\n");
}
}
@@ -440,23 +431,6 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
return sb.toString();
}
- /**
- * Number of inflight exchanges at the given processor
- *
- * @param inflights all inflight exchanges
- * @param processorId the processor id
- * @return the number
- */
- private String inflightSizeAtProcessor(Collection<InflightRepository.InflightExchange> inflights, String processorId) {
- int count = 0;
- for (InflightRepository.InflightExchange inflight : inflights) {
- if (processorId.equals(inflight.getNodeId())) {
- count++;
- }
- }
- return String.valueOf(count);
- }
-
public boolean createEndpoint(String uri) throws Exception {
if (context.hasEndpoint(uri) != null) {
// endpoint already exists
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
index 6aedc57..07c7f95 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java
@@ -33,6 +33,7 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
private Statistic exchangesCompleted;
private Statistic exchangesFailed;
+ private Statistic exchangesInflight;
private Statistic failuresHandled;
private Statistic redeliveries;
private Statistic externalRedeliveries;
@@ -56,6 +57,7 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
super.init(strategy);
this.exchangesCompleted = new Statistic("org.apache.camel.exchangesCompleted", this, Statistic.UpdateMode.COUNTER);
this.exchangesFailed = new Statistic("org.apache.camel.exchangesFailed", this, Statistic.UpdateMode.COUNTER);
+ this.exchangesInflight = new Statistic("org.apache.camel.exchangesInflight", this, Statistic.UpdateMode.COUNTER);
this.failuresHandled = new Statistic("org.apache.camel.failuresHandled", this, Statistic.UpdateMode.COUNTER);
this.redeliveries = new Statistic("org.apache.camel.redeliveries", this, Statistic.UpdateMode.COUNTER);
@@ -79,6 +81,7 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
super.reset();
exchangesCompleted.reset();
exchangesFailed.reset();
+ exchangesInflight.reset();
failuresHandled.reset();
redeliveries.reset();
externalRedeliveries.reset();
@@ -106,6 +109,8 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
return exchangesFailed.getValue();
}
+ public long getExchangesInflight() { return exchangesInflight.getValue(); }
+
public long getFailuresHandled() throws Exception {
return failuresHandled.getValue();
}
@@ -186,9 +191,14 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
this.statisticsEnabled = statisticsEnabled;
}
+ public synchronized void processExchange(Exchange exchange) {
+ exchangesInflight.increment();
+ }
+
public synchronized void completedExchange(Exchange exchange, long time) {
increment();
exchangesCompleted.increment();
+ exchangesInflight.decrement();
if (ExchangeHelper.isFailureHandled(exchange)) {
failuresHandled.increment();
@@ -224,6 +234,7 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement
public synchronized void failedExchange(Exchange exchange) {
increment();
exchangesFailed.increment();
+ exchangesInflight.decrement();
if (ExchangeHelper.isRedelivered(exchange)) {
redeliveries.increment();
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index a0bdfb1..3b57332 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -101,7 +101,7 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
}
public Integer getInflightExchanges() {
- return context.getInflightRepository().size(route.getId());
+ return (int) super.getExchangesInflight();
}
public String getCamelId() {
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/management/mbean/Statistic.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/Statistic.java b/camel-core/src/main/java/org/apache/camel/management/mbean/Statistic.java
index 1b4675f..2f00bf3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/Statistic.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/Statistic.java
@@ -101,6 +101,10 @@ public class Statistic {
updateValue(1);
}
+ public synchronized void decrement() {
+ updateValue(-1);
+ }
+
public synchronized long getValue() {
if (updateMode == UpdateMode.DELTA) {
if (updateCount == 0) {
http://git-wip-us.apache.org/repos/asf/camel/blob/e0581024/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 099af1b..97f557b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -344,6 +344,10 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
}
}
+ protected void beginTime(Exchange exchange) {
+ counter.processExchange(exchange);
+ }
+
protected void recordTime(Exchange exchange, long duration) {
if (LOG.isTraceEnabled()) {
LOG.trace("{}Recording duration: {} millis for exchange: {}", new Object[]{type != null ? type + ": " : "", duration, exchange});
@@ -367,7 +371,11 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
@Override
public StopWatch before(Exchange exchange) throws Exception {
// only record time if stats is enabled
- return (counter != null && counter.isStatisticsEnabled()) ? new StopWatch() : null;
+ StopWatch answer = counter != null && counter.isStatisticsEnabled() ? new StopWatch() : null;
+ if (answer != null) {
+ beginTime(exchange);
+ }
+ return answer;
}
@Override
[3/4] camel git commit: CAMEL-8196 Add labels for all the model
classes
Posted by da...@apache.org.
CAMEL-8196 Add labels for all the model classes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddaa4d30
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddaa4d30
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddaa4d30
Branch: refs/heads/master
Commit: ddaa4d30842a11f8f9e23ba37233ad525d97d472
Parents: e058102
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 16 18:55:14 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 16 18:55:14 2015 +0100
----------------------------------------------------------------------
.../camel/spring/management/SpringManagedCamelContextTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ddaa4d30/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
index 51dc333..91dbb7e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
@@ -52,7 +52,7 @@ public class SpringManagedCamelContextTest extends ManagedCamelContextTest {
List<String> info = (List<String>) mbeanServer.invoke(on, "findEipNames", null, null);
assertNotNull(info);
- assertEquals(154, info.size());
+ assertTrue(info.size() > 150);
assertTrue(info.contains("transform"));
assertTrue(info.contains("split"));
assertTrue(info.contains("from"));
@@ -75,7 +75,7 @@ public class SpringManagedCamelContextTest extends ManagedCamelContextTest {
Map<String, Properties> info = (Map<String, Properties>) mbeanServer.invoke(on, "findEips", null, null);
assertNotNull(info);
- assertEquals(154, info.size());
+ assertTrue(info.size() > 150);
Properties prop = info.get("transform");
assertNotNull(prop);
assertEquals("transform", prop.get("name"));
@@ -98,7 +98,7 @@ public class SpringManagedCamelContextTest extends ManagedCamelContextTest {
@SuppressWarnings("unchecked")
TabularData data = (TabularData) mbeanServer.invoke(on, "listEips", null, null);
assertNotNull(data);
- assertEquals(154, data.size());
+ assertTrue(data.size() > 150);
}
}
[4/4] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/059aaf02
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/059aaf02
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/059aaf02
Branch: refs/heads/master
Commit: 059aaf0244539dbaeca06791904a61f5b90f2235
Parents: ddaa4d3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 16 21:05:16 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 16 21:05:16 2015 +0100
----------------------------------------------------------------------
components/camel-google-calendar/pom.xml | 2 +-
components/camel-google-mail/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/059aaf02/components/camel-google-calendar/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index eb57c69..5d2615e 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -11,7 +11,7 @@
<artifactId>camel-google-calendar</artifactId>
<packaging>bundle</packaging>
- <name>Camel GoogleCalendar Component</name>
+ <name>Camel :: GoogleCalendar Component</name>
<description>Camel Component for GoogleCalendar</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/059aaf02/components/camel-google-mail/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index 7eda8db..849898b 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -27,7 +27,7 @@
<artifactId>camel-google-mail</artifactId>
<packaging>bundle</packaging>
- <name>Camel GoogleMail Component</name>
+ <name>Camel :: GoogleMail Component</name>
<description>Camel Component for GoogleMail</description>
<properties>