tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r671701 - in /tuscany/java/sca: modules/databinding-saxon/ modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ samples/quote-xquery/
Date Thu, 26 Jun 2008 01:29:06 GMT
Author: lresende
Date: Wed Jun 25 18:29:06 2008
New Revision: 671701

URL: http://svn.apache.org/viewvc?rev=671701&view=rev
Log:
TUSCANY-2427 - merging changes from 1.3 release to trunk

Modified:
    tuscany/java/sca/modules/databinding-saxon/pom.xml
    tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
    tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
    tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
    tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
    tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
    tuscany/java/sca/samples/quote-xquery/pom.xml

Modified: tuscany/java/sca/modules/databinding-saxon/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/pom.xml?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-saxon/pom.xml Wed Jun 25 18:29:06 2008
@@ -53,7 +53,7 @@
             <version>1.4-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/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
(original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
Wed Jun 25 18:29:06 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/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
(original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
Wed Jun 25 18:29:06 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/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
(original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
Wed Jun 25 18:29:06 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/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
(original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
Wed Jun 25 18:29:06 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/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
(original)
+++ tuscany/java/sca/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
Wed Jun 25 18:29:06 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/java/sca/samples/quote-xquery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/quote-xquery/pom.xml?rev=671701&r1=671700&r2=671701&view=diff
==============================================================================
--- tuscany/java/sca/samples/quote-xquery/pom.xml (original)
+++ tuscany/java/sca/samples/quote-xquery/pom.xml Wed Jun 25 18:29:06 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>



Mime
View raw message