You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/11/21 15:03:45 UTC
svn commit: r1412108 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Author: davsclaus
Date: Wed Nov 21 14:03:44 2012
New Revision: 1412108
URL: http://svn.apache.org/viewvc?rev=1412108&view=rev
Log:
Fixed wrong log in xpath builder, and added more debug logging to xquery builder.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
camel/branches/camel-2.10.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1412106
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1412108&r1=1412107&r2=1412108&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Wed Nov 21 14:03:44 2012
@@ -416,7 +416,7 @@ public class XPathBuilder implements Exp
if (objectModelUri != null) {
xpathFactory = XPathFactory.newInstance(objectModelUri);
- LOG.info("Using objectModelUri " + objectModelUri + " when created XPathFactory {}", defaultXPathFactory);
+ LOG.info("Using objectModelUri " + objectModelUri + " when created XPathFactory {}", xpathFactory);
return xpathFactory;
}
@@ -1025,7 +1025,7 @@ public class XPathBuilder implements Exp
if (defaultXPathFactory == null) {
if (objectModelUri != null) {
defaultXPathFactory = XPathFactory.newInstance(objectModelUri);
- LOG.info("Using objectModelUri " + objectModelUri + " when created XPathFactory {}", defaultXPathFactory);
+ LOG.info("Using objectModelUri " + objectModelUri + " when created default XPathFactory {}", defaultXPathFactory);
}
if (defaultXPathFactory == null) {
@@ -1037,7 +1037,7 @@ public class XPathBuilder implements Exp
String uri = ObjectHelper.after(key, ":");
if (uri != null) {
defaultXPathFactory = XPathFactory.newInstance(uri);
- LOG.info("Using system property {} with value {} when created XPathFactory {}", new Object[]{key, uri, defaultXPathFactory});
+ LOG.info("Using system property {} with value {} when created default XPathFactory {}", new Object[]{key, uri, defaultXPathFactory});
}
}
}
Modified: camel/branches/camel-2.10.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1412108&r1=1412107&r2=1412108&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/branches/camel-2.10.x/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Wed Nov 21 14:03:44 2012
@@ -70,8 +70,6 @@ import org.apache.camel.util.ObjectHelpe
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-
/**
* Creates an XQuery builder.
* <p/>
@@ -148,12 +146,14 @@ public abstract class XQueryBuilder impl
}
public List<?> evaluateAsList(Exchange exchange) throws Exception {
+ LOG.debug("evaluateAsList: {} for exchange: {}", expression, exchange);
initialize(exchange);
return getExpression().evaluate(createDynamicContext(exchange));
}
public Object evaluateAsStringSource(Exchange exchange) throws Exception {
+ LOG.debug("evaluateAsString: {} for exchange: {}", expression, exchange);
initialize(exchange);
String text = evaluateAsString(exchange);
@@ -161,6 +161,7 @@ public abstract class XQueryBuilder impl
}
public Object evaluateAsBytesSource(Exchange exchange) throws Exception {
+ LOG.debug("evaluateAsBytesSource: {} for exchange: {}", expression, exchange);
initialize(exchange);
byte[] bytes = evaluateAsBytes(exchange);
@@ -168,6 +169,7 @@ public abstract class XQueryBuilder impl
}
public Node evaluateAsDOM(Exchange exchange) throws Exception {
+ LOG.debug("evaluateAsDOM: {} for exchange: {}", expression, exchange);
initialize(exchange);
DOMResult result = new DOMResult();
@@ -178,6 +180,7 @@ public abstract class XQueryBuilder impl
}
public byte[] evaluateAsBytes(Exchange exchange) throws Exception {
+ LOG.debug("evaluateAsBytes: {} for exchange: {}", expression, exchange);
initialize(exchange);
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@@ -190,6 +193,7 @@ public abstract class XQueryBuilder impl
}
public String evaluateAsString(Exchange exchange) throws Exception {
+ LOG.debug("evaluateAsString: {} for exchange: {}", expression, exchange);
initialize(exchange);
StringWriter buffer = new StringWriter();
@@ -204,6 +208,7 @@ public abstract class XQueryBuilder impl
}
public boolean matches(Exchange exchange) {
+ LOG.debug("Matches: {} for exchange: {}", expression, exchange);
try {
List<?> list = evaluateAsList(exchange);
return matches(exchange, list);
@@ -212,6 +217,7 @@ public abstract class XQueryBuilder impl
}
}
+ @Deprecated
public void assertMatches(String text, Exchange exchange) throws AssertionError {
List<?> list;