Author: ningjiang
Date: Wed Jan 18 05:06:33 2012
New Revision: 1232746
URL: http://svn.apache.org/viewvc?rev=1232746&view=rev
Log:
CAMEL-4910 upgrade saxon version to 9.3.0.11
Modified:
camel/trunk/components/camel-saxon/pom.xml
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-saxon/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/pom.xml?rev=1232746&r1=1232745&r2=1232746&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/pom.xml (original)
+++ camel/trunk/components/camel-saxon/pom.xml Wed Jan 18 05:06:33 2012
@@ -53,21 +53,9 @@
<dependency>
<groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
+ <artifactId>saxon9he</artifactId>
</dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-dom</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-sql</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-xpath</artifactId>
- </dependency>
-
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
Modified:
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1232746&r1=1232745&r2=1232746&view=diff
==============================================================================
---
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
(original)
+++
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Wed Jan 18 05:06:33 2012
@@ -43,16 +43,15 @@ import javax.xml.transform.stream.Stream
import org.w3c.dom.Node;
import net.sf.saxon.Configuration;
+import net.sf.saxon.lib.ModuleURIResolver;
import net.sf.saxon.om.DocumentInfo;
import net.sf.saxon.om.Item;
import net.sf.saxon.om.SequenceIterator;
import net.sf.saxon.query.DynamicQueryContext;
-import net.sf.saxon.query.ModuleURIResolver;
import net.sf.saxon.query.StaticQueryContext;
import net.sf.saxon.query.XQueryExpression;
import net.sf.saxon.trans.XPathException;
import net.sf.saxon.value.Whitespace;
-
import org.apache.camel.BytesSource;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
@@ -71,6 +70,8 @@ import org.apache.camel.util.ObjectHelpe
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+
/**
* Creates an XQuery builder.
* <p/>
@@ -489,7 +490,7 @@ public abstract class XQueryBuilder impl
throw new NoTypeConversionAvailableException(body,
Source.class);
}
- DocumentInfo doc =
getStaticQueryContext().buildDocument(source);
+ DocumentInfo doc = config.buildDocument(source);
dynamicQueryContext.setContextItem(doc);
} finally {
// can deal if is is null
@@ -611,7 +612,7 @@ public abstract class XQueryBuilder impl
configuration.setHostLanguage(Configuration.XQUERY);
configuration.setStripsWhiteSpace(isStripsAllWhiteSpace() ?
Whitespace.ALL : Whitespace.IGNORABLE);
- staticQueryContext = new StaticQueryContext(getConfiguration());
+ staticQueryContext = getConfiguration().newStaticQueryContext();
if (moduleURIResolver != null) {
staticQueryContext.setModuleURIResolver(moduleURIResolver);
}
Modified:
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java?rev=1232746&r1=1232745&r2=1232746&view=diff
==============================================================================
---
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
(original)
+++
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
Wed Jan 18 05:06:33 2012
@@ -19,7 +19,7 @@ package org.apache.camel.component.xquer
import java.net.URL;
import java.util.Map;
-import net.sf.saxon.query.ModuleURIResolver;
+import net.sf.saxon.lib.ModuleURIResolver;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.ProcessorEndpoint;
Modified:
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java?rev=1232746&r1=1232745&r2=1232746&view=diff
==============================================================================
---
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java
(original)
+++
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryModuleURIResolver.java
Wed Jan 18 05:06:33 2012
@@ -18,7 +18,7 @@ package org.apache.camel.component.xquer
import javax.xml.transform.stream.StreamSource;
-import net.sf.saxon.query.ModuleURIResolver;
+import net.sf.saxon.lib.ModuleURIResolver;
import net.sf.saxon.trans.XPathException;
/**
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1232746&r1=1232745&r2=1232746&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan 18 05:06:33 2012
@@ -136,7 +136,7 @@
<quickfix-version>1.5.1</quickfix-version>
<restlet-version>2.0.10</restlet-version>
<rome-version>1.0</rome-version>
- <saxon-version>9.1.0.8</saxon-version>
+ <saxon-version>9.3.0.11</saxon-version>
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.2</scala-plugin-version>
<servicemix-specs-version>1.9.0</servicemix-specs-version>
@@ -1284,22 +1284,7 @@
<!-- optional Saxon support-->
<dependency>
<groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>${saxon-version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-dom</artifactId>
- <version>${saxon-version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-sql</artifactId>
- <version>${saxon-version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-xpath</artifactId>
+ <artifactId>saxon9he</artifactId>
<version>${saxon-version}</version>
</dependency>
