You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2010/02/22 18:24:36 UTC
svn commit: r912670 - in /servicemix/smx3/branches/servicemix-3.2:
deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java
pom.xml
Author: ccustine
Date: Mon Feb 22 17:24:36 2010
New Revision: 912670
URL: http://svn.apache.org/viewvc?rev=912670&view=rev
Log:
SMXCOMP-282 Upgrade to saxon 9.0
- Backported to SMX 3.2 to solve concurrency issues with Saxon 8
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java
servicemix/smx3/branches/servicemix-3.2/pom.xml
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java?rev=912670&r1=912669&r2=912670&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-saxon/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java Mon Feb 22 17:24:36 2010
@@ -98,10 +98,8 @@
staticEnv = new StaticQueryContext(config);
if (getQuery() != null) {
exp = staticEnv.compileQuery(getQuery());
- staticEnv = exp.getStaticContext();
} else if (getResource() != null) {
exp = staticEnv.compileQuery(getResource().getInputStream(), null);
- staticEnv = exp.getStaticContext();
}
}
Modified: servicemix/smx3/branches/servicemix-3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=912670&r1=912669&r2=912670&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Mon Feb 22 17:24:36 2010
@@ -224,7 +224,7 @@
<jaxb.version>2.0</jaxb.version>
<jaxb.impl.version>2.0.1</jaxb.impl.version>
<derby-version>10.2.2.0</derby-version>
- <saxon-version>8.9</saxon-version>
+ <saxon-version>9.1.0.8</saxon-version>
<bcprov-version>140</bcprov-version>
<junit-version>3.8.1</junit-version>
<releases-repo-id>apache</releases-repo-id>
@@ -287,7 +287,7 @@
<module>servicemix-itests</module>
<module>samples</module>
<module>web</module>
- <module>platforms</module>
+ <!--<module>platforms</module>-->
<module>distributions</module>
</modules>
</profile>