Author: davsclaus
Date: Sun Nov 29 16:05:57 2009
New Revision: 885243
URL: http://svn.apache.org/viewvc?rev=885243&view=rev
Log:
Added transacted to tracer. And fixed potential unit test due wrong startup
order.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RoutePolicy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java?rev=885243&r1=885242&r2=885243&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
Sun Nov 29 16:05:57 2009
@@ -25,6 +25,7 @@
import org.apache.camel.Processor;
import org.apache.camel.spi.Policy;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.util.ObjectHelper;
/**
@@ -59,17 +60,19 @@
@Override
public String getShortName() {
- return "policy";
+ // a policy can be a hidden disguise for a transacted definition
+ boolean transacted = type != null &&
type.isAssignableFrom(TransactedPolicy.class);
+ return transacted ? "transacted" : "policy";
}
@Override
public String getLabel() {
if (ref != null) {
- return "ref:" + ref;
+ return getShortName() + "[ref:" + ref + "]";
} else if (policy != null) {
- return policy.toString();
+ return getShortName() + "[" + policy.toString() + "]";
} else {
- return "";
+ return getShortName();
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java?rev=885243&r1=885242&r2=885243&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
Sun Nov 29 16:05:57 2009
@@ -78,11 +78,11 @@
@Override
public String getLabel() {
if (ref != null) {
- return "ref:" + ref;
+ return "transacted[ref:" + ref + "]";
} else if (policy != null) {
- return policy.toString();
+ return "transacted[" + policy.toString() + "]";
} else {
- return "";
+ return "transacted";
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RoutePolicy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RoutePolicy.java?rev=885243&r1=885242&r2=885243&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RoutePolicy.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/RoutePolicy.java
Sun Nov 29 16:05:57 2009
@@ -42,7 +42,7 @@
* <p/>
* Notice this callback is invoked when the <b>Exchange</b> is done and
the {...@link Route} is the route where
* the {...@link Exchange} was started. Most often its also the route
where the exchange is done. However its
- * possible to route an en route {...@link Exchange} to other routes using
endpoints such as
+ * possible to route an {...@link Exchange} to other routes using
endpoints such as
* <b>direct</b> or <b>seda</b>. Bottom line is that the {...@link Route}
parameter may not be the endpoint
* route and thus why we state its the starting route.
*
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java?rev=885243&r1=885242&r2=885243&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
Sun Nov 29 16:05:57 2009
@@ -33,6 +33,8 @@
private int messageIndex;
public void testAggregateLostGroupIssue() throws Exception {
+ messageIndex = 0;
+
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
mock.message(0).body().isEqualTo("0,1,2,3,4,5,6,7,8,9");
@@ -46,7 +48,7 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer://foo?period=100")
+ from("timer://foo?period=100").startupOrder(2)
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
exchange.getOut().setBody(messageIndex++);
@@ -54,7 +56,7 @@
}
}).to("direct:aggregator");
- from("direct:aggregator").aggregate(header("aggregateGroup"),
new AggregationStrategy() {
+
from("direct:aggregator").startupOrder(1).aggregate(header("aggregateGroup"),
new AggregationStrategy() {
public Exchange aggregate(Exchange oldExchange, Exchange
newExchange) {
if (oldExchange == null) {
return newExchange;
