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 2011/02/24 08:59:10 UTC
svn commit: r1074061 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/model/InterceptDefinition.java
main/java/org/apache/camel/model/InterceptFromDefinition.java
test/java/org/apache/camel/processor/SimpleMockTest.java
Author: davsclaus
Date: Thu Feb 24 07:59:10 2011
New Revision: 1074061
URL: http://svn.apache.org/viewvc?rev=1074061&view=rev
Log:
CAMEL-3709: Polished
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimpleMockTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java?rev=1074061&r1=1074060&r2=1074061&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java Thu Feb 24 07:59:10 2011
@@ -39,8 +39,6 @@ import org.apache.camel.spi.RouteContext
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptDefinition extends OutputDefinition<InterceptDefinition> {
- // TODO: support stop later (its a bit hard as it needs to break entire processing of route)
-
@XmlTransient
protected Processor output;
@@ -73,8 +71,7 @@ public class InterceptDefinition extends
@Override
public Processor createProcessor(final RouteContext routeContext) throws Exception {
// create the output processor
- // TODO: This should be mandatory (but ExceptionHandlerStreamCacheTest fails)
- output = this.createChildProcessor(routeContext, false);
+ output = this.createChildProcessor(routeContext, true);
// add the output as a intercept strategy to the route context so its invoked on each processing step
routeContext.getInterceptStrategies().add(new InterceptStrategy() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java?rev=1074061&r1=1074060&r2=1074061&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java Thu Feb 24 07:59:10 2011
@@ -35,8 +35,6 @@ import org.apache.camel.spi.RouteContext
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptFromDefinition extends InterceptDefinition {
- // TODO: Support lookup endpoint by ref (requires a bit more work)
-
@XmlAttribute(required = false)
protected String uri;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimpleMockTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimpleMockTest.java?rev=1074061&r1=1074060&r2=1074061&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimpleMockTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimpleMockTest.java Thu Feb 24 07:59:10 2011
@@ -49,6 +49,7 @@ public class SimpleMockTest extends Cont
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ fromF()
from("direct:start").to("log:foo").to("log:bar").to("mock:result");
}
};