svn commit: r638833 - in /activemq/camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/ camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/model/language/ camel-core/src/main/resources/org/apache/ca...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r638833 - in /activemq/camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/ camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/model/language/ camel-core/src/main/resources/org/apache/ca...

jstrachan-2
Author: jstrachan
Date: Wed Mar 19 06:51:19 2008
New Revision: 638833

URL: http://svn.apache.org/viewvc?rev=638833&view=rev
Log:
applied patch from Gert for JXPath support with thanks : https://issues.apache.org/activemq/browse/CAMEL-241 I also added the new language into the XSD and DSL

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
      - copied, changed from r638333, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
    activemq/camel/trunk/components/camel-jxpath/
    activemq/camel/trunk/components/camel-jxpath/pom.xml   (with props)
    activemq/camel/trunk/components/camel-jxpath/src/
    activemq/camel/trunk/components/camel-jxpath/src/main/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java   (with props)
    activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java   (with props)
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt   (with props)
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt   (with props)
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/
    activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath
    activemq/camel/trunk/components/camel-jxpath/src/test/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/org/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/
    activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java   (with props)
Modified:
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
    activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
    activemq/camel/trunk/components/pom.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Wed Mar 19 06:51:19 2008
@@ -86,6 +86,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jcr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jdbc</artifactId>
     </dependency>
     <dependency>
@@ -94,11 +98,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jing</artifactId>
+      <artifactId>camel-jhc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jdbc</artifactId>
+      <artifactId>camel-jing</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -114,15 +118,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jhc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-juel</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-jcr</artifactId>
+      <artifactId>camel-jxpath</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Wed Mar 19 06:51:19 2008
@@ -99,6 +99,7 @@
         <include>org.apache.camel:camel-josql</include>
         <include>org.apache.camel:camel-jpa</include>
         <include>org.apache.camel:camel-juel</include>
+        <include>org.apache.camel:camel-jxpath</include>
         <include>org.apache.camel:camel-mail</include>
         <include>org.apache.camel:camel-msv</include>
         <include>org.apache.camel:camel-ognl</include>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Wed Mar 19 06:51:19 2008
@@ -105,6 +105,7 @@
         <include>org.apache.camel:camel-josql</include>
         <include>org.apache.camel:camel-jpa</include>
         <include>org.apache.camel:camel-juel</include>
+        <include>org.apache.camel:camel-jxpath</include>
         <include>org.apache.camel:camel-mail</include>
         <include>org.apache.camel:camel-msv</include>
         <include>org.apache.camel:camel-ognl</include>

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Wed Mar 19 06:51:19 2008
@@ -220,6 +220,16 @@
     }
 
     /**
+     * Evaluates a <a href="http://commons.apache.org/jxpath/">JXPath expression</a>
+     *
+     * @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 <a href="http://activemq.apache.org/camel/ognl.html">OGNL expression</a>
      *
      * @param text the expression to be evaluated

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java (from r638333, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java&r1=638333&r2=638833&rev=638833&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java Wed Mar 19 06:51:19 2008
@@ -19,20 +19,20 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * For JavaScript expresions and predicates
+ * For <a href="http://commons.apache.org/jxpath/">JXPath</a> expresions and predicates
  *
  * @version $Revision$
  */
-@XmlRootElement(name = "javaScript")
-public class JavaScriptExpression extends ExpressionType {
-    public JavaScriptExpression() {
+@XmlRootElement(name = "jxpath")
+public class JXPathExpression extends ExpressionType {
+    public JXPathExpression() {
     }
 
-    public JavaScriptExpression(String expression) {
+    public JXPathExpression(String expression) {
         super(expression);
     }
 
     public String getLanguage() {
-        return "js";
+        return "jaxpath";
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/language/jaxb.index Wed Mar 19 06:51:19 2008
@@ -19,6 +19,7 @@
 GroovyExpression
 HeaderExpression
 JavaScriptExpression
+JXPathExpression
 LanguageExpression
 MethodCallExpression
 OgnlExpression

Added: activemq/camel/trunk/components/camel-jxpath/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/pom.xml?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/pom.xml (added)
+++ activemq/camel/trunk/components/camel-jxpath/pom.xml Wed Mar 19 06:51:19 2008
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-parent</artifactId>
+    <version>1.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-jxpath</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: JXPath</name>
+  <description>Camel JXPath support</description>
+
+  <properties>
+ <camel.osgi.export.pkg>org.apache.camel.language.jxpath.*</camel.osgi.export.pkg>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
+      <version>1.2</version>
+    </dependency>
+
+    <!-- testing -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: activemq/camel/trunk/components/camel-jxpath/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java (added)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java Wed Mar 19 06:51:19 2008
@@ -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;
+
+/**
+ * <a href="http://commons.apache.org/jxpath/">JXPath</a> {@link Expression} support
+ */
+public class JXPathExpression extends ExpressionSupport<Exchange> {
+
+ 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;
+ }
+}

Propchange: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java (added)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java Wed Mar 19 06:51:19 2008
@@ -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;
+
+/**
+ * <a href="http://commons.apache.org/jxpath/">JXPath</a> {@link Language} provider
+ */
+public class JXPathLanguage implements Language {
+
+ public Expression<Exchange> createExpression(String expression) {
+ return new JXPathExpression(expression, Object.class);
+ }
+
+ public Predicate<Exchange> createPredicate(String predicate) {
+ return new JXPathExpression(predicate, Boolean.class);
+ }
+
+}

Propchange: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt (added)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/LICENSE.txt Wed Mar 19 06:51:19 2008
@@ -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-jxpath/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt (added)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/NOTICE.txt Wed Mar 19 06:51:19 2008
@@ -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-jxpath/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath (added)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/resources/META-INF/services/org/apache/camel/language/jxpath Wed Mar 19 06:51:19 2008
@@ -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

Added: activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java?rev=638833&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java (added)
+++ activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java Wed Mar 19 06:51:19 2008
@@ -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", "<hello id='m123'>world!</hello>");
+ assertExpression("in/body", "<hello id='m123'>world!</hello>");
+ 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";
+ }
+
+}

Propchange: activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Wed Mar 19 06:51:19 2008
@@ -55,6 +55,7 @@
     <module>camel-jcr</module>
     <module>camel-jpa</module>
     <module>camel-juel</module>
+    <module>camel-jxpath</module>
     <module>camel-mail</module>
     <module>camel-mina</module>
     <module>camel-msv</module>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=638833&r1=638832&r2=638833&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Wed Mar 19 06:51:19 2008
@@ -321,6 +321,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-jxpath</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-mail</artifactId>
         <version>${project.version}</version>
       </dependency>