svn commit: r766571 - in /camel/trunk/components/camel-mvel: pom.xml src/main/java/org/apache/camel/language/mvel/MvelExpression.java

[davsclaus]

Author: davsclaus
Date: Mon Apr 20 04:46:39 2009
New Revision: 766571

URL: http://svn.apache.org/viewvc?rev=766571&view=rev
Log:
CAMEL-1545: Upgraded to Mvel 2.0.8

Modified:
    camel/trunk/components/camel-mvel/pom.xml
    
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java

Modified: camel/trunk/components/camel-mvel/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/pom.xml?rev=766571&r1=766570&r2=766571&view=diff
==============================================================================
--- camel/trunk/components/camel-mvel/pom.xml (original)
+++ camel/trunk/components/camel-mvel/pom.xml Mon Apr 20 04:46:39 2009
@@ -46,8 +46,8 @@
     
     <dependency>
        <groupId>org.mvel</groupId>
-       <artifactId>mvel</artifactId>
-       <version>2.0beta1</version>
+       <artifactId>mvel2</artifactId>
+       <version>2.0.8</version>
     </dependency>
 
     <!-- testing -->

Modified: 
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java?rev=766571&r1=766570&r2=766571&view=diff
==============================================================================
--- 
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
 (original)
+++ 
camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java
 Mon Apr 20 04:46:39 2009
@@ -33,7 +33,7 @@
         this.expressionString = expressionString;
         this.type = type;
         try {
-            this.compiled = org.mvel.MVEL.compileExpression(expressionString);
+            this.compiled = org.mvel2.MVEL.compileExpression(expressionString);
         } catch (Exception e) {
             throw new ExpressionIllegalSyntaxException(expressionString, e);
         }
@@ -45,7 +45,7 @@
 
     public <T> T evaluate(Exchange exchange, Class<T> tClass) {
         try {
-            Object value = org.mvel.MVEL.executeExpression(compiled, new 
RootObject(exchange));
+            Object value = org.mvel2.MVEL.executeExpression(compiled, new 
RootObject(exchange));
             return exchange.getContext().getTypeConverter().convertTo(tClass, 
value);
         } catch (Exception e) {
             throw new ExpressionEvaluationException(this, exchange, e);
@@ -54,7 +54,7 @@
 
     public Object evaluate(Exchange exchange) {
         try {
-            return org.mvel.MVEL.executeExpression(compiled, new 
RootObject(exchange));
+            return org.mvel2.MVEL.executeExpression(compiled, new 
RootObject(exchange));
         } catch (Exception e) {
             throw new ExpressionEvaluationException(this, exchange, e);
         }