[jboss-svn-commits] JBL Code SVN: r28930 - in labs/jbossesb/trunk/product: rosetta/src/org/jboss/soa/esb/message/mapping and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-08-14 03:08:11 -0400 (Fri, 14 Aug 2009)
New Revision: 28930

Modified:
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2656 "Upgrade JBpmObjectMapper and ObjectMapper to mvel2"


Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2009-08-14 07:02:13 UTC (rev 28929)
+++ labs/jbossesb/trunk/product/ivy.xml	2009-08-14 07:08:11 UTC (rev 28930)
@@ -50,7 +50,6 @@
         </dependency>
         <dependency org="org.apache.juddi" name="juddi-client" rev="2.0rc5"/>
         <dependency org="log4j" name="log4j" rev="1.2.14"/>
-        <dependency org="org.codehaus.mvel" name="mvel" rev="1.3.3-java1.5"/>
 
         <dependency org="ognl" name="ognl" rev="2.6.9"/>
         <dependency org="quartz" name="quartz" rev="1.5.2">

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java	2009-08-14 07:02:13 UTC (rev 28929)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/message/mapping/ObjectMapper.java	2009-08-14 07:08:11 UTC (rev 28930)
@@ -32,7 +32,7 @@
 import org.jboss.soa.esb.message.body.content.BytesBody;
 import org.jboss.soa.esb.helpers.ConfigTree;
 import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
 
 /**
  * Extracts objects from an ESB message and puts them into a Map, which can be

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java	2009-08-14 07:02:13 UTC (rev 28929)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/JBpmObjectMapper.java	2009-08-14 07:08:11 UTC (rev 28930)
@@ -27,7 +27,7 @@
 import org.jbpm.context.exe.ContextInstance;
 import org.jbpm.graph.exe.ExecutionContext;
 import org.jbpm.graph.exe.Token;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
 
 /**
  * Mapping glue between jBPM and ESB. Handles setting up the replyTo of the