Author: davsclaus
Date: Fri Apr 17 15:38:18 2009
New Revision: 766057
URL: http://svn.apache.org/viewvc?rev=766057&view=rev
Log:
CAMEL-1447: Aligned and renamed the DSL names for try .. catch .. finally so
they are the same in Java and Spring DSL.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorHandleTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithFinallyBlockPipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithMultipleHandlesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithNestedFinallyBlockPipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
Fri Apr 17 15:38:18 2009
@@ -36,7 +36,7 @@
*
* @version $Revision$
*/
-...@xmlrootelement(name = "catch")
+...@xmlrootelement(name = "doCatch")
@XmlAccessorType(XmlAccessType.FIELD)
public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
@XmlElement(name = "exception")
@@ -60,12 +60,12 @@
@Override
public String toString() {
- return "Catch[ " + getExceptionClasses() + " -> " + getOutputs() + "]";
+ return "DoCatch[ " + getExceptionClasses() + " -> " + getOutputs() +
"]";
}
@Override
public String getShortName() {
- return "catch";
+ return "doCatch";
}
@Override
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
Fri Apr 17 15:38:18 2009
@@ -28,26 +28,21 @@
*
* @version $Revision$
*/
-...@xmlrootelement(name = "finally")
+...@xmlrootelement(name = "doFinally")
@XmlAccessorType(XmlAccessType.FIELD)
public class FinallyDefinition extends OutputDefinition<ProcessorDefinition>
implements Block {
@Override
public String toString() {
- return "Finally[" + getOutputs() + "]";
+ return "DoFinally[" + getOutputs() + "]";
}
@Override
public String getShortName() {
- return "finally";
+ return "doFinally";
}
@Override
- public String getLabel() {
- return "";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
return routeContext.createProcessor(this);
}
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=766057&r1=766056&r2=766057&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
Fri Apr 17 15:38:18 2009
@@ -692,7 +692,7 @@
*
* @return the builder for a tryBlock expression
*/
- public TryDefinition tryBlock() {
+ public TryDefinition doTry() {
TryDefinition answer = new TryDefinition();
addOutput(answer);
return answer;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
Fri Apr 17 15:38:18 2009
@@ -34,7 +34,7 @@
*
* @version $Revision$
*/
-...@xmlrootelement(name = "try")
+...@xmlrootelement(name = "doTry")
@XmlAccessorType(XmlAccessType.FIELD)
public class TryDefinition extends OutputDefinition<TryDefinition> {
@XmlTransient
@@ -48,12 +48,12 @@
@Override
public String toString() {
- return "Try[" + getOutputs() + "]";
+ return "DoTry[" + getOutputs() + "]";
}
@Override
public String getShortName() {
- return "try";
+ return "doTry";
}
@Override
@@ -82,7 +82,7 @@
* @param exceptionType the exception
* @return the try builder
*/
- public TryDefinition handle(Class<?> exceptionType) {
+ public TryDefinition doCatch(Class<?> exceptionType) {
popBlock();
CatchDefinition answer = new CatchDefinition(exceptionType);
addOutput(answer);
@@ -95,7 +95,7 @@
*
* @return the try builder
*/
- public TryDefinition finallyBlock() {
+ public TryDefinition doFinally() {
popBlock();
FinallyDefinition answer = new FinallyDefinition();
addOutput(answer);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/BuilderWithScopesTest.java
Fri Apr 17 15:38:18 2009
@@ -238,8 +238,8 @@
public void configure() {
errorHandler(deadLetterChannel("mock:error").delay(0));
-
from("direct:a").tryBlock().process(validator).process(toProcessor)
-
.handle(ValidationException.class).process(orderProcessor).process(orderProcessor3);
// continuation of the handle clause
+
from("direct:a").doTry().process(validator).process(toProcessor)
+
.doCatch(ValidationException.class).process(orderProcessor).process(orderProcessor3);
// continuation of the handle clause
}
};
}
@@ -273,8 +273,8 @@
public void configure() {
errorHandler(deadLetterChannel("mock:error").delay(0));
-
from("direct:a").tryBlock().process(validator).process(toProcessor)
-
.handle(ValidationException.class).process(orderProcessor).end().process(orderProcessor3);
+
from("direct:a").doTry().process(validator).process(toProcessor)
+
.doCatch(ValidationException.class).process(orderProcessor).end().process(orderProcessor3);
}
};
}
@@ -309,8 +309,8 @@
public void configure() {
errorHandler(deadLetterChannel("mock:error").delay(0).maximumRedeliveries(1));
-
from("direct:a").tryBlock().process(validator).process(toProcessor)
-
.handle(ValidationException.class).process(orderProcessor).finallyBlock()
+
from("direct:a").doTry().process(validator).process(toProcessor)
+
.doCatch(ValidationException.class).process(orderProcessor).doFinally()
.process(orderProcessor2).process(orderProcessor3); //
continuation of the finallyBlock clause
}
};
@@ -354,8 +354,8 @@
public void configure() {
errorHandler(deadLetterChannel().maximumRedeliveries(1).delay(0));
-
from("direct:a").tryBlock().process(validator).process(toProcessor)
-
.handle(ValidationException.class).process(orderProcessor).finallyBlock()
+
from("direct:a").doTry().process(validator).process(toProcessor)
+
.doCatch(ValidationException.class).process(orderProcessor).doFinally()
.process(orderProcessor2).end().process(orderProcessor3);
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorHandleTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorHandleTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorHandleTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TryProcessorHandleTest.java
Fri Apr 17 15:38:18 2009
@@ -29,23 +29,29 @@
private boolean handled;
- public void test() throws Exception {
+ public void testTryCatchFinally() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(0);
+
+ getMockEndpoint("mock:finally").expectedMessageCount(1);
+
sendBody("direct:start", "<test>Hello World!</test>");
assertTrue("Should have been handled", handled);
- mock.expectedMessageCount(0);
- mock.assertIsSatisfied();
+
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .tryBlock()
+ .doTry()
.process(new ProcessorFail())
.to("mock:result")
- .handle(Exception.class)
+ .doCatch(Exception.class)
.process(new ProcessorHandle())
+ .doFinally()
+ .to("mock:finally")
.end();
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
Fri Apr 17 15:38:18 2009
@@ -74,10 +74,10 @@
// use little delay to run unit test fast
errorHandler(deadLetterChannel().delay(25));
- TryDefinition tryType = from("direct:start").tryBlock().
+ TryDefinition tryType = from("direct:start").doTry().
process(validator).
to("mock:valid");
- tryType.finallyBlock().to("mock:all");
+ tryType.doFinally().to("mock:all");
}
};
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockTest.java
Fri Apr 17 15:38:18 2009
@@ -66,11 +66,11 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- TryDefinition tryType = from("direct:start").tryBlock().
+ TryDefinition tryType = from("direct:start").doTry().
process(validator).
to("mock:valid");
- tryType.handle(ValidationException.class).to("mock:invalid");
- tryType.finallyBlock().to("mock:all");
+ tryType.doCatch(ValidationException.class).to("mock:invalid");
+ tryType.doFinally().to("mock:all");
}
};
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
Fri Apr 17 15:38:18 2009
@@ -90,10 +90,10 @@
return new RouteBuilder() {
public void configure() {
from("direct:start").
- tryBlock().
+ doTry().
process(validator).
to("mock:valid").
- handle(ValidationException.class).to("mock:invalid");
+ doCatch(ValidationException.class).to("mock:invalid");
}
};
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithErrorInHandleAndFinallyBlockTest.java
Fri Apr 17 15:38:18 2009
@@ -26,11 +26,11 @@
public void configure() {
from("direct:start")
.errorHandler(noErrorHandler())
- .tryBlock()
+ .doTry()
.process(validator)
- .handle(ValidationException.class)
+ .doCatch(ValidationException.class)
.process(validator)
- .finallyBlock()
+ .doFinally()
.choice()
.when(header("foo").isEqualTo("bar"))
.to("mock:valid")
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithFinallyBlockPipelineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithFinallyBlockPipelineTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithFinallyBlockPipelineTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithFinallyBlockPipelineTest.java
Fri Apr 17 15:38:18 2009
@@ -30,12 +30,12 @@
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .tryBlock()
+ .doTry()
.process(validator)
.setHeader("valid", constant(true))
- .handle(ValidationException.class)
+ .doCatch(ValidationException.class)
.setHeader("valid", constant(false))
- .finallyBlock()
+ .doFinally()
.setBody(body())
.choice()
.when(header("valid").isEqualTo(true))
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineAndExceptionTest.java
Fri Apr 17 15:38:18 2009
@@ -33,7 +33,7 @@
onException(ValidationException.class).to("mock:invalid");
-
from("direct:start").tryBlock().process(validator).to("mock:valid").handle(
+
from("direct:start").doTry().process(validator).to("mock:valid").doCatch(
ValidationException.class).process(validator);
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithHandlePipelineTest.java
Fri Apr 17 15:38:18 2009
@@ -30,12 +30,12 @@
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .tryBlock()
+ .doTry()
.process(validator).to("mock:valid")
- .handle(ValidationException.class)
- .tryBlock()
+ .doCatch(ValidationException.class)
+ .doTry()
.process(validator).to("mock:valid")
- .handle(ValidationException.class)
+ .doCatch(ValidationException.class)
.pipeline("direct:a", "mock:invalid");
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithMultipleHandlesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithMultipleHandlesTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithMultipleHandlesTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithMultipleHandlesTest.java
Fri Apr 17 15:38:18 2009
@@ -30,14 +30,14 @@
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .tryBlock()
+ .doTry()
.process(validator)
- .handle(ValidationException.class)
+ .doCatch(ValidationException.class)
.setHeader("xxx", constant("yyy"))
.end()
- .tryBlock()
+ .doTry()
.process(validator).to("mock:valid")
- .handle(ValidationException.class)
+ .doCatch(ValidationException.class)
.pipeline("direct:a", "mock:invalid");
}
};
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithNestedFinallyBlockPipelineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithNestedFinallyBlockPipelineTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithNestedFinallyBlockPipelineTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationWithNestedFinallyBlockPipelineTest.java
Fri Apr 17 15:38:18 2009
@@ -30,17 +30,17 @@
return new RouteBuilder() {
public void configure() {
from("direct:start")
- .tryBlock()
+ .doTry()
.to("direct:embedded")
- .handle(ValidationException.class)
+ .doCatch(ValidationException.class)
.to("mock:invalid");
from("direct:embedded")
.errorHandler(noErrorHandler())
- .tryBlock()
+ .doTry()
.process(validator)
.to("mock:valid")
- .finallyBlock()
+ .doFinally()
.setHeader("valid", constant(false))
.end();
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithExceptionTest.java
Fri Apr 17 15:38:18 2009
@@ -140,9 +140,9 @@
return new RouteBuilder() {
public void configure() {
from("direct:start").
- tryBlock().
+ doTry().
routingSlip(ROUTING_SLIP_HEADER).to("mock:noexception").
- handle(Exception.class).
+ doCatch(Exception.class).
to("mock:exception");
}
};
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
Fri Apr 17 15:38:18 2009
@@ -26,24 +26,27 @@
*/
public class ValidatorRouteTest extends SpringTestSupport {
protected MockEndpoint validEndpoint;
+ protected MockEndpoint finallyEndpoint;
protected MockEndpoint invalidEndpoint;
public void testValidMessage() throws Exception {
validEndpoint.expectedMessageCount(1);
+ finallyEndpoint.expectedMessageCount(1);
template.sendBody("direct:start",
"<mail
xmlns='http://foo.com/bar'><subject>Hey</subject><body>Hello
world!</body></mail>");
- MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint);
+ MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint,
finallyEndpoint);
}
public void testInvalidMessage() throws Exception {
invalidEndpoint.expectedMessageCount(1);
+ finallyEndpoint.expectedMessageCount(1);
template.sendBody("direct:start",
"<mail xmlns='http://foo.com/bar'><body>Hello
world!</body></mail>");
- MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint);
+ MockEndpoint.assertIsSatisfied(validEndpoint, invalidEndpoint,
finallyEndpoint);
}
@Override
@@ -52,10 +55,10 @@
validEndpoint = resolveMandatoryEndpoint("mock:valid",
MockEndpoint.class);
invalidEndpoint = resolveMandatoryEndpoint("mock:invalid",
MockEndpoint.class);
+ finallyEndpoint = resolveMandatoryEndpoint("mock:finally",
MockEndpoint.class);
}
protected int getExpectedRouteCount() {
- // TODO why zero?
return 0;
}
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml
Fri Apr 17 15:38:18 2009
@@ -22,21 +22,23 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <!-- START SNIPPET: example -->
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
- <route>
- <from uri="direct:start"/>
- <try>
- <to uri="validator:org/apache/camel/component/validator/schema.xsd"/>
- <to uri="mock:valid"/>
-
- <catch>
- <exception>org.apache.camel.ValidationException</exception>
- <to uri="mock:invalid"/>
- </catch>
- </try>
- </route>
- </camelContext>
- <!-- END SNIPPET: example -->
+ <!-- START SNIPPET: example -->
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <route>
+ <from uri="direct:start"/>
+ <doTry>
+ <to
uri="validator:org/apache/camel/component/validator/schema.xsd"/>
+ <to uri="mock:valid"/>
+ <doCatch>
+ <exception>org.apache.camel.ValidationException</exception>
+ <to uri="mock:invalid"/>
+ </doCatch>
+ <doFinally>
+ <to uri="mock:finally"/>
+ </doFinally>
+ </doTry>
+ </route>
+ </camelContext>
+ <!-- END SNIPPET: example -->
</beans>
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java?rev=766057&r1=766056&r2=766057&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyValidatorTest.java
Fri Apr 17 15:38:18 2009
@@ -45,11 +45,11 @@
from("jetty:http://localhost:8192/test";)
.setBody(body(String.class))
.to("log:in")
- .tryBlock()
+ .doTry()
.to("validator:OptimizationRequest.xsd")
.setBody(constant("<ok/>"))
- .handle(ValidationException.class)
- .setBody(constant("<error/>"))
+ .doCatch(ValidationException.class)
+ .setBody(constant("<error/>"))
.end()
.to("log:out");
}
