You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/24 22:49:25 UTC
svn commit: r671338 - in
/servicemix/components/engines/servicemix-saxon/trunk: ./
src/main/java/org/apache/servicemix/saxon/ src/main/resources/META-INF/
src/main/resources/META-INF/spring/
Author: gnodet
Date: Tue Jun 24 13:49:25 2008
New Revision: 671338
URL: http://svn.apache.org/viewvc?rev=671338&view=rev
Log:
SM-1421, SM-1387: upgrade to saxon 9.0 and the needed OSGi bits
Added:
servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/
servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/spring/
servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/spring/servicemix-saxon.xml
Modified:
servicemix/components/engines/servicemix-saxon/trunk/pom.xml
servicemix/components/engines/servicemix-saxon/trunk/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java
Modified: servicemix/components/engines/servicemix-saxon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-saxon/trunk/pom.xml?rev=671338&r1=671337&r2=671338&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-saxon/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-saxon/trunk/pom.xml Tue Jun 24 13:49:25 2008
@@ -42,8 +42,11 @@
<previous.releases>3.1.2,3.2,3.2.1</previous.releases>
<servicemix-version>3.2.1</servicemix-version>
<servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
-
- <saxon-version>8.9</saxon-version>
+ <saxon-version>9.0</saxon-version>
+ <servicemix.osgi.import>
+ org.apache.servicemix.common.osgi,
+ *
+ </servicemix.osgi.import>
</properties>
<dependencies>
@@ -68,11 +71,13 @@
<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>junit</groupId>
<artifactId>junit</artifactId>
Modified: servicemix/components/engines/servicemix-saxon/trunk/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-saxon/trunk/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java?rev=671338&r1=671337&r2=671338&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-saxon/trunk/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java (original)
+++ servicemix/components/engines/servicemix-saxon/trunk/src/main/java/org/apache/servicemix/saxon/XQueryEndpoint.java Tue Jun 24 13:49:25 2008
@@ -35,6 +35,7 @@
import net.sf.saxon.query.DynamicQueryContext;
import net.sf.saxon.query.StaticQueryContext;
import net.sf.saxon.query.XQueryExpression;
+import net.sf.saxon.query.QueryModule;
import org.apache.servicemix.jbi.jaxp.BytesSource;
import org.apache.servicemix.jbi.jaxp.StringSource;
@@ -98,10 +99,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();
}
}
Added: servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/spring/servicemix-saxon.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/spring/servicemix-saxon.xml?rev=671338&view=auto
==============================================================================
--- servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/spring/servicemix-saxon.xml (added)
+++ servicemix/components/engines/servicemix-saxon/trunk/src/main/resources/META-INF/spring/servicemix-saxon.xml Tue Jun 24 13:49:25 2008
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+ <bean id="servicemix-saxon" class="org.apache.servicemix.saxon.SaxonComponent">
+ </bean>
+
+ <bean id="endpoint-tracker" class="org.apache.servicemix.common.osgi.EndpointTracker">
+ <property name="component" ref="servicemix-saxon" />
+ </bean>
+
+ <osgi:list id="endpoints"
+ interface="org.apache.servicemix.common.osgi.EndpointWrapper"
+ cardinality="0..N">
+ <osgi:listener ref="endpoint-tracker" bind-method="register" unbind-method="unregister" />
+ </osgi:list>
+
+ <osgi:service ref="servicemix-saxon" interface="javax.jbi.component.Component">
+ <osgi:service-properties>
+ <entry key="NAME" value="servicemix-saxon" />
+ <entry key="TYPE" value="service-engine" />
+ </osgi:service-properties>
+ </osgi:service>
+
+</beans>