svn commit: r732316 - in /activemq/camel/trunk/camel-core/src/main: java/org/apache/camel/builder/ExpressionClause.java java/org/apache/camel/model/language/MvelExpression.java resources/org/apache/camel/model/language/jaxb.index

[da...@apache.org]

Author: davsclaus
Date: Wed Jan  7 04:17:16 2009
New Revision: 732316

URL: http://svn.apache.org/viewvc?rev=732316&view=rev
Log:
CAMEL-1031: Added mvel as expression language

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java   (contents, props changed)
      - copied, changed from r732302, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=732316&r1=732315&r2=732316&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Wed Jan  7 04:17:16 2009
@@ -246,6 +246,17 @@
     }
 
     /**
+     * Evaluates a <a href="http://activemq.apache.org/camel/mvel.html">MVEL
+     * expression</a>
+     *
+     * @param text the expression to be evaluated
+     * @return the builder to continue processing the DSL
+     */
+    public T mvel(String text) {
+        return language("mvel", text);
+    }
+
+    /**
      * Evaluates a <a href="http://activemq.apache.org/camel/php.html">PHP
      * expression</a>
      * 

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java (from r732302, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java&r1=732302&r2=732316&rev=732316&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java Wed Jan  7 04:17:16 2009
@@ -19,20 +19,20 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * For OGNL expressions and predicates
+ * For MVEL expressions and predicates
  *
- * @version $Revision$
+ * @version $Revision:$
  */
-@XmlRootElement(name = "ognl")
-public class OgnlExpression extends ExpressionType {
-    public OgnlExpression() {
+@XmlRootElement(name = "mvel")
+public class MvelExpression extends ExpressionType {
+    public MvelExpression() {
     }
 
-    public OgnlExpression(String expression) {
+    public MvelExpression(String expression) {
         super(expression);
     }
 
     public String getLanguage() {
-        return "ognl";
+        return "mvel";
     }
-}
+}
\ No newline at end of file

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index?rev=732316&r1=732315&r2=732316&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index Wed Jan  7 04:17:16 2009
@@ -23,6 +23,7 @@
 JXPathExpression
 LanguageExpression
 MethodCallExpression
+MvelExpression
 OgnlExpression
 PhpExpression
 PythonExpression