camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r885060 - in /camel/trunk: components/camel-juel/pom.xml components/camel-juel/src/main/java/org/apache/camel/language/juel/BeanAndMethodELResolver.java parent/pom.xml
Date Sat, 28 Nov 2009 01:56:04 GMT
Author: hadrian
Date: Sat Nov 28 01:56:02 2009
New Revision: 885060

URL: http://svn.apache.org/viewvc?rev=885060&view=rev
Log:
CAMEL-1567. Upgrade to juel-2.1.1 while maintain compatibility with 2.1.0

Modified:
    camel/trunk/components/camel-juel/pom.xml
    camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/BeanAndMethodELResolver.java
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-juel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/pom.xml?rev=885060&r1=885059&r2=885060&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/pom.xml (original)
+++ camel/trunk/components/camel-juel/pom.xml Sat Nov 28 01:56:02 2009
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>de.odysseus.juel</groupId>
       <artifactId>juel</artifactId>
-      <version>2.1.0</version>
+      <version>${juel-version}</version>
     </dependency>
 
     <!-- testing -->

Modified: camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/BeanAndMethodELResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/BeanAndMethodELResolver.java?rev=885060&r1=885059&r2=885060&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/BeanAndMethodELResolver.java
(original)
+++ camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/BeanAndMethodELResolver.java
Sat Nov 28 01:56:02 2009
@@ -38,7 +38,8 @@
     @Override
     public Object getValue(ELContext elContext, Object base, Object property) {
         try {
-            return super.getValue(elContext, base, property);
+            return (property instanceof Method) ? property : 
+                super.getValue(elContext, base, property);
         } catch (PropertyNotFoundException e) {
             // lets see if its a method call...
             Method method = findMethod(elContext, base, property);
@@ -52,11 +53,11 @@
     }
 
     protected Method findMethod(ELContext elContext, Object base, Object property) {
-        if (base != null && property instanceof String) {
+        if (base != null) {
             Method[] methods = base.getClass().getMethods();
             List<Method> matching = new ArrayList<Method>();
             for (Method method : methods) {
-                if (method.getName().equals(property) && Modifier.isPublic(method.getModifiers()))
{
+                if (method.getName().equals(property.toString()) && Modifier.isPublic(method.getModifiers()))
{
                     matching.add(method);
                 }
             }

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=885060&r1=885059&r2=885060&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Nov 28 01:56:02 2009
@@ -41,9 +41,15 @@
     <cxf-version>2.2.5</cxf-version>
     <felix-osgi-version>1.2.0</felix-osgi-version>
     <fuse-commons-management-version>1.0</fuse-commons-management-version>
+    <geronimo-el-spec-version>1.0.1</geronimo-el-spec-version>
+    <geronimo-j2ee-connector-spec-version>2.0.0</geronimo-j2ee-connector-spec-version>
+    <geronimo-j2ee-jacc-spec-version>1.1</geronimo-j2ee-jacc-spec-version>
+    <geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
     <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
     <geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
+    <geronimo-jsp-spec-version>1.0.1</geronimo-jsp-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
+    <geronimo-servlet-spec-version>1.1.1</geronimo-servlet-spec-version>
     <httpcore-version>4.0</httpcore-version>
     <httpclient-version>3.1</httpclient-version>
     <jetty-version>6.1.16</jetty-version>
@@ -103,6 +109,7 @@
     <xmlbeans-version>2.4.0</xmlbeans-version>
     <snmp4j-version>1.8.1_1</snmp4j-version>
     <quartz-version>1.6.6</quartz-version>
+    <juel-version>2.1.2</juel-version>
 
     <!-- OSGi bundles properties -->
     <camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
@@ -657,50 +664,50 @@
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>${geronimo-jms-spec-version}</version>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>${geronimo-j2ee-connector-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <version>${geronimo-jta-spec-version}</version>
+        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        <version>${geronimo-j2ee-jacc-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-        <version>1.1</version>
+        <version>${geronimo-j2ee-management-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-        <version>1.1</version>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>${geronimo-jms-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>2.0.0</version>
+        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        <version>${geronimo-jpa-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jsp_2.0_spec</artifactId>
-        <version>1.1</version>
+        <artifactId>geronimo-jsp_2.1_spec</artifactId>
+        <version>${geronimo-jsp-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.4_spec</artifactId>
-        <version>1.1.1</version>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <version>${geronimo-jta-spec-version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <version>${geronimo-jpa-spec-version}</version>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>${geronimo-servlet-spec-version}</version>
       </dependency>
 
       <!-- Optional Spring Support -->



Mime
View raw message