camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1163287 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/component/file/ camel-core/src/test/java/org/apache/camel/component/bean/ camel-core/src/test/java/org/apache/camel/language/ camel-core/src/test/java/org/apache/camel/pr...
Date Tue, 30 Aug 2011 16:49:33 GMT
Author: davsclaus
Date: Tue Aug 30 16:49:32 2011
New Revision: 1163287

URL: http://svn.apache.org/viewvc?rev=1163287&view=rev
Log:
CAMEL-3619: Favor using function start/end tokens with simple language to make it stand out its a simple function.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleRegExpTest.java
      - copied, changed from r1163179, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOperatorTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java
    camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml
    camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
    camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringSimpleTXResequencerTest.xml
    camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setOutHeader.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileDefaultSorter.java Tue Aug 30 16:49:32 2011
@@ -129,10 +129,20 @@ public final class GenericFileDefaultSor
     public static Comparator<Exchange> sortByFileLanguage(
             final CamelContext context, final String expression, final boolean reverse,
             final boolean ignoreCase, final Comparator<Exchange> nested) {
+
+        // the expression should be enclosed by ${ }
+        String text = expression;
+        if (!expression.startsWith("${")) {
+            text = "${" + text;
+        }
+        if (!expression.endsWith("}")) {
+            text = text + "}";
+        }
+        Language language = context.resolveLanguage("file");
+        final Expression exp = language.createExpression(text);
+
         return new Comparator<Exchange>() {
             public int compare(Exchange o1, Exchange o2) {
-                Language language = context.resolveLanguage("file");
-                final Expression exp = language.createExpression(expression);
                 Object result1 = exp.evaluate(o1, Object.class);
                 Object result2 = exp.evaluate(o2, Object.class);
                 int answer = ObjectHelper.compare(result1, result2, ignoreCase);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanOverloadedMethodParameterValueTest.java Tue Aug 30 16:49:32 2011
@@ -34,7 +34,7 @@ public class BeanOverloadedMethodParamet
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .bean(MyBean.class, "hello(body)")
+                    .bean(MyBean.class, "hello(${body})")
                     .to("mock:result");
 
             }
@@ -73,7 +73,7 @@ public class BeanOverloadedMethodParamet
             public void configure() throws Exception {
                 // START SNIPPET: e2
                 from("direct:start")
-                    .bean(MyBean.class, "hello(body, header.country)")
+                    .bean(MyBean.class, "hello(${body}, ${header.country})")
                     .to("mock:result");
                 // END SNIPPET: e2
             }
@@ -149,7 +149,7 @@ public class BeanOverloadedMethodParamet
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .bean(MyBean.class, "times(byte[], header.times)")
+                    .bean(MyBean.class, "times(byte[], ${header.times})")
                     .to("mock:result");
 
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOgnlTest.java Tue Aug 30 16:49:32 2011
@@ -67,7 +67,7 @@ public class BeanParameterValueOgnlTest 
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .to("bean:foo?method=bar(body,true)")
+                    .to("bean:foo?method=bar(${body},true)")
                     .to("mock:result");
 
                 from("direct:start2")

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueOverloadedTest.java Tue Aug 30 16:49:32 2011
@@ -58,7 +58,7 @@ public class BeanParameterValueOverloade
                     .to("mock:result");
 
                 from("direct:start2")
-                    .to("bean:foo?method=bar(body,false,true)")
+                    .to("bean:foo?method=bar(${body},false,true)")
                     .to("mock:result");
             }
         };

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java Tue Aug 30 16:49:32 2011
@@ -100,7 +100,7 @@ public class BeanParameterValueTest exte
                     .to("mock:result");
 
                 from("direct:start2")
-                    .to("bean:foo?method=bar(body,true)")
+                    .to("bean:foo?method=bar(${body},true)")
                     .to("mock:result");
 
                 from("direct:start3")

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithExpressionInjectionTest.java Tue Aug 30 16:49:32 2011
@@ -66,7 +66,7 @@ public class BeanWithExpressionInjection
             return "MyBean[foo: " + foo + " body: " + body + "]";
         }
 
-        public void read(String body, @Simple("header.foo") String foo) {
+        public void read(String body, @Simple("${header.foo}") String foo) {
             this.foo = foo;
             this.body = body;
             LOG.info("read() method called on " + this);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ExpressionAnnotationToDisambiguateMethodsTest.java Tue Aug 30 16:49:32 2011
@@ -72,7 +72,7 @@ public class ExpressionAnnotationToDisam
             fail("bar() called with: " + body);
         }
 
-        public void foo(@Simple("header.foo") String bar) {
+        public void foo(@Simple("${header.foo}") String bar) {
             this.bar = bar;
             LOG.info("foo() method called with: " + bar);
         }
@@ -90,7 +90,7 @@ public class ExpressionAnnotationToDisam
         }
 
         @Handler
-        public void foo(@Simple("header.foo") String bar) {
+        public void foo(@Simple("${header.foo}") String bar) {
             this.bar = bar;
             LOG.info("foo() method called with: " + bar);
         }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java Tue Aug 30 16:49:32 2011
@@ -84,7 +84,7 @@ public class FileLanguageTest extends La
         assertExpression("${file:size}", file.length());
 
         // modified is a Date object
-        Date modified = SimpleLanguage.simple("file:modified").evaluate(exchange, Date.class);
+        Date modified = SimpleLanguage.simple("${file:modified}").evaluate(exchange, Date.class);
         assertEquals(new Date(file.lastModified()), modified);
     }
 
@@ -103,7 +103,7 @@ public class FileLanguageTest extends La
         assertExpression("$simple{file:size}", file.length());
 
         // modified is a Date object
-        Date modified = SimpleLanguage.simple("file:modified").evaluate(exchange, Date.class);
+        Date modified = SimpleLanguage.simple("${file:modified}").evaluate(exchange, Date.class);
         assertEquals(new Date(file.lastModified()), modified);
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java Tue Aug 30 16:49:32 2011
@@ -40,7 +40,7 @@ public class SimpleLanguageRouteTest ext
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from("seda:foo")
-                    .filter().simple("in.header.foo").to("mock:foo");
+                    .filter().simple("${header.foo}").to("mock:foo");
             }
         };
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOperatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOperatorTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOperatorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOperatorTest.java Tue Aug 30 16:49:32 2011
@@ -34,148 +34,148 @@ public class SimpleOperatorTest extends 
 
     public void testValueWithSpace() throws Exception {
         exchange.getIn().setBody("Hello Big World");
-        assertExpression("${in.body} == 'Hello Big World'", true);
+        assertPredicate("${in.body} == 'Hello Big World'", true);
     }
     
     public void testNullValue() throws Exception {
         exchange.getIn().setBody("Value");
-        assertExpression("${in.body} != null", true);
-        assertExpression("${body} == null", false);
+        assertPredicate("${in.body} != null", true);
+        assertPredicate("${body} == null", false);
         
         exchange.getIn().setBody(null);
-        assertExpression("${in.body} == null", true);
-        assertExpression("${body} != null", false);
+        assertPredicate("${in.body} == null", true);
+        assertPredicate("${body} != null", false);
     }
 
     public void testAnd() throws Exception {
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} == 123", true);
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} == 444", false);
-        assertExpression("${in.header.foo} == def and ${in.header.bar} == 123", false);
-        assertExpression("${in.header.foo} == def and ${in.header.bar} == 444", false);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} == 123", true);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} == 444", false);
+        assertPredicate("${in.header.foo} == def and ${in.header.bar} == 123", false);
+        assertPredicate("${in.header.foo} == def and ${in.header.bar} == 444", false);
 
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} > 100", true);
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} < 200", true);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} > 100", true);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} < 200", true);
     }
 
     public void testTwoAnd() throws Exception {
         exchange.getIn().setBody("Hello World");
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} == 123 and ${body} == 'Hello World'", true);
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} == 123 and ${body} == 'Hello World'", true);
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} == 123 and ${body} == 'Bye World'", false);
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} == 123 and ${body} == 'Bye World'", false);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} == 123 and ${body} == 'Hello World'", true);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} == 123 and ${body} == 'Hello World'", true);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} == 123 and ${body} == 'Bye World'", false);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} == 123 and ${body} == 'Bye World'", false);
     }
 
     public void testThreeAnd() throws Exception {
         exchange.getIn().setBody("Hello World");
-        assertExpression("${in.header.foo} == abc and ${in.header.bar} == 123 and ${body} == 'Hello World' and ${in.header.xx}} == null", true);
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} == 123 and ${body} == 'Hello World' and ${in.header.xx}} == null", true);
+        assertPredicate("${in.header.foo} == abc and ${in.header.bar} == 123 and ${body} == 'Hello World' and ${in.header.xx}} == null", true);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} == 123 and ${body} == 'Hello World' and ${in.header.xx}} == null", true);
     }
 
     public void testTwoOr() throws Exception {
         exchange.getIn().setBody("Hello World");
-        assertExpression("${in.header.foo} == abc or ${in.header.bar} == 44 or ${body} == 'Bye World'", true);
-        assertExpression("${in.header.foo} == 'abc' or ${in.header.bar} == 44 or ${body} == 'Bye World'", true);
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Bye World'", false);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Bye World'", false);
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Hello World'", true);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Hello World'", true);
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 123 or ${body} == 'Bye World'", true);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 123 or ${body} == 'Bye World'", true);
+        assertPredicate("${in.header.foo} == abc or ${in.header.bar} == 44 or ${body} == 'Bye World'", true);
+        assertPredicate("${in.header.foo} == 'abc' or ${in.header.bar} == 44 or ${body} == 'Bye World'", true);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Bye World'", false);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Bye World'", false);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Hello World'", true);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Hello World'", true);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 123 or ${body} == 'Bye World'", true);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 123 or ${body} == 'Bye World'", true);
     }
 
     public void testThreeOr() throws Exception {
         exchange.getIn().setBody("Hello World");
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'World'", true);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'World'", true);
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", false);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", false);
-        assertExpression("${in.header.foo} == abc or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
-        assertExpression("${in.header.foo} == 'abc' or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 123 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 123 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
-        assertExpression("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Hello World' or ${body} contains 'Moon'", true);
-        assertExpression("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Hello World' or ${body} contains 'Moon'", true);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'World'", true);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'World'", true);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", false);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", false);
+        assertPredicate("${in.header.foo} == abc or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
+        assertPredicate("${in.header.foo} == 'abc' or ${in.header.bar} == 44 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 123 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 123 or ${body} == 'Bye Moon' or ${body} contains 'Moon'", true);
+        assertPredicate("${in.header.foo} == xxx or ${in.header.bar} == 44 or ${body} == 'Hello World' or ${body} contains 'Moon'", true);
+        assertPredicate("${in.header.foo} == 'xxx' or ${in.header.bar} == 44 or ${body} == 'Hello World' or ${body} contains 'Moon'", true);
     }
 
     public void testAndWithQuotation() throws Exception {
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} == '123'", true);
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} == '444'", false);
-        assertExpression("${in.header.foo} == 'def' and ${in.header.bar} == '123'", false);
-        assertExpression("${in.header.foo} == 'def' and ${in.header.bar} == '444'", false);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} == '123'", true);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} == '444'", false);
+        assertPredicate("${in.header.foo} == 'def' and ${in.header.bar} == '123'", false);
+        assertPredicate("${in.header.foo} == 'def' and ${in.header.bar} == '444'", false);
 
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} > '100'", true);
-        assertExpression("${in.header.foo} == 'abc' and ${in.header.bar} < '200'", true);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} > '100'", true);
+        assertPredicate("${in.header.foo} == 'abc' and ${in.header.bar} < '200'", true);
     }
 
     public void testOr() throws Exception {
-        assertExpression("${in.header.foo} == abc or ${in.header.bar} == 123", true);
-        assertExpression("${in.header.foo} == abc or ${in.header.bar} == 444", true);
-        assertExpression("${in.header.foo} == def or ${in.header.bar} == 123", true);
-        assertExpression("${in.header.foo} == def or ${in.header.bar} == 444", false);
-
-        assertExpression("${in.header.foo} == abc or ${in.header.bar} < 100", true);
-        assertExpression("${in.header.foo} == abc or ${in.header.bar} < 200", true);
-        assertExpression("${in.header.foo} == def or ${in.header.bar} < 200", true);
-        assertExpression("${in.header.foo} == def or ${in.header.bar} < 100", false);
+        assertPredicate("${in.header.foo} == abc or ${in.header.bar} == 123", true);
+        assertPredicate("${in.header.foo} == abc or ${in.header.bar} == 444", true);
+        assertPredicate("${in.header.foo} == def or ${in.header.bar} == 123", true);
+        assertPredicate("${in.header.foo} == def or ${in.header.bar} == 444", false);
+
+        assertPredicate("${in.header.foo} == abc or ${in.header.bar} < 100", true);
+        assertPredicate("${in.header.foo} == abc or ${in.header.bar} < 200", true);
+        assertPredicate("${in.header.foo} == def or ${in.header.bar} < 200", true);
+        assertPredicate("${in.header.foo} == def or ${in.header.bar} < 100", false);
     }
 
     public void testOrWithQuotation() throws Exception {
-        assertExpression("${in.header.foo} == 'abc' or ${in.header.bar} == '123'", true);
-        assertExpression("${in.header.foo} == 'abc' or ${in.header.bar} == '444'", true);
-        assertExpression("${in.header.foo} == 'def' or ${in.header.bar} == '123'", true);
-        assertExpression("${in.header.foo} == 'def' or ${in.header.bar} == '444'", false);
-
-        assertExpression("${in.header.foo} == 'abc' or ${in.header.bar} < '100'", true);
-        assertExpression("${in.header.foo} == 'abc' or ${in.header.bar} < '200'", true);
-        assertExpression("${in.header.foo} == 'def' or ${in.header.bar} < '200'", true);
-        assertExpression("${in.header.foo} == 'def' or ${in.header.bar} < '100'", false);
+        assertPredicate("${in.header.foo} == 'abc' or ${in.header.bar} == '123'", true);
+        assertPredicate("${in.header.foo} == 'abc' or ${in.header.bar} == '444'", true);
+        assertPredicate("${in.header.foo} == 'def' or ${in.header.bar} == '123'", true);
+        assertPredicate("${in.header.foo} == 'def' or ${in.header.bar} == '444'", false);
+
+        assertPredicate("${in.header.foo} == 'abc' or ${in.header.bar} < '100'", true);
+        assertPredicate("${in.header.foo} == 'abc' or ${in.header.bar} < '200'", true);
+        assertPredicate("${in.header.foo} == 'def' or ${in.header.bar} < '200'", true);
+        assertPredicate("${in.header.foo} == 'def' or ${in.header.bar} < '100'", false);
     }
 
     public void testEqualOperator() throws Exception {
         // string to string comparison
-        assertExpression("${in.header.foo} == 'abc'", true);
-        assertExpression("${in.header.foo} == abc", true);
-        assertExpression("${in.header.foo} == 'def'", false);
-        assertExpression("${in.header.foo} == def", false);
-        assertExpression("${in.header.foo} == '1'", false);
+        assertPredicate("${in.header.foo} == 'abc'", true);
+        assertPredicate("${in.header.foo} == abc", true);
+        assertPredicate("${in.header.foo} == 'def'", false);
+        assertPredicate("${in.header.foo} == def", false);
+        assertPredicate("${in.header.foo} == '1'", false);
 
         // integer to string comparison
-        assertExpression("${in.header.bar} == '123'", true);
-        assertExpression("${in.header.bar} == 123", true);
-        assertExpression("${in.header.bar} == '444'", false);
-        assertExpression("${in.header.bar} == 444", false);
-        assertExpression("${in.header.bar} == '1'", false);
+        assertPredicate("${in.header.bar} == '123'", true);
+        assertPredicate("${in.header.bar} == 123", true);
+        assertPredicate("${in.header.bar} == '444'", false);
+        assertPredicate("${in.header.bar} == 444", false);
+        assertPredicate("${in.header.bar} == '1'", false);
     }
 
     public void testNotEqualOperator() throws Exception {
         // string to string comparison
-        assertExpression("${in.header.foo} != 'abc'", false);
-        assertExpression("${in.header.foo} != abc", false);
-        assertExpression("${in.header.foo} != 'def'", true);
-        assertExpression("${in.header.foo} != def", true);
-        assertExpression("${in.header.foo} != '1'", true);
+        assertPredicate("${in.header.foo} != 'abc'", false);
+        assertPredicate("${in.header.foo} != abc", false);
+        assertPredicate("${in.header.foo} != 'def'", true);
+        assertPredicate("${in.header.foo} != def", true);
+        assertPredicate("${in.header.foo} != '1'", true);
 
         // integer to string comparison
-        assertExpression("${in.header.bar} != '123'", false);
-        assertExpression("${in.header.bar} != 123", false);
-        assertExpression("${in.header.bar} != '444'", true);
-        assertExpression("${in.header.bar} != 444", true);
-        assertExpression("${in.header.bar} != '1'", true);
+        assertPredicate("${in.header.bar} != '123'", false);
+        assertPredicate("${in.header.bar} != 123", false);
+        assertPredicate("${in.header.bar} != '444'", true);
+        assertPredicate("${in.header.bar} != 444", true);
+        assertPredicate("${in.header.bar} != '1'", true);
     }
 
     public void testGreaterThanOperator() throws Exception {
         // string to string comparison
-        assertExpression("${in.header.foo} > 'aaa'", true);
-        assertExpression("${in.header.foo} > aaa", true);
-        assertExpression("${in.header.foo} > 'def'", false);
-        assertExpression("${in.header.foo} > def", false);
+        assertPredicate("${in.header.foo} > 'aaa'", true);
+        assertPredicate("${in.header.foo} > aaa", true);
+        assertPredicate("${in.header.foo} > 'def'", false);
+        assertPredicate("${in.header.foo} > def", false);
 
         // integer to string comparison
-        assertExpression("${in.header.bar} > '100'", true);
-        assertExpression("${in.header.bar} > 100", true);
-        assertExpression("${in.header.bar} > '123'", false);
-        assertExpression("${in.header.bar} > 123", false);
-        assertExpression("${in.header.bar} > '200'", false);
+        assertPredicate("${in.header.bar} > '100'", true);
+        assertPredicate("${in.header.bar} > 100", true);
+        assertPredicate("${in.header.bar} > '123'", false);
+        assertPredicate("${in.header.bar} > 123", false);
+        assertPredicate("${in.header.bar} > '200'", false);
     }
 
     public void testGreaterThanStringToInt() throws Exception {
@@ -183,17 +183,17 @@ public class SimpleOperatorTest extends 
         exchange.getIn().setHeader("num", "70");
 
         // string to int comparison
-        assertExpression("${in.header.num} > 100", false);
-        assertExpression("${in.header.num} > 100", false);
-        assertExpression("${in.header.num} > 80", false);
-        assertExpression("${in.header.num} > 800", false);
-        assertExpression("${in.header.num} > 1", true);
-        assertExpression("${in.header.num} > 8", true);
-        assertExpression("${in.header.num} > 48", true);
-        assertExpression("${in.header.num} > 69", true);
-        assertExpression("${in.header.num} > 71", false);
-        assertExpression("${in.header.num} > 88", false);
-        assertExpression("${in.header.num} > 777", false);
+        assertPredicate("${in.header.num} > 100", false);
+        assertPredicate("${in.header.num} > 100", false);
+        assertPredicate("${in.header.num} > 80", false);
+        assertPredicate("${in.header.num} > 800", false);
+        assertPredicate("${in.header.num} > 1", true);
+        assertPredicate("${in.header.num} > 8", true);
+        assertPredicate("${in.header.num} > 48", true);
+        assertPredicate("${in.header.num} > 69", true);
+        assertPredicate("${in.header.num} > 71", false);
+        assertPredicate("${in.header.num} > 88", false);
+        assertPredicate("${in.header.num} > 777", false);
     }
 
     public void testLessThanStringToInt() throws Exception {
@@ -201,178 +201,178 @@ public class SimpleOperatorTest extends 
         exchange.getIn().setHeader("num", "70");
 
         // string to int comparison
-        assertExpression("${in.header.num} < 100", true);
-        assertExpression("${in.header.num} < 100", true);
-        assertExpression("${in.header.num} < 80", true);
-        assertExpression("${in.header.num} < 800", true);
-        assertExpression("${in.header.num} < 1", false);
-        assertExpression("${in.header.num} < 8", false);
-        assertExpression("${in.header.num} < 48", false);
-        assertExpression("${in.header.num} < 69", false);
-        assertExpression("${in.header.num} < 71", true);
-        assertExpression("${in.header.num} < 88", true);
-        assertExpression("${in.header.num} < 777", true);
+        assertPredicate("${in.header.num} < 100", true);
+        assertPredicate("${in.header.num} < 100", true);
+        assertPredicate("${in.header.num} < 80", true);
+        assertPredicate("${in.header.num} < 800", true);
+        assertPredicate("${in.header.num} < 1", false);
+        assertPredicate("${in.header.num} < 8", false);
+        assertPredicate("${in.header.num} < 48", false);
+        assertPredicate("${in.header.num} < 69", false);
+        assertPredicate("${in.header.num} < 71", true);
+        assertPredicate("${in.header.num} < 88", true);
+        assertPredicate("${in.header.num} < 777", true);
     }
 
     public void testGreaterThanOrEqualOperator() throws Exception {
         // string to string comparison
-        assertExpression("${in.header.foo} >= 'aaa'", true);
-        assertExpression("${in.header.foo} >= aaa", true);
-        assertExpression("${in.header.foo} >= 'abc'", true);
-        assertExpression("${in.header.foo} >= abc", true);
-        assertExpression("${in.header.foo} >= 'def'", false);
+        assertPredicate("${in.header.foo} >= 'aaa'", true);
+        assertPredicate("${in.header.foo} >= aaa", true);
+        assertPredicate("${in.header.foo} >= 'abc'", true);
+        assertPredicate("${in.header.foo} >= abc", true);
+        assertPredicate("${in.header.foo} >= 'def'", false);
 
         // integer to string comparison
-        assertExpression("${in.header.bar} >= '100'", true);
-        assertExpression("${in.header.bar} >= 100", true);
-        assertExpression("${in.header.bar} >= '123'", true);
-        assertExpression("${in.header.bar} >= 123", true);
-        assertExpression("${in.header.bar} >= '200'", false);
+        assertPredicate("${in.header.bar} >= '100'", true);
+        assertPredicate("${in.header.bar} >= 100", true);
+        assertPredicate("${in.header.bar} >= '123'", true);
+        assertPredicate("${in.header.bar} >= 123", true);
+        assertPredicate("${in.header.bar} >= '200'", false);
     }
 
     public void testLessThanOperator() throws Exception {
         // string to string comparison
-        assertExpression("${in.header.foo} < 'aaa'", false);
-        assertExpression("${in.header.foo} < aaa", false);
-        assertExpression("${in.header.foo} < 'def'", true);
-        assertExpression("${in.header.foo} < def", true);
+        assertPredicate("${in.header.foo} < 'aaa'", false);
+        assertPredicate("${in.header.foo} < aaa", false);
+        assertPredicate("${in.header.foo} < 'def'", true);
+        assertPredicate("${in.header.foo} < def", true);
 
         // integer to string comparison
-        assertExpression("${in.header.bar} < '100'", false);
-        assertExpression("${in.header.bar} < 100", false);
-        assertExpression("${in.header.bar} < '123'", false);
-        assertExpression("${in.header.bar} < 123", false);
-        assertExpression("${in.header.bar} < '200'", true);
+        assertPredicate("${in.header.bar} < '100'", false);
+        assertPredicate("${in.header.bar} < 100", false);
+        assertPredicate("${in.header.bar} < '123'", false);
+        assertPredicate("${in.header.bar} < 123", false);
+        assertPredicate("${in.header.bar} < '200'", true);
     }
 
     public void testLessThanOrEqualOperator() throws Exception {
         // string to string comparison
-        assertExpression("${in.header.foo} <= 'aaa'", false);
-        assertExpression("${in.header.foo} <= aaa", false);
-        assertExpression("${in.header.foo} <= 'abc'", true);
-        assertExpression("${in.header.foo} <= abc", true);
-        assertExpression("${in.header.foo} <= 'def'", true);
+        assertPredicate("${in.header.foo} <= 'aaa'", false);
+        assertPredicate("${in.header.foo} <= aaa", false);
+        assertPredicate("${in.header.foo} <= 'abc'", true);
+        assertPredicate("${in.header.foo} <= abc", true);
+        assertPredicate("${in.header.foo} <= 'def'", true);
 
         // integer to string comparison
-        assertExpression("${in.header.bar} <= '100'", false);
-        assertExpression("${in.header.bar} <= 100", false);
-        assertExpression("${in.header.bar} <= '123'", true);
-        assertExpression("${in.header.bar} <= 123", true);
-        assertExpression("${in.header.bar} <= '200'", true);
+        assertPredicate("${in.header.bar} <= '100'", false);
+        assertPredicate("${in.header.bar} <= 100", false);
+        assertPredicate("${in.header.bar} <= '123'", true);
+        assertPredicate("${in.header.bar} <= 123", true);
+        assertPredicate("${in.header.bar} <= '200'", true);
     }
 
     public void testIsNull() throws Exception {
-        assertExpression("${in.header.foo} == null", false);
-        assertExpression("${in.header.none} == null", true);
+        assertPredicate("${in.header.foo} == null", false);
+        assertPredicate("${in.header.none} == null", true);
 
-        assertExpression("${in.header.foo} == 'null'", false);
-        assertExpression("${in.header.none} == 'null'", true);
+        assertPredicate("${in.header.foo} == 'null'", false);
+        assertPredicate("${in.header.none} == 'null'", true);
     }
 
     public void testIsNotNull() throws Exception {
-        assertExpression("${in.header.foo} != null", true);
-        assertExpression("${in.header.none} != null", false);
+        assertPredicate("${in.header.foo} != null", true);
+        assertPredicate("${in.header.none} != null", false);
 
-        assertExpression("${in.header.foo} != 'null'", true);
-        assertExpression("${in.header.none} != 'null'", false);
+        assertPredicate("${in.header.foo} != 'null'", true);
+        assertPredicate("${in.header.none} != 'null'", false);
     }
 
     public void testRightOperatorIsSimpleLanauge() throws Exception {
         // operator on right side is also using ${ } placeholders
-        assertExpression("${in.header.foo} == ${in.header.foo}", true);
-        assertExpression("${in.header.foo} == ${in.header.bar}", false);
+        assertPredicate("${in.header.foo} == ${in.header.foo}", true);
+        assertPredicate("${in.header.foo} == ${in.header.bar}", false);
     }
 
     public void testRightOperatorIsBeanLanauge() throws Exception {
         // operator on right side is also using ${ } placeholders
-        assertExpression("${in.header.foo} == ${bean:generator.generateFilename}", true);
+        assertPredicate("${in.header.foo} == ${bean:generator.generateFilename}", true);
 
-        assertExpression("${in.header.bar} == ${bean:generator.generateId}", true);
-        assertExpression("${in.header.bar} >= ${bean:generator.generateId}", true);
+        assertPredicate("${in.header.bar} == ${bean:generator.generateId}", true);
+        assertPredicate("${in.header.bar} >= ${bean:generator.generateId}", true);
     }
 
     public void testConstains() throws Exception {
-        assertExpression("${in.header.foo} contains 'a'", true);
-        assertExpression("${in.header.foo} contains a", true);
-        assertExpression("${in.header.foo} contains 'ab'", true);
-        assertExpression("${in.header.foo} contains 'abc'", true);
-        assertExpression("${in.header.foo} contains 'def'", false);
-        assertExpression("${in.header.foo} contains def", false);
+        assertPredicate("${in.header.foo} contains 'a'", true);
+        assertPredicate("${in.header.foo} contains a", true);
+        assertPredicate("${in.header.foo} contains 'ab'", true);
+        assertPredicate("${in.header.foo} contains 'abc'", true);
+        assertPredicate("${in.header.foo} contains 'def'", false);
+        assertPredicate("${in.header.foo} contains def", false);
     }
 
     public void testNotConstains() throws Exception {
-        assertExpression("${in.header.foo} not contains 'a'", false);
-        assertExpression("${in.header.foo} not contains a", false);
-        assertExpression("${in.header.foo} not contains 'ab'", false);
-        assertExpression("${in.header.foo} not contains 'abc'", false);
-        assertExpression("${in.header.foo} not contains 'def'", true);
-        assertExpression("${in.header.foo} not contains def", true);
+        assertPredicate("${in.header.foo} not contains 'a'", false);
+        assertPredicate("${in.header.foo} not contains a", false);
+        assertPredicate("${in.header.foo} not contains 'ab'", false);
+        assertPredicate("${in.header.foo} not contains 'abc'", false);
+        assertPredicate("${in.header.foo} not contains 'def'", true);
+        assertPredicate("${in.header.foo} not contains def", true);
     }
 
     public void testRegex() throws Exception {
-        assertExpression("${in.header.foo} regex '^a..$'", true);
-        assertExpression("${in.header.foo} regex '^ab.$'", true);
-        assertExpression("${in.header.foo} regex ^ab.$", true);
-        assertExpression("${in.header.foo} regex ^d.*$", false);
-
-        assertExpression("${in.header.bar} regex '^\\d{3}'", true);
-        assertExpression("${in.header.bar} regex '^\\d{2}'", false);
-        assertExpression("${in.header.bar} regex ^\\d{3}", true);
-        assertExpression("${in.header.bar} regex ^\\d{2}", false);
+        assertPredicate("${in.header.foo} regex '^a..$'", true);
+        assertPredicate("${in.header.foo} regex '^ab.$'", true);
+        assertPredicate("${in.header.foo} regex ^ab.$", true);
+        assertPredicate("${in.header.foo} regex ^d.*$", false);
+
+        assertPredicate("${in.header.bar} regex '^\\d{3}'", true);
+        assertPredicate("${in.header.bar} regex '^\\d{2}'", false);
+        assertPredicate("${in.header.bar} regex ^\\d{3}", true);
+        assertPredicate("${in.header.bar} regex ^\\d{2}", false);
     }
 
     public void testNotRegex() throws Exception {
-        assertExpression("${in.header.foo} not regex '^a..$'", false);
-        assertExpression("${in.header.foo} not regex '^ab.$'", false);
-        assertExpression("${in.header.foo} not regex ^ab.$", false);
-        assertExpression("${in.header.foo} not regex ^d.*$", true);
-
-        assertExpression("${in.header.bar} not regex '^\\d{3}'", false);
-        assertExpression("${in.header.bar} not regex '^\\d{2}'", true);
-        assertExpression("${in.header.bar} not regex ^\\d{3}", false);
-        assertExpression("${in.header.bar} not regex ^\\d{2}", true);
+        assertPredicate("${in.header.foo} not regex '^a..$'", false);
+        assertPredicate("${in.header.foo} not regex '^ab.$'", false);
+        assertPredicate("${in.header.foo} not regex ^ab.$", false);
+        assertPredicate("${in.header.foo} not regex ^d.*$", true);
+
+        assertPredicate("${in.header.bar} not regex '^\\d{3}'", false);
+        assertPredicate("${in.header.bar} not regex '^\\d{2}'", true);
+        assertPredicate("${in.header.bar} not regex ^\\d{3}", false);
+        assertPredicate("${in.header.bar} not regex ^\\d{2}", true);
     }
 
     public void testIn() throws Exception {
         // string to string
-        assertExpression("${in.header.foo} in 'foo,abc,def'", true);
-        assertExpression("${in.header.foo} in ${bean:generator.generateFilename}", true);
-        assertExpression("${in.header.foo} in foo,abc,def", true);
-        assertExpression("${in.header.foo} in 'foo,def'", false);
+        assertPredicate("${in.header.foo} in 'foo,abc,def'", true);
+        assertPredicate("${in.header.foo} in ${bean:generator.generateFilename}", true);
+        assertPredicate("${in.header.foo} in foo,abc,def", true);
+        assertPredicate("${in.header.foo} in 'foo,def'", false);
 
         // integer to string
-        assertExpression("${in.header.bar} in '100,123,200'", true);
-        assertExpression("${in.header.bar} in 100,123,200", true);
-        assertExpression("${in.header.bar} in ${bean:generator.generateId}", true);
-        assertExpression("${in.header.bar} in '100,200'", false);
+        assertPredicate("${in.header.bar} in '100,123,200'", true);
+        assertPredicate("${in.header.bar} in 100,123,200", true);
+        assertPredicate("${in.header.bar} in ${bean:generator.generateId}", true);
+        assertPredicate("${in.header.bar} in '100,200'", false);
     }
 
     public void testNotIn() throws Exception {
         // string to string
-        assertExpression("${in.header.foo} not in 'foo,abc,def'", false);
-        assertExpression("${in.header.foo} not in ${bean:generator.generateFilename}", false);
-        assertExpression("${in.header.foo} not in foo,abc,def", false);
-        assertExpression("${in.header.foo} not in 'foo,def'", true);
+        assertPredicate("${in.header.foo} not in 'foo,abc,def'", false);
+        assertPredicate("${in.header.foo} not in ${bean:generator.generateFilename}", false);
+        assertPredicate("${in.header.foo} not in foo,abc,def", false);
+        assertPredicate("${in.header.foo} not in 'foo,def'", true);
 
         // integer to string
-        assertExpression("${in.header.bar} not in '100,123,200'", false);
-        assertExpression("${in.header.bar} not in 100,123,200", false);
-        assertExpression("${in.header.bar} not in ${bean:generator.generateId}", false);
-        assertExpression("${in.header.bar} not in '100,200'", true);
+        assertPredicate("${in.header.bar} not in '100,123,200'", false);
+        assertPredicate("${in.header.bar} not in 100,123,200", false);
+        assertPredicate("${in.header.bar} not in ${bean:generator.generateId}", false);
+        assertPredicate("${in.header.bar} not in '100,200'", true);
     }
 
     public void testIs() throws Exception {
-        assertExpression("${in.header.foo} is 'java.lang.String'", true);
-        assertExpression("${in.header.foo} is 'java.lang.Integer'", false);
+        assertPredicate("${in.header.foo} is 'java.lang.String'", true);
+        assertPredicate("${in.header.foo} is 'java.lang.Integer'", false);
 
-        assertExpression("${in.header.foo} is 'String'", true);
-        assertExpression("${in.header.foo} is 'Integer'", false);
+        assertPredicate("${in.header.foo} is 'String'", true);
+        assertPredicate("${in.header.foo} is 'Integer'", false);
 
-        assertExpression("${in.header.foo} is String", true);
-        assertExpression("${in.header.foo} is Integer", false);
+        assertPredicate("${in.header.foo} is String", true);
+        assertPredicate("${in.header.foo} is Integer", false);
 
         try {
-            assertExpression("${in.header.foo} is com.mycompany.DoesNotExist", false);
+            assertPredicate("${in.header.foo} is com.mycompany.DoesNotExist", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
@@ -380,17 +380,17 @@ public class SimpleOperatorTest extends 
     }
 
     public void testIsNot() throws Exception {
-        assertExpression("${in.header.foo} not is 'java.lang.String'", false);
-        assertExpression("${in.header.foo} not is 'java.lang.Integer'", true);
+        assertPredicate("${in.header.foo} not is 'java.lang.String'", false);
+        assertPredicate("${in.header.foo} not is 'java.lang.Integer'", true);
 
-        assertExpression("${in.header.foo} not is 'String'", false);
-        assertExpression("${in.header.foo} not is 'Integer'", true);
+        assertPredicate("${in.header.foo} not is 'String'", false);
+        assertPredicate("${in.header.foo} not is 'Integer'", true);
 
-        assertExpression("${in.header.foo} not is String", false);
-        assertExpression("${in.header.foo} not is Integer", true);
+        assertPredicate("${in.header.foo} not is String", false);
+        assertPredicate("${in.header.foo} not is Integer", true);
 
         try {
-            assertExpression("${in.header.foo} not is com.mycompany.DoesNotExist", false);
+            assertPredicate("${in.header.foo} not is com.mycompany.DoesNotExist", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
@@ -398,68 +398,68 @@ public class SimpleOperatorTest extends 
     }
 
     public void testRange() throws Exception {
-        assertExpression("${in.header.bar} range 100..200", true);
-        assertExpression("${in.header.bar} range 200..300", false);
+        assertPredicate("${in.header.bar} range 100..200", true);
+        assertPredicate("${in.header.bar} range 200..300", false);
 
-        assertExpression("${in.header.foo} range 200..300", false);
-        assertExpression("${bean:generator.generateId} range 123..130", true);
-        assertExpression("${bean:generator.generateId} range 120..123", true);
-        assertExpression("${bean:generator.generateId} range 120..122", false);
-        assertExpression("${bean:generator.generateId} range 124..130", false);
+        assertPredicate("${in.header.foo} range 200..300", false);
+        assertPredicate("${bean:generator.generateId} range 123..130", true);
+        assertPredicate("${bean:generator.generateId} range 120..123", true);
+        assertPredicate("${bean:generator.generateId} range 120..122", false);
+        assertPredicate("${bean:generator.generateId} range 124..130", false);
 
         try {
-            assertExpression("${in.header.foo} range abc..200", false);
+            assertPredicate("${in.header.foo} range abc..200", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
         }
 
         try {
-            assertExpression("${in.header.foo} range abc..", false);
+            assertPredicate("${in.header.foo} range abc..", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
         }
 
         try {
-            assertExpression("${in.header.foo} range 100.200", false);
+            assertPredicate("${in.header.foo} range 100.200", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
         }
 
-        assertExpression("${in.header.bar} range 100..200 and ${in.header.foo} == abc" , true);
-        assertExpression("${in.header.bar} range 200..300 and ${in.header.foo} == abc" , false);
-        assertExpression("${in.header.bar} range 200..300 or ${in.header.foo} == abc" , true);
-        assertExpression("${in.header.bar} range 200..300 or ${in.header.foo} == def" , false);
+        assertPredicate("${in.header.bar} range 100..200 and ${in.header.foo} == abc" , true);
+        assertPredicate("${in.header.bar} range 200..300 and ${in.header.foo} == abc" , false);
+        assertPredicate("${in.header.bar} range 200..300 or ${in.header.foo} == abc" , true);
+        assertPredicate("${in.header.bar} range 200..300 or ${in.header.foo} == def" , false);
     }
 
     public void testNotRange() throws Exception {
-        assertExpression("${in.header.bar} not range 100..200", false);
-        assertExpression("${in.header.bar} not range 200..300", true);
+        assertPredicate("${in.header.bar} not range 100..200", false);
+        assertPredicate("${in.header.bar} not range 200..300", true);
 
-        assertExpression("${in.header.foo} not range 200..300", true);
-        assertExpression("${bean:generator.generateId} not range 123..130", false);
-        assertExpression("${bean:generator.generateId} not range 120..123", false);
-        assertExpression("${bean:generator.generateId} not range 120..122", true);
-        assertExpression("${bean:generator.generateId} not range 124..130", true);
+        assertPredicate("${in.header.foo} not range 200..300", true);
+        assertPredicate("${bean:generator.generateId} not range 123..130", false);
+        assertPredicate("${bean:generator.generateId} not range 120..123", false);
+        assertPredicate("${bean:generator.generateId} not range 120..122", true);
+        assertPredicate("${bean:generator.generateId} not range 124..130", true);
 
         try {
-            assertExpression("${in.header.foo} not range abc..200", false);
+            assertPredicate("${in.header.foo} not range abc..200", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
         }
 
         try {
-            assertExpression("${in.header.foo} not range abc..", false);
+            assertPredicate("${in.header.foo} not range abc..", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));
         }
 
         try {
-            assertExpression("${in.header.foo} not range 100.200", false);
+            assertPredicate("${in.header.foo} not range 100.200", false);
             fail("Should have thrown an exception");
         } catch (IllegalArgumentException e) {
             assertTrue(e.getMessage().startsWith("Syntax error"));

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleRegExpTest.java (from r1163179, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleRegExpTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleRegExpTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java&r1=1163179&r2=1163287&rev=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleRegExpTest.java Tue Aug 30 16:49:32 2011
@@ -16,61 +16,18 @@
  */
 package org.apache.camel.processor;
 
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.validation.PredicateValidationException;
 
 /**
  * @version 
  */
-public class ValidateRegExpTest extends ContextTestSupport {
+public class ValidateSimpleRegExpTest extends ValidateRegExpTest {
     
-    protected Endpoint startEndpoint;
-    protected MockEndpoint resultEndpoint;
-    
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        startEndpoint = resolveMandatoryEndpoint("direct:start", Endpoint.class);
-        resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
-    }
-
-    public void testSendMatchingMessage() throws Exception {
-        resultEndpoint.expectedMessageCount(1);
-
-        template.sendBody(startEndpoint, "01.01.2010");
-        
-        assertMockEndpointsSatisfied();
-    }
-
-    public void testSendNotMatchingMessage() throws Exception {
-        resultEndpoint.expectedMessageCount(0);
-
-        try {
-            template.sendBody(startEndpoint, "1.1.2010");
-            fail("CamelExecutionException expected");
-        } catch (CamelExecutionException e) {
-            // expected
-            assertIsInstanceOf(PredicateValidationException.class, e.getCause());
-            // as the Expression could be different between the DSL and simple language, here we just check part of the message 
-            assertTrue("Get a wrong exception message", e.getCause().getMessage().startsWith("Validation failed for Predicate"));
-            assertTrue(e.getCause().getMessage().contains("^\\d{2}\\.\\d{2}\\.\\d{4}$"));
-            assertTrue("Get a wrong exception message", e.getCause().getMessage().endsWith("Exchange[Message: 1.1.2010]"));
-        }
-
-        assertMockEndpointsSatisfied();
-    }
-
-
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                    .validate(body(String.class).regex("^\\d{2}\\.\\d{2}\\.\\d{4}$"))
+                    .validate().simple("${bodyAs(java.lang.String)} regex '^\\d{2}\\.\\d{2}\\.\\d{4}$'")
                     .to("mock:result");
             }
         };

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java Tue Aug 30 16:49:32 2011
@@ -66,10 +66,10 @@ public class ParentChildInterceptStrateg
                 from("direct:start").routeId("route")
                     .to("mock:a").id("task-a")
                     .choice().id("choice")
-                        .when(simple("${body} contains Camel")).id("when")
+                        .when(simple("${body} contains 'Camel'")).id("when")
                             .to("mock:b").id("task-b")
                             .to("mock:c").id("task-c")
-                        .when(simple("${body} contains Donkey")).id("when2")
+                        .when(simple("${body} contains 'Donkey'")).id("when2")
                             .to("mock:d").id("task-d")
                         .otherwise().id("otherwise")
                             .to("mock:e").id("task-e")

Modified: camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml (original)
+++ camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml Tue Aug 30 16:49:32 2011
@@ -28,7 +28,7 @@
       <from uri="file://src/test/data/delim?noop=true"/>
       <unmarshal ref="delimitedFormat"/>
       <split>
-        <simple>in.body</simple>
+        <simple>${body}</simple>
         <convertBodyTo type="java.util.Map"/>
         <to uri="mock:results"/>
       </split>

Modified: camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml (original)
+++ camel/trunk/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml Tue Aug 30 16:49:32 2011
@@ -28,7 +28,7 @@
       <from uri="file://src/test/data/fixed?noop=true"/>
       <unmarshal ref="fixedFormat"/>
       <split>
-        <simple>in.body</simple>
+        <simple>${body}</simple>
         <convertBodyTo type="java.util.Map"/>
         <to uri="mock:results"/>
       </split>

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentBasedRouteTest.java Tue Aug 30 16:49:32 2011
@@ -55,7 +55,7 @@ public class JettyContentBasedRouteTest 
                 // START SNIPPET: e1
                 from("jetty:" + serverUri)
                     .choice()
-                    .when().simple("in.header.one").to("mock:one")
+                    .when().simple("${header.one}").to("mock:one")
                     .otherwise()
                     .to("mock:other");
                 // END SNIPPET: e1

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java Tue Aug 30 16:49:32 2011
@@ -71,7 +71,7 @@ public class JettyHttpProducerContentBas
             public void configure() throws Exception {
                 from(serverUri)
                     .choice()
-                    .when().simple("in.header.one").to("mock:one")
+                    .when().simple("${header.one}").to("mock:one")
                     .otherwise()
                     .to("mock:other");
             }

Modified: camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringSimpleTXResequencerTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringSimpleTXResequencerTest.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringSimpleTXResequencerTest.xml (original)
+++ camel/trunk/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringSimpleTXResequencerTest.xml Tue Aug 30 16:49:32 2011
@@ -27,7 +27,7 @@ http://camel.apache.org/schema/spring ht
             <from uri="activemq:queue:in"/>
             <resequence>
                 <stream-config capacity="100" timeout="5000"/>
-                <simple>body</simple>
+                <simple>${body}</simple>
                 <to uri="activemq:queue:out"/>
             </resequence>
         </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/META-INF/spring/camel-context.xml Tue Aug 30 16:49:32 2011
@@ -56,7 +56,7 @@
     <route>
       <from uri="direct:c.start"/>
       <resequence>
-        <simple>body</simple>
+        <simple>${body}</simple>
         <to uri="mock:c.end"/>
       </resequence>
     </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SplitterOnPrepareTest.xml Tue Aug 30 16:49:32 2011
@@ -26,7 +26,7 @@
         <route>
             <from uri="direct:start"/>
             <split onPrepareRef="fixNamePrepare">
-                <simple>body</simple>
+                <simple>${body}</simple>
                 <to uri="direct:a"/>
             </split>
         </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSetHeaderTest-context.xml Tue Aug 30 16:49:32 2011
@@ -27,7 +27,7 @@
     <route>
       <from uri="seda:a"/>
       <setHeader headerName="oldBodyValue">
-        <simple>body</simple>
+        <simple>${body}</simple>
       </setHeader>
       <to uri="mock:b"/>     
     </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringSplitterBodyTest.xml Tue Aug 30 16:49:32 2011
@@ -28,7 +28,7 @@
             <from uri="direct:start"/>
             <split>
                 <!-- split the body, which contains a List with the data to be splitted -->
-                <simple>body</simple>
+                <simple>${body}</simple>
                 <to uri="mock:split"/>
             </split>
         </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml Tue Aug 30 16:49:32 2011
@@ -28,7 +28,7 @@
             <from uri="direct:start"/>
             <aggregate strategyRef="aggregatorStrategy" completionTimeout="2000">
                 <correlationExpression>
-                    <simple>header.id</simple>
+                    <simple>${header.id}</simple>
                 </correlationExpression>
                 <completionTimeout>
                     <header>timeout</header>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/resequencer.xml Tue Aug 30 16:49:32 2011
@@ -27,7 +27,7 @@
     <route>
       <from uri="direct:start"/>
       <resequence>
-        <simple>body</simple>
+        <simple>${body}</simple>
         <to uri="mock:result"/>
       </resequence>
     </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setOutHeader.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setOutHeader.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setOutHeader.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/setOutHeader.xml Tue Aug 30 16:49:32 2011
@@ -27,7 +27,7 @@
     <route>
       <from uri="seda:a"/>
       <setOutHeader headerName="oldBodyValue">
-        <simple>body</simple>
+        <simple>${body}</simple>
       </setOutHeader>
       <to uri="mock:b"/>     
     </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/sortBodyTest.xml Tue Aug 30 16:49:32 2011
@@ -28,7 +28,7 @@
             <from uri="direct:start"/>
             <!-- will sort the body using a default comparator -->
             <sort>
-                <simple>body</simple>
+                <simple>${body}</simple>
             </sort>
             <to uri="mock:result"/>
         </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/streamResequencer.xml Tue Aug 30 16:49:32 2011
@@ -28,7 +28,7 @@
       <from uri="direct:start"/>
       <resequence>
         <stream-config/>
-        <simple>in.header.seqnum</simple>
+        <simple>${header.seqnum}</simple>
         <to uri="mock:result" />
       </resequence>
     </route>

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml?rev=1163287&r1=1163286&r2=1163287&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/traceInterceptorWithOutBodyTrace.xml Tue Aug 30 16:49:32 2011
@@ -27,7 +27,7 @@
     <route>
       <from uri="direct:start"/>
       <transform>
-        <simple>body</simple>
+        <simple>${body}</simple>
       </transform>
       <to uri="mock:a"/>
       <to uri="mock:b"/>



Mime
View raw message