You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/10/12 21:40:59 UTC
svn commit: r584245 - in /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel: InvalidPayloadRuntimeException.java builder/xml/XPathBuilder.java model/language/XQueryExpression.java

Author: jstrachan
Date: Fri Oct 12 12:40:41 2007
New Revision: 584245

URL: http://svn.apache.org/viewvc?rev=584245&view=rev
Log:
added a new useful exception along with making XQuery expressions namespace aware

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
      - copied, changed from r583763, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java (from r583763, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java&r1=583763&r2=584245&rev=584245&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java Fri Oct 12 12:40:41 2007
@@ -19,10 +19,10 @@
 /**
  * @version $Revision: 1.1 $
  */
-public class InvalidPayloadException extends CamelExchangeException {
+public class InvalidPayloadRuntimeException extends RuntimeExchangeException {
     private final Class<?> type;
 
-    public InvalidPayloadException(Exchange exchange, Class<?> type) {
+    public InvalidPayloadRuntimeException(Exchange exchange, Class<?> type) {
         super("No in body available of type: " + type.getName()
               + NoSuchPropertyException.valueDescription(exchange.getIn().getBody()), exchange);
         this.type = type;
@@ -34,4 +34,4 @@
     public Class<?> getType() {
         return type;
     }
-}
+}
\ No newline at end of file

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=584245&r1=584244&r2=584245&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Fri Oct 12 12:40:41 2007
@@ -235,8 +235,7 @@
     public DefaultNamespaceContext getNamespaceContext() {
         if (namespaceContext == null) {
             try {
-                DefaultNamespaceContext defaultNamespaceContext = new DefaultNamespaceContext(
-                                                                                              getXPathFactory());
+                DefaultNamespaceContext defaultNamespaceContext = new DefaultNamespaceContext(getXPathFactory());
                 populateDefaultNamespaces(defaultNamespaceContext);
                 namespaceContext = defaultNamespaceContext;
             } catch (XPathFactoryConfigurationException e) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java?rev=584245&r1=584244&r2=584245&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java Fri Oct 12 12:40:41 2007
@@ -24,7 +24,7 @@
  * @version $Revision: 1.1 $
  */
 @XmlRootElement(name = "xquery")
-public class XQueryExpression extends ExpressionType {
+public class XQueryExpression extends ElementAwareExpression {
     public XQueryExpression() {
     }