diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index a6aebc52c592f..788b7375ac20e 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -84,6 +84,10 @@ org.apache.camel camel-jaxb + + org.apache.camel + camel-jcr + org.apache.camel camel-jdbc @@ -94,11 +98,11 @@ org.apache.camel - camel-jing + camel-jhc org.apache.camel - camel-jdbc + camel-jing org.apache.camel @@ -112,17 +116,13 @@ org.apache.camel camel-jpa - - org.apache.camel - camel-jhc - org.apache.camel camel-juel org.apache.camel - camel-jcr + camel-jxpath org.apache.camel diff --git a/apache-camel/src/main/descriptors/unix-bin.xml b/apache-camel/src/main/descriptors/unix-bin.xml index a07abdb60be40..126e471e88dfe 100644 --- a/apache-camel/src/main/descriptors/unix-bin.xml +++ b/apache-camel/src/main/descriptors/unix-bin.xml @@ -99,6 +99,7 @@ org.apache.camel:camel-josql org.apache.camel:camel-jpa org.apache.camel:camel-juel + org.apache.camel:camel-jxpath org.apache.camel:camel-mail org.apache.camel:camel-msv org.apache.camel:camel-ognl diff --git a/apache-camel/src/main/descriptors/windows-bin.xml b/apache-camel/src/main/descriptors/windows-bin.xml index 5fcce19357bc9..61bf784f4009d 100644 --- a/apache-camel/src/main/descriptors/windows-bin.xml +++ b/apache-camel/src/main/descriptors/windows-bin.xml @@ -105,6 +105,7 @@ org.apache.camel:camel-josql org.apache.camel:camel-jpa org.apache.camel:camel-juel + org.apache.camel:camel-jxpath org.apache.camel:camel-mail org.apache.camel:camel-msv org.apache.camel:camel-ognl diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java index 0bf77a65838e7..cb2475f0c29a3 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java +++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java @@ -219,6 +219,16 @@ public T javaScript(String text) { return language("js", text); } + /** + * Evaluates a JXPath expression + * + * @param text the expression to be evaluated + * @return the builder to continue processing the DSL + */ + public T jxpath(String text) { + return language("jxpath", text); + } + /** * Evaluates an OGNL expression * diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java new file mode 100644 index 0000000000000..4796e8613acd3 --- /dev/null +++ b/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java @@ -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.model.language; + +import javax.xml.bind.annotation.XmlRootElement; + +/** + * For JXPath expresions and predicates + * + * @version $Revision$ + */ +@XmlRootElement(name = "jxpath") +public class JXPathExpression extends ExpressionType { + public JXPathExpression() { + } + + public JXPathExpression(String expression) { + super(expression); + } + + public String getLanguage() { + return "jaxpath"; + } +} \ No newline at end of file diff --git a/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index index 900262d6db7f6..5c391b15955dd 100644 --- a/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index +++ b/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index @@ -19,6 +19,7 @@ ExpressionType GroovyExpression HeaderExpression JavaScriptExpression +JXPathExpression LanguageExpression MethodCallExpression OgnlExpression diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml new file mode 100644 index 0000000000000..f0a5bdf8caecc --- /dev/null +++ b/components/camel-jxpath/pom.xml @@ -0,0 +1,76 @@ + + + + + + + 4.0.0 + + + org.apache.camel + camel-parent + 1.3-SNAPSHOT + + + camel-jxpath + bundle + Camel :: JXPath + Camel JXPath support + + + org.apache.camel.language.jxpath.* + + + + + + org.apache.camel + camel-core + + + commons-jxpath + commons-jxpath + 1.2 + + + + + org.apache.camel + camel-core + test-jar + test + + + commons-logging + commons-logging + test + + + log4j + log4j + test + + + junit + junit + test + + + + diff --git a/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java b/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java new file mode 100644 index 0000000000000..453e448499fa7 --- /dev/null +++ b/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java @@ -0,0 +1,82 @@ +/** + * 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.jxpath; + +import org.apache.camel.Exchange; +import org.apache.camel.Expression; +import org.apache.camel.impl.ExpressionSupport; +import org.apache.camel.language.ExpressionEvaluationException; +import org.apache.commons.jxpath.CompiledExpression; +import org.apache.commons.jxpath.JXPathContext; +import org.apache.commons.jxpath.JXPathException; + +/** + * JXPath {@link Expression} support + */ +public class JXPathExpression extends ExpressionSupport { + + private String expression; + private CompiledExpression compiledExpression; + private final Class type; + + /** + * Creates a new JXPathExpression instance + * + * @param expression the JXPath expression to be evaluated + * @param type the expected result type + */ + public JXPathExpression(String expression, Class type) { + super(); + this.expression = expression; + this.type = type; + } + + + public Object evaluate(Exchange exchange) { + try { + Object result = getJXPathExpression().getValue(JXPathContext.newContext(exchange)); + assertResultType(exchange, result); + return result; + } catch (JXPathException e) { + throw new ExpressionEvaluationException(this, exchange, e); + } + } + + /* + * Check if the result is of the specified type + */ + private void assertResultType(Exchange exchange, Object result) { + if (!type.isAssignableFrom(result.getClass())) { + throw new JXPathException("JXPath result type is " + result.getClass() + " instead of required type " + type); + } + } + + @Override + protected String assertionFailureMessage(Exchange exchange) { + return expression.toString(); + } + + /* + * Get a compiled expression instance for better performance + */ + private synchronized CompiledExpression getJXPathExpression() { + if (compiledExpression == null) { + compiledExpression = JXPathContext.compile(expression); + } + return compiledExpression; + } +} diff --git a/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java b/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java new file mode 100644 index 0000000000000..cc6411d066966 --- /dev/null +++ b/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java @@ -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.jxpath; + +import org.apache.camel.Exchange; +import org.apache.camel.Expression; +import org.apache.camel.Predicate; +import org.apache.camel.spi.Language; + +/** + * JXPath {@link Language} provider + */ +public class JXPathLanguage implements Language { + + public Expression createExpression(String expression) { + return new JXPathExpression(expression, Object.class); + } + + public Predicate createPredicate(String predicate) { + return new JXPathExpression(predicate, Boolean.class); + } + +} diff --git a/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt b/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000000000..6b0b1270ff0ca --- /dev/null +++ b/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt @@ -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. + diff --git a/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt b/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000000000..2e215bf2e6b1f --- /dev/null +++ b/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt @@ -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. diff --git a/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath b/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath new file mode 100644 index 0000000000000..924f80bd3a7e9 --- /dev/null +++ b/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath @@ -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.jxpath.JXPathLanguage diff --git a/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java b/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java new file mode 100644 index 0000000000000..0a66e986bd200 --- /dev/null +++ b/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java @@ -0,0 +1,77 @@ +/** + * 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.jxpath; + +import org.apache.camel.LanguageTestSupport; +import org.apache.camel.language.ExpressionEvaluationException; + +/** + * Test for {@link JXPathExpression} and {@link JXPathLanguage} + */ +public class JXPathTest extends LanguageTestSupport { + + /** + * Test JXPath expressions + */ + public void testJXPathExpressions() throws Exception { + assertExpression(".", exchange); + assertExpression("./in/body", "world!"); + assertExpression("in/body", "world!"); + assertExpression("in/headers", exchange.getIn().getHeaders()); + assertExpression("in/headers/@foo", "abc"); + } + + /** + * Test JXPath predicates + */ + public void testJXPathPredicates() throws Exception { + assertPredicate("in/headers/@foo = 'abc'"); + } + + /** + * Test exceptions being thrown appropriately + */ + public void testExceptions() throws Exception { + assertInvalidExpression(".@."); + assertInvalidExpression("ins/body"); + assertInvalidPredicate("in/body"); + } + + private void assertInvalidExpression(String expression) { + try { + assertExpression(expression, null); + fail("Expected an ExpressionEvaluationException"); + } catch (ExpressionEvaluationException e) { + //nothing to do -- test success + } + } + + private void assertInvalidPredicate(String predicate) { + try { + assertPredicate(predicate); + fail("Expected an ExpressionEvaluationException"); + } catch (ExpressionEvaluationException e) { + //nothing to do -- test success + } + } + + @Override + protected String getLanguageName() { + return "jxpath"; + } + +} diff --git a/components/pom.xml b/components/pom.xml index 3af009f3ce6a8..43fe91a8b9542 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -55,6 +55,7 @@ camel-jcr camel-jpa camel-juel + camel-jxpath camel-mail camel-mina camel-msv diff --git a/pom.xml b/pom.xml index 7693fa9b331cd..54e14a2035c18 100755 --- a/pom.xml +++ b/pom.xml @@ -319,6 +319,11 @@ camel-juel ${project.version} + + org.apache.camel + camel-jxpath + ${project.version} + org.apache.camel camel-mail