svn commit: r711642 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/model/language/ components/camel-spring/src/test/resources/org/apache/camel/spring/processor/

[janstey]

Author: janstey
Date: Wed Nov  5 10:14:53 2008
New Revision: 711642

URL: http://svn.apache.org/viewvc?rev=711642&view=rev
Log:
CAMEL-947 - align Spring and Java DSL syntax for method calls

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
    
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
    
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=711642&r1=711641&r2=711642&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
 Wed Nov  5 10:14:53 2008
@@ -33,7 +33,7 @@
  *
  * @version $Revision$
  */
[EMAIL PROTECTED](name = "methodCall")
[EMAIL PROTECTED](name = "method")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class MethodCallExpression extends ExpressionType {
     @XmlAttribute(required = false)

Modified: 
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=711642&r1=711641&r2=711642&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
 (original)
+++ 
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
 Wed Nov  5 10:14:53 2008
@@ -52,7 +52,7 @@
         <simple>header.cheese</simple>
         <to uri="mock:result"/>
         <completedPredicate>
-          <methodCall bean="myAggregatorStrategy" method="isCompleted"/>
+          <method bean="myAggregatorStrategy" method="isCompleted"/>
         </completedPredicate>
       </aggregator>
     </route>

Modified: 
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml?rev=711642&r1=711641&r2=711642&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
 (original)
+++ 
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
 Wed Nov  5 10:14:53 2008
@@ -64,7 +64,7 @@
         <simple>header.cheese</simple>
         <to uri="mock:result"/>
         <completedPredicate>
-          <methodCall bean="bodyInAggregatorStrategy" method="isCompleted"/>
+          <method bean="bodyInAggregatorStrategy" method="isCompleted"/>
         </completedPredicate>
       </aggregator>
     </route>