Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 16893 invoked from network); 2 Jan 2009 13:59:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jan 2009 13:59:14 -0000 Received: (qmail 95729 invoked by uid 500); 2 Jan 2009 13:59:14 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 95697 invoked by uid 500); 2 Jan 2009 13:59:13 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 95688 invoked by uid 99); 2 Jan 2009 13:59:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2009 05:59:13 -0800 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; Fri, 02 Jan 2009 13:59:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFD37238889E; Fri, 2 Jan 2009 05:58:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730720 - in /activemq/camel/trunk/components/camel-mvel: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/camel/ src/main/java/org/apache/camel/language/ src/main/java/org/apache/camel/... Date: Fri, 02 Jan 2009 13:58:45 -0000 To: camel-commits@activemq.apache.org From: janstey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090102135845.CFD37238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: janstey Date: Fri Jan 2 05:58:44 2009 New Revision: 730720 URL: http://svn.apache.org/viewvc?rev=730720&view=rev Log: CAMEL-1031 - Intial go at the mvel component. Thanks to Przemyslaw for contributing this! Added: activemq/camel/trunk/components/camel-mvel/ activemq/camel/trunk/components/camel-mvel/pom.xml (with props) activemq/camel/trunk/components/camel-mvel/src/ activemq/camel/trunk/components/camel-mvel/src/main/ activemq/camel/trunk/components/camel-mvel/src/main/java/ activemq/camel/trunk/components/camel-mvel/src/main/java/org/ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MVEL.java (with props) activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java (with props) activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java (with props) activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java (with props) activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/package.html (with props) activemq/camel/trunk/components/camel-mvel/src/main/resources/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/LICENSE.txt (with props) activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/NOTICE.txt (with props) activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/language/ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/language/mvel activemq/camel/trunk/components/camel-mvel/src/test/ activemq/camel/trunk/components/camel-mvel/src/test/java/ activemq/camel/trunk/components/camel-mvel/src/test/java/org/ activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/ activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/ activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/ activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/ activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java (with props) activemq/camel/trunk/components/camel-mvel/src/test/resources/ activemq/camel/trunk/components/camel-mvel/src/test/resources/jndi.properties (with props) activemq/camel/trunk/components/camel-mvel/src/test/resources/log4j.properties (with props) Added: activemq/camel/trunk/components/camel-mvel/pom.xml URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/pom.xml?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/pom.xml (added) +++ activemq/camel/trunk/components/camel-mvel/pom.xml Fri Jan 2 05:58:44 2009 @@ -0,0 +1,95 @@ + + + + + + + 4.0.0 + + + org.apache.camel + camel-parent + 2.0-SNAPSHOT + + + camel-mvel + bundle + Camel :: MVEL + Camel MVEL support + + + org.apache.camel.language.mvel.* + + + + + + org.apache.camel + camel-core + + + + org.mvel + mvel + 2.0beta1 + + + + + org.apache.camel + camel-core + test-jar + test + + + org.apache.camel + camel-test + test + + + commons-logging + commons-logging + test + + + log4j + log4j + test + + + + org.springframework + spring-context + true + test + + + org.springframework + spring-aop + true + test + + + junit + junit + test + + + + Propchange: activemq/camel/trunk/components/camel-mvel/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MVEL.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MVEL.java?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MVEL.java (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MVEL.java Fri Jan 2 05:58:44 2009 @@ -0,0 +1,38 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.language.mvel; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.apache.camel.language.LanguageAnnotation; + +/** + * An annotation for injection of MVEL + * expressions into method parameters, fields or properties + * + */ +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER }) +@LanguageAnnotation(language = "mvel") +public @interface MVEL { + String value(); +} \ No newline at end of file Propchange: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MVEL.java ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java Fri Jan 2 05:58:44 2009 @@ -0,0 +1,57 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.language.mvel; + +import java.io.Serializable; + +import org.apache.camel.Exchange; +import org.apache.camel.impl.ExpressionSupport; +import org.apache.camel.language.ExpressionEvaluationException; +import org.apache.camel.language.IllegalSyntaxException; + +public class MvelExpression extends ExpressionSupport { + + private final String expressionString; + private final Class type; + private Serializable compiled; + + public MvelExpression(MvelLanguage language, String expressionString, Class type) { + this.expressionString = expressionString; + this.type = type; + try { + this.compiled = org.mvel.MVEL.compileExpression(expressionString); + } catch (Exception e) { + throw new IllegalSyntaxException(language, expressionString, e); + } + } + + public static MvelExpression mvel(String expression) { + return new MvelExpression(new MvelLanguage(), expression, Object.class); + } + + public Object evaluate(Exchange exchange) { + try { + return org.mvel.MVEL.executeExpression(compiled, new RootObject(exchange)); + } catch (Exception e) { + throw new ExpressionEvaluationException(this, exchange, e); + } + } + + protected String assertionFailureMessage(Exchange exchange) { + return expressionString; + } +} Propchange: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelExpression.java ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java Fri Jan 2 05:58:44 2009 @@ -0,0 +1,37 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.language.mvel; + +import org.apache.camel.Expression; +import org.apache.camel.Predicate; +import org.apache.camel.spi.Language; + +/** + * An MVEL {@link Language} plugin + * + * @version $Revision: 709613 $ + */ +public class MvelLanguage implements Language { + + public Predicate createPredicate(String expression) { + return new MvelExpression(this, expression, Boolean.class); + } + + public Expression createExpression(String expression) { + return new MvelExpression(this, expression, Object.class); + } +} Propchange: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/MvelLanguage.java ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java Fri Jan 2 05:58:44 2009 @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.language.mvel; + +import java.util.Map; + +import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.Message; + +public class RootObject { + private final Exchange exchange; + + public RootObject(Exchange exchange) { + this.exchange = exchange; + } + + public Exchange getExchange() { + return exchange; + } + + public CamelContext getContext() { + return exchange.getContext(); + } + + public Throwable getException() { + return exchange.getException(); + } + + public String getExchangeId() { + return exchange.getExchangeId(); + } + + public Message getFault() { + return exchange.getFault(); + } + + public Message getRequest() { + return exchange.getIn(); + } + + public Message getResponse() { + return exchange.getOut(); + } + + public Map getProperties() { + return exchange.getProperties(); + } + + public Object getProperty(String name) { + return exchange.getProperty(name); + } + + public T getProperty(String name, Class type) { + return exchange.getProperty(name, type); + } +} Propchange: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/RootObject.java ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/package.html URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/package.html?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/package.html (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/package.html Fri Jan 2 05:58:44 2009 @@ -0,0 +1,26 @@ + + + + + + +A Language Plugin for the +MVEL Language + + + Propchange: activemq/camel/trunk/components/camel-mvel/src/main/java/org/apache/camel/language/mvel/package.html ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/LICENSE.txt URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/LICENSE.txt?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/LICENSE.txt (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/LICENSE.txt Fri Jan 2 05:58:44 2009 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + Propchange: activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/NOTICE.txt URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/NOTICE.txt?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/NOTICE.txt (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/NOTICE.txt Fri Jan 2 05:58:44 2009 @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. Propchange: activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/language/mvel URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/language/mvel?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/language/mvel (added) +++ activemq/camel/trunk/components/camel-mvel/src/main/resources/META-INF/services/org/apache/camel/language/mvel Fri Jan 2 05:58:44 2009 @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +class=org.apache.camel.language.mvel.MvelLanguage \ No newline at end of file Added: activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java (added) +++ activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java Fri Jan 2 05:58:44 2009 @@ -0,0 +1,45 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.language.mvel; + +import org.apache.camel.LanguageTestSupport; + +public class MvelTest extends LanguageTestSupport { + public void testMvelExpressions() throws Exception { + assertExpression("exchange", exchange); + assertExpression("exchange.getIn().body", "world!"); + assertExpression("getRequest().body", "world!"); + assertExpression("request.body", "world!"); + assertExpression("getRequest().headers['foo']", "abc"); + assertExpression("getRequest().headers.foo", "abc"); + assertExpression("request.headers.foo", "abc"); + } + + public void testGetOutFalseKeepsNullOutMessage() throws Exception { + assertExpression("exchange.getOut(false)", null); + assertNull(exchange.getOut(false)); + } + + public void testResponseCreatesOutMessage() throws Exception { + assertExpression("response.body", null); + assertNotNull(exchange.getOut(false)); + } + + protected String getLanguageName() { + return "mvel"; + } +} Propchange: activemq/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/test/resources/jndi.properties URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/test/resources/jndi.properties?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/test/resources/jndi.properties (added) +++ activemq/camel/trunk/components/camel-mvel/src/test/resources/jndi.properties Fri Jan 2 05:58:44 2009 @@ -0,0 +1,18 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +java.naming.factory.initial = org.apache.camel.util.jndi.CamelInitialContextFactory Propchange: activemq/camel/trunk/components/camel-mvel/src/test/resources/jndi.properties ------------------------------------------------------------------------------ svn:eol-style = native Added: activemq/camel/trunk/components/camel-mvel/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mvel/src/test/resources/log4j.properties?rev=730720&view=auto ============================================================================== --- activemq/camel/trunk/components/camel-mvel/src/test/resources/log4j.properties (added) +++ activemq/camel/trunk/components/camel-mvel/src/test/resources/log4j.properties Fri Jan 2 05:58:44 2009 @@ -0,0 +1,36 @@ +## ------------------------------------------------------------------------ +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## ------------------------------------------------------------------------ + +# +# The logging properties used for eclipse testing, We want to see debug output on the console. +# +log4j.rootLogger=INFO, file + +# uncomment the following to enable camel debugging +#log4j.logger.org.apache.camel=DEBUG + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.file.file=target/camel-mvel-test.log \ No newline at end of file Propchange: activemq/camel/trunk/components/camel-mvel/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:eol-style = native