svn commit: r654734 - in /servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression: JAXPBooleanXPathExpression.java JAXPNodeSetXPathExpression.java JAXPStringXPathExpression.java

[gnodet]

Author: gnodet
Date: Fri May  9 02:22:07 2008
New Revision: 654734

URL: http://svn.apache.org/viewvc?rev=654734&view=rev
Log:
SM-1307: fix jaxp expressions

Modified:
    
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPBooleanXPathExpression.java
    
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPNodeSetXPathExpression.java
    
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPStringXPathExpression.java

Modified: 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPBooleanXPathExpression.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPBooleanXPathExpression.java?rev=654734&r1=654733&r2=654734&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPBooleanXPathExpression.java
 (original)
+++ 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPBooleanXPathExpression.java
 Fri May  9 02:22:07 2008
@@ -16,8 +16,10 @@
  */
 package org.apache.servicemix.expression;
 
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
 
 /**
  * Evaluates an XPath expression and coerces the result into a String.
@@ -35,7 +37,7 @@
         super(xpath);
     }
 
-    public Object evaluateXPath(Object object) throws XPathExpressionException 
{
-        return getXPathExpression().evaluate(object, XPathConstants.BOOLEAN);
+    public Object evaluate(MessageExchange exchange, NormalizedMessage 
message) throws MessagingException {
+        return evaluate(exchange, message, XPathConstants.BOOLEAN);
     }
 }

Modified: 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPNodeSetXPathExpression.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPNodeSetXPathExpression.java?rev=654734&r1=654733&r2=654734&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPNodeSetXPathExpression.java
 (original)
+++ 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPNodeSetXPathExpression.java
 Fri May  9 02:22:07 2008
@@ -16,8 +16,10 @@
  */
 package org.apache.servicemix.expression;
 
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
 
 /**
  * Evaluates an XPath expression and coerces the result into a String.
@@ -33,7 +35,7 @@
         super(xpath);
     }
 
-    public Object evaluateXPath(Object object) throws XPathExpressionException 
{
-        return getXPathExpression().evaluate(object, XPathConstants.NODESET);
+    public Object evaluate(MessageExchange exchange, NormalizedMessage 
message) throws MessagingException {
+        return evaluate(exchange, message, XPathConstants.NODESET);
     }
 }

Modified: 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPStringXPathExpression.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPStringXPathExpression.java?rev=654734&r1=654733&r2=654734&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPStringXPathExpression.java
 (original)
+++ 
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPStringXPathExpression.java
 Fri May  9 02:22:07 2008
@@ -16,8 +16,10 @@
  */
 package org.apache.servicemix.expression;
 
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
 
 /**
  * Evaluates an XPath expression and coerces the result into a String.
@@ -35,7 +37,7 @@
         super(xpath);
     }
 
-    protected Object evaluateXPath(Object object) throws 
XPathExpressionException {
-        return getXPathExpression().evaluate(object, XPathConstants.STRING);
+    public Object evaluate(MessageExchange exchange, NormalizedMessage 
message) throws MessagingException {
+        return evaluate(exchange, message, XPathConstants.STRING);
     }
 }