Author: cschneider
Date: Mon Sep 19 10:25:01 2011
New Revision: 1172558
URL: http://svn.apache.org/viewvc?rev=1172558&view=rev
Log:
CAMEL-4464 Resolve cycle between processor and sub packages
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java
(contents, props changed)
- copied, changed from r1172502,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
(contents, props changed)
- copied, changed from r1172502,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/PredicateValidatingProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java
(from r1172502,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java&r1=1172502&r2=1172558&rev=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java Mon
Sep 19 10:25:01 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.processor;
+package org.apache.camel;
/**
* Traceable processors allowing easier tracing using constructed labels to
help identify the processor
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/Traceable.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteNode.java
Mon Sep 19 10:25:01 2011
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.RouteNode;
+import org.apache.camel.Traceable;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.processor.Traceable;
/**
* A default implementation of the {@link org.apache.camel.RouteNode}
@@ -62,6 +62,12 @@ public class DefaultRouteNode implements
Traceable trace = (Traceable) target;
return trace.getTraceLabel();
}
+
+ // Compatiblity for old Traceable interface
+ if (target != null && target instanceof
org.apache.camel.processor.Traceable) {
+ org.apache.camel.processor.Traceable trace =
(org.apache.camel.processor.Traceable) target;
+ return trace.getTraceLabel();
+ }
// default then to definition
return processorDefinition.getLabel();
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
Mon Sep 19 10:25:01 2011
@@ -18,10 +18,10 @@ package org.apache.camel.management;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
+import org.apache.camel.Traceable;
import org.apache.camel.api.management.PerformanceCounter;
import org.apache.camel.management.mbean.ManagedPerformanceCounter;
import org.apache.camel.processor.DelegateAsyncProcessor;
-import org.apache.camel.processor.Traceable;
import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
Mon Sep 19 10:25:01 2011
@@ -52,10 +52,10 @@ import org.apache.camel.component.proper
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.language.LanguageExpression;
-import org.apache.camel.processor.DefaultChannel;
import org.apache.camel.processor.InterceptEndpointProcessor;
import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.apache.camel.processor.interceptor.DefaultChannel;
import org.apache.camel.processor.interceptor.Delayer;
import org.apache.camel.processor.interceptor.HandleFault;
import org.apache.camel.processor.interceptor.StreamCaching;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
Mon Sep 19 10:25:01 2011
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.util.ObjectHelper;
/**
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
Mon Sep 19 10:25:01 2011
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
Mon Sep 19 10:25:01 2011
@@ -21,6 +21,7 @@ import java.util.concurrent.ScheduledExe
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
/**
* A <a href="http://camel.apache.org/delayer.html";>Delayer</a> which
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
Mon Sep 19 10:25:01 2011
@@ -20,6 +20,7 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
Mon Sep 19 10:25:01 2011
@@ -20,6 +20,7 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.Traceable;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.CamelLogger;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
Mon Sep 19 10:25:01 2011
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.util.ExchangeHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
Mon Sep 19 10:25:01 2011
@@ -23,6 +23,7 @@ import org.apache.camel.CamelContextAwar
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Mon Sep 19 10:25:01 2011
@@ -45,6 +45,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.Traceable;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.TimeoutAwareAggregationStrategy;
import org.apache.camel.spi.RouteContext;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
Mon Sep 19 10:25:01 2011
@@ -26,6 +26,7 @@ import org.apache.camel.Message;
import org.apache.camel.Ordered;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.util.ExchangeHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
Mon Sep 19 10:25:01 2011
@@ -25,6 +25,7 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ExchangeHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
Mon Sep 19 10:25:01 2011
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.util.ExpressionComparator;
import org.apache.camel.util.ExpressionListComparator;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
Mon Sep 19 10:25:01 2011
@@ -19,6 +19,7 @@ package org.apache.camel.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RollbackExchangeException;
+import org.apache.camel.Traceable;
/**
* Processor for marking an {@link org.apache.camel.Exchange} to rollback.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Mon Sep 19 10:25:01 2011
@@ -29,6 +29,7 @@ import org.apache.camel.Expression;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Message;
import org.apache.camel.Producer;
+import org.apache.camel.Traceable;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.ProducerCache;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
Mon Sep 19 10:25:01 2011
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
import org.apache.camel.ProducerCallback;
+import org.apache.camel.Traceable;
import org.apache.camel.impl.InterceptSendToEndpoint;
import org.apache.camel.impl.ProducerCache;
import org.apache.camel.support.ServiceSupport;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
Mon Sep 19 10:25:01 2011
@@ -20,6 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.impl.DefaultMessage;
/**
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
Mon Sep 19 10:25:01 2011
@@ -32,6 +32,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.UseOriginalAggregationStrategy;
import org.apache.camel.spi.RouteContext;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
Mon Sep 19 10:25:01 2011
@@ -28,6 +28,7 @@ import org.apache.camel.CamelExchangeExc
import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.impl.LoggingExceptionHandler;
import org.apache.camel.processor.resequencer.ResequencerEngine;
import org.apache.camel.processor.resequencer.SequenceElementComparator;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
Mon Sep 19 10:25:01 2011
@@ -21,6 +21,7 @@ import java.util.concurrent.ScheduledExe
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.util.ObjectHelper;
/**
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
Mon Sep 19 10:25:01 2011
@@ -18,6 +18,7 @@ package org.apache.camel.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
/**
* The processor which implements the ThrowException DSL
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Traceable.java
Mon Sep 19 10:25:01 2011
@@ -17,20 +17,10 @@
package org.apache.camel.processor;
/**
- * Traceable processors allowing easier tracing using constructed labels to
help identify the processor
- * and where its defined in the route model.
- *
- * @version
+ * @deprecated
+ * @see org.apache.camel.Traceable
*/
-public interface Traceable {
-
- /**
- * Gets the trace label used for logging when tracing is enabled.
- * <p/>
- * The label should be short and precise.
- *
- * @return the label
- */
- String getTraceLabel();
+@Deprecated
+public interface Traceable extends org.apache.camel.Traceable {
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
Mon Sep 19 10:25:01 2011
@@ -19,6 +19,7 @@ package org.apache.camel.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
/**
* A processor which sets the body on the OUT message with an expression
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
Mon Sep 19 10:25:01 2011
@@ -26,6 +26,7 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
Mon Sep 19 10:25:01 2011
@@ -23,6 +23,7 @@ import org.apache.camel.CamelContextAwar
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ExchangeHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Mon Sep 19 10:25:01 2011
@@ -35,16 +35,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
import org.apache.camel.Expression;
import org.apache.camel.Navigate;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.TimeoutMap;
+import org.apache.camel.Traceable;
import org.apache.camel.impl.LoggingExceptionHandler;
-import org.apache.camel.processor.SendProcessor;
-import org.apache.camel.processor.Traceable;
import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.RecoverableAggregationRepository;
@@ -94,8 +93,6 @@ public class AggregateProcessor extends
private Set<String> batchConsumerCorrelationKeys = new
LinkedHashSet<String>();
private final Set<String> inProgressCompleteExchanges = new
HashSet<String>();
private final Map<String, RedeliveryData> redeliveryState = new
ConcurrentHashMap<String, RedeliveryData>();
- // optional dead letter channel for exhausted recovered exchanges
- private Processor deadLetterProcessor;
// keep booking about redelivery
private class RedeliveryData {
@@ -119,6 +116,8 @@ public class AggregateProcessor extends
private AtomicInteger batchConsumerCounter = new AtomicInteger();
private boolean discardOnCompletionTimeout;
+ private ProducerTemplate deadLetterProducerTemplate;
+
public AggregateProcessor(CamelContext camelContext, Processor processor,
Expression correlationExpression,
AggregationStrategy aggregationStrategy,
ExecutorService executorService) {
@@ -741,7 +740,7 @@ public class AggregateProcessor extends
// set redelivery counter
exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter);
exchange.getIn().setHeader(Exchange.REDELIVERY_EXHAUSTED, Boolean.TRUE);
- deadLetterProcessor.process(exchange);
+
deadLetterProducerTemplate.send(recoverable.getDeadLetterUri(), exchange);
} catch (Throwable e) {
exchange.setException(e);
}
@@ -830,9 +829,7 @@ public class AggregateProcessor extends
if (endpoint == null) {
throw new
NoSuchEndpointException(recoverable.getDeadLetterUri());
}
- // force MEP to be InOnly so when sending to DLQ we would
not expect a reply if the MEP was InOut
- deadLetterProcessor = new SendProcessor(endpoint,
ExchangePattern.InOnly);
- ServiceHelper.startService(deadLetterProcessor);
+ deadLetterProducerTemplate =
camelContext.createProducerTemplate();
}
}
}
@@ -865,7 +862,7 @@ public class AggregateProcessor extends
if (recoverService != null) {
camelContext.getExecutorServiceManager().shutdownNow(recoverService);
}
- ServiceHelper.stopServices(timeoutMap, processor, deadLetterProcessor);
+ ServiceHelper.stopServices(timeoutMap, processor,
deadLetterProducerTemplate);
if (closedCorrelationKeys != null) {
// it may be a service so stop it as well
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
(from r1172502,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java&r1=1172502&r2=1172558&rev=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DefaultChannel.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
Mon Sep 19 10:25:01 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.processor;
+package org.apache.camel.processor.interceptor;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,10 +31,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Service;
import org.apache.camel.model.ModelChannel;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.processor.interceptor.StreamCaching;
-import org.apache.camel.processor.interceptor.TraceFormatter;
-import org.apache.camel.processor.interceptor.TraceInterceptor;
-import org.apache.camel.processor.interceptor.Tracer;
+import org.apache.camel.processor.InterceptorToAsyncProcessorBridge;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
Mon Sep 19 10:25:01 2011
@@ -23,7 +23,7 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.processor.Traceable;
+import org.apache.camel.Traceable;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ObjectHelper;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/PredicateValidatingProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/PredicateValidatingProcessor.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/PredicateValidatingProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/PredicateValidatingProcessor.java
Mon Sep 19 10:25:01 2011
@@ -19,7 +19,7 @@ package org.apache.camel.processor.valid
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.processor.Traceable;
+import org.apache.camel.Traceable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
Mon Sep 19 10:25:01 2011
@@ -26,6 +26,7 @@ import org.apache.camel.model.LoadBalanc
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.SendDefinition;
+import org.apache.camel.processor.interceptor.DefaultChannel;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RandomLoadBalancer;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java?rev=1172558&r1=1172557&r2=1172558&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
Mon Sep 19 10:25:01 2011
@@ -24,6 +24,7 @@ import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.EventDrivenConsumerRoute;
+import org.apache.camel.processor.interceptor.DefaultChannel;
import org.apache.camel.processor.interceptor.StreamCaching;
/**
