You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/11/04 22:01:39 UTC
svn commit: r1031243 - in
/servicemix/components/engines/servicemix-bean/trunk: pom.xml
src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
Author: jbonofre
Date: Thu Nov 4 21:01:39 2010
New Revision: 1031243
URL: http://svn.apache.org/viewvc?rev=1031243&view=rev
Log:
Upgrade to commons-jexl 2.0.1.
Modified:
servicemix/components/engines/servicemix-bean/trunk/pom.xml
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
Modified: servicemix/components/engines/servicemix-bean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/pom.xml?rev=1031243&r1=1031242&r2=1031243&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/pom.xml Thu Nov 4 21:01:39 2010
@@ -35,6 +35,9 @@
<name>Apache ServiceMix :: Components :: Bean Service Engine</name>
<properties>
+ <commons-jexl.version>2.0.1</commons-jexl.version>
+ <geronimo-annotation.version>1.1.1</geronimo-annotation.version>
+
<servicemix.osgi.import>
!org.apache.servicemix.bean*,
!META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.bean,
@@ -115,12 +118,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-annotation.version}</version>
</dependency>
<dependency>
- <groupId>commons-jexl</groupId>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
- <version>1.1</version>
+ <version>${commons-jexl.version}</version>
</dependency>
<!-- for unit/integration testing -->
<dependency>
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java?rev=1031243&r1=1031242&r2=1031243&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java Thu Nov 4 21:01:39 2010
@@ -39,10 +39,10 @@ import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.jexl.Expression;
-import org.apache.commons.jexl.ExpressionFactory;
-import org.apache.commons.jexl.JexlContext;
-import org.apache.commons.jexl.JexlHelper;
+import org.apache.commons.jexl2.Expression;
+import org.apache.commons.jexl2.JexlContext;
+import org.apache.commons.jexl2.JexlEngine;
+import org.apache.commons.jexl2.MapContext;
import org.apache.servicemix.bean.support.BeanInfo;
import org.apache.servicemix.bean.support.DefaultMethodInvocationStrategy;
import org.apache.servicemix.bean.support.DestinationImpl;
@@ -389,10 +389,11 @@ public class BeanEndpoint extends Provid
public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
if (method.getAnnotation(Callback.class) != null) {
try {
- Expression e = ExpressionFactory.createExpression(
+ JexlEngine jexl = new JexlEngine();
+ Expression e = jexl.createExpression(
method.getAnnotation(Callback.class).condition());
- JexlContext jc = JexlHelper.createContext();
- jc.getVars().put("this", obj);
+ JexlContext jc = new MapContext();
+ jc.set("this", obj);
Object r = e.evaluate(jc);
if (!(r instanceof Boolean)) {
throw new RuntimeException("Expression did not returned a boolean value but: " + r);