Author: gertv
Date: Wed Jul 9 07:19:42 2008
New Revision: 675184
URL: http://svn.apache.org/viewvc?rev=675184&view=rev
Log:
CAMEL-687: Upgrade to Saxon 9.0
Modified:
activemq/camel/trunk/components/camel-saxon/pom.xml
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml
Modified: activemq/camel/trunk/components/camel-saxon/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/pom.xml?rev=675184&r1=675183&r2=675184&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/pom.xml (original)
+++ activemq/camel/trunk/components/camel-saxon/pom.xml Wed Jul 9 07:19:42 2008
@@ -34,10 +34,19 @@
<description>Camel SAXON support</description>
<properties>
- <saxon-version>8.7</saxon-version>
-
<camel.osgi.export.pkg>org.apache.camel.component.xquery.*</camel.osgi.export.pkg>
+ <saxon-version>9.0</saxon-version>
+
<camel.osgi.export.pkg>org.apache.camel.component.xquery.*</camel.osgi.export.pkg>
</properties>
+ <repositories>
+ <!-- ServiceMix repo -->
+ <repository>
+ <id>servicemix</id>
+ <name>Apache ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
Modified:
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=675184&r1=675183&r2=675184&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Wed Jul 9 07:19:42 2008
@@ -306,14 +306,14 @@
this.configuration = configuration;
}
- public StaticQueryContext getStaticQueryContext() throws StaticError {
+ public StaticQueryContext getStaticQueryContext() {
if (staticQueryContext == null) {
staticQueryContext = new StaticQueryContext(getConfiguration());
Set<Map.Entry<String, String>> entries =
namespacePrefixes.entrySet();
for (Map.Entry<String, String> entry : entries) {
String prefix = entry.getKey();
String uri = entry.getValue();
- staticQueryContext.declarePassiveNamespace(prefix, uri, false);
+ staticQueryContext.declareNamespace(prefix, uri);
staticQueryContext.setInheritNamespaces(true);
}
}
@@ -417,7 +417,7 @@
}
/**
- * To avoid keeping around any unnecessary objects after the expresion has
+ * To avoid keeping around any unnecessary objects after the expression has
* been created lets nullify references here
*/
protected void clearBuilderReferences() {
Modified: activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=675184&r1=675183&r2=675184&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml Wed Jul
9 07:19:42 2008
@@ -32,10 +32,6 @@
<name>Camel :: Example :: Spring :: XQuery</name>
<description>An example using Spring XML to transform a message using
XQuery</description>
- <properties>
- <saxon-version>8.7</saxon-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
