Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 8452 invoked from network); 28 Nov 2009 01:56:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Nov 2009 01:56:29 -0000 Received: (qmail 49680 invoked by uid 500); 28 Nov 2009 01:56:29 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 49632 invoked by uid 500); 28 Nov 2009 01:56:29 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 49623 invoked by uid 99); 28 Nov 2009 01:56:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Nov 2009 01:56:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Nov 2009 01:56:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4785E2388978; Sat, 28 Nov 2009 01:56:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@camel.apache.org From: hadrian@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091128015605.4785E2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ de.odysseus.juel juel - 2.1.0 + ${juel-version} 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 matching = new ArrayList(); 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 @@ 2.2.5

1.2.0

1.0 + 1.0.1 + 2.0.0 + 1.1 + 1.1

1.1.1

1.1.1 + 1.0.1 1.1.1 + 1.1.1

4.0

3.1

6.1.16 @@ -103,6 +109,7 @@ 2.4.0

1.8.1_1

1.6.6 + 2.1.2 version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))" @@ -657,50 +664,50 @@ org.apache.geronimo.specs - geronimo-jms_1.1_spec - ${geronimo-jms-spec-version} + geronimo-j2ee-connector_1.5_spec + ${geronimo-j2ee-connector-spec-version} org.apache.geronimo.specs - geronimo-jta_1.1_spec - ${geronimo-jta-spec-version} + geronimo-j2ee-jacc_1.0_spec + ${geronimo-j2ee-jacc-spec-version} org.apache.geronimo.specs geronimo-j2ee-management_1.0_spec - 1.1 + ${geronimo-j2ee-management-spec-version} org.apache.geronimo.specs - geronimo-j2ee-jacc_1.0_spec - 1.1 + geronimo-jms_1.1_spec + ${geronimo-jms-spec-version} org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - 2.0.0 + geronimo-jpa_3.0_spec + ${geronimo-jpa-spec-version} org.apache.geronimo.specs - geronimo-jsp_2.0_spec - 1.1 + geronimo-jsp_2.1_spec + ${geronimo-jsp-spec-version} org.apache.geronimo.specs - geronimo-servlet_2.4_spec - 1.1.1 + geronimo-jta_1.1_spec + ${geronimo-jta-spec-version} org.apache.geronimo.specs - geronimo-jpa_3.0_spec - ${geronimo-jpa-spec-version} + geronimo-servlet_2.4_spec + ${geronimo-servlet-spec-version}