You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/06/24 16:34:57 UTC
svn commit: r671193 - in /tuscany/branches/sca-java-1.3:
modules/databinding-saxon/
modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/
samples/quote-xquery/
Author: slaws
Date: Tue Jun 24 07:34:56 2008
New Revision: 671193
URL: http://svn.apache.org/viewvc?rev=671193&view=rev
Log:
TUSCANY-2427 move back to saxon 8.7
Modified:
tuscany/branches/sca-java-1.3/modules/databinding-saxon/pom.xml
tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
tuscany/branches/sca-java-1.3/samples/quote-xquery/pom.xml
Modified: tuscany/branches/sca-java-1.3/modules/databinding-saxon/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-saxon/pom.xml?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/databinding-saxon/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/databinding-saxon/pom.xml Tue Jun 24 07:34:56 2008
@@ -53,7 +53,7 @@
<version>1.3-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
<version>9.0.0.2</version>
@@ -69,6 +69,18 @@
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-dom</artifactId>
<version>9.0.0.2</version>
+ </dependency-->
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>8.7</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java (original)
+++ tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java Tue Jun 24 07:34:56 2008
@@ -21,6 +21,7 @@
import javax.xml.transform.dom.DOMSource;
import net.sf.saxon.Configuration;
+import net.sf.saxon.event.Builder;
import net.sf.saxon.om.NodeInfo;
import net.sf.saxon.trans.XPathException;
@@ -42,13 +43,16 @@
public class Node2NodeInfoTransformer extends BaseTransformer<Node, NodeInfo> implements
PullTransformer<Node, NodeInfo> {
- public NodeInfo transform(Node source, TransformationContext context) {
- Configuration configuration = new Configuration();
+ public NodeInfo transform(Node source, TransformationContext context) {
+ Configuration configuration = SaxonDataBindingHelper.CURR_EXECUTING_CONFIG;
+ if (configuration == null) {
+ configuration = new Configuration();
+ }
NodeInfo docInfo = null;
try {
source = DOMHelper.promote(source);
- docInfo = configuration.buildDocument(new DOMSource(source));
+ docInfo = Builder.build(new DOMSource(source), null, configuration);
} catch (XPathException e) {
throw new TransformationException(e);
}
Modified: tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java (original)
+++ tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java Tue Jun 24 07:34:56 2008
@@ -46,7 +46,7 @@
Properties props = new Properties();
props.setProperty(OutputKeys.METHOD, "xml");
props.setProperty(OutputKeys.INDENT, "yes");
- QueryResult.serialize(source, destination, props);
+ QueryResult.serialize(source, destination, props, source.getConfiguration());
} catch (Exception e) {
throw new TransformationException(e);
}
Modified: tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java (original)
+++ tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java Tue Jun 24 07:34:56 2008
@@ -23,7 +23,7 @@
import net.sf.saxon.value.DecimalValue;
import net.sf.saxon.value.DoubleValue;
import net.sf.saxon.value.FloatValue;
-import net.sf.saxon.value.Int64Value;
+import net.sf.saxon.value.IntegerValue;
import net.sf.saxon.value.ObjectValue;
import net.sf.saxon.value.StringValue;
import net.sf.saxon.value.Value;
@@ -63,13 +63,13 @@
public Value transform(Object source, TransformationContext context) {
Value result = null;
if (source instanceof Integer) {
- result = new Int64Value((Integer)source);
+ result = new IntegerValue((Integer)source);
} else if (source instanceof Long) {
- result = new Int64Value((Long)source);
+ result = new IntegerValue((Long)source);
} else if (source instanceof Short) {
- result = new Int64Value((Short)source);
+ result = new IntegerValue((Short)source);
} else if (source instanceof Byte) {
- result = new Int64Value((Byte)source);
+ result = new IntegerValue((Byte)source);
} else if (source instanceof Double) {
result = new DoubleValue((Double)source);
} else if (source instanceof Float) {
Modified: tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java (original)
+++ tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java Tue Jun 24 07:34:56 2008
@@ -36,7 +36,7 @@
public Object transform(Value source, TransformationContext context) {
Object object;
try {
- object = Value.convertToJava(Value.asItem(source));
+ object = Value.convert(Value.asItem(source));
} catch (XPathException e) {
throw new TransformationException(e);
}
Modified: tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java (original)
+++ tuscany/branches/sca-java-1.3/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java Tue Jun 24 07:34:56 2008
@@ -36,7 +36,7 @@
public Object transform(Value source, TransformationContext context) {
Object object;
try {
- object = Value.convertToJava(Value.asItem(source));
+ object = Value.convert(Value.asItem(source));
} catch (XPathException e) {
throw new TransformationException(e);
}
Modified: tuscany/branches/sca-java-1.3/samples/quote-xquery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/samples/quote-xquery/pom.xml?rev=671193&r1=671192&r2=671193&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/samples/quote-xquery/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/samples/quote-xquery/pom.xml Tue Jun 24 07:34:56 2008
@@ -75,10 +75,16 @@
<version>1.1-incubating</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
<version>9.0.0.2</version>
+ </dependency-->
+
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
</dependency>
<dependency>