Author: slaws
Date: Sun Jan 6 12:57:25 2008
New Revision: 609398
URL: http://svn.apache.org/viewvc?rev=609398&view=rev
Log:
Revert to saxon 8.7 by going back to databinding-saxon from release 1.0.1
Removed:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/build-saxon.xml
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/pom.xml
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
incubator/tuscany/branches/sca-java-1.1/samples/quote-xquery/pom.xml
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/pom.xml?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/pom.xml
Sun Jan 6 12:57:25 2008
@@ -50,31 +50,31 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
- <version>9.0.0.2</version>
+ <version>8.7</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-api</artifactId>
- <version>9.0.0.2</version>
- </dependency>
+ <version>8.7</version>
+ </dependency-->
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-dom</artifactId>
- <version>9.0.0.2</version>
+ <version>8.7</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-lib</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
@@ -85,44 +85,5 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
-
- <executions>
- <execution>
- <id>install-saxon</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-saxon.xml"
target="install-saxon">
- <property name="localRepository"
value="${settings.localRepository}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>clean-saxon-files</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-saxon.xml"
target="clean-saxon-files">
- <property name="localRepository"
value="${settings.localRepository}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
Sun Jan 6 12:57:25 2008
@@ -48,7 +48,7 @@
public DataObject2NodeInfoTransformer(Node2NodeInfoTransformer
node2NodeInfoTransformer) {
this.node2NodeInfoTransformer = node2NodeInfoTransformer;
}
-
+
public DataObject2NodeInfoTransformer() {
this.node2NodeInfoTransformer = new Node2NodeInfoTransformer();
}
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
Sun Jan 6 12:57:25 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;
@@ -41,12 +42,14 @@
PullTransformer<Node, NodeInfo> {
public NodeInfo transform(Node source, TransformationContext context) {
- Configuration configuration = new Configuration();
-
+ 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:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
Sun Jan 6 12:57:25 2008
@@ -45,7 +45,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:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
Sun Jan 6 12:57:25 2008
@@ -18,14 +18,12 @@
*/
package org.apache.tuscany.sca.databinding.saxon;
-import net.sf.saxon.value.FloatValue;
import net.sf.saxon.value.ObjectValue;
import net.sf.saxon.value.Value;
import org.apache.tuscany.sca.databinding.PullTransformer;
import org.apache.tuscany.sca.databinding.TransformationContext;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
/**
* Transforms generic java objects to Value objects needed by Saxon parser
@@ -44,20 +42,11 @@
}
@Override
- public String getSourceDataBinding() {
- return JavaBeansDataBinding.NAME;
- }
-
- @Override
public int getWeight() {
return 10000;
}
public Value transform(Object source, TransformationContext context) {
- // WORKAROUND for ClassCastException in ObjectValue.toJavaObject(float)
- if (source instanceof Float) {
- return new FloatValue(((Float)source).floatValue());
- }
return new ObjectValue(source);
}
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
Sun Jan 6 12:57:25 2008
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
/**
* Represents data binding for parameters of type NodeInfo
@@ -43,7 +44,7 @@
@Override
public boolean introspect(DataType type, Annotation[] annotations) {
if (super.introspect(type, annotations)) {
- // type.setLogical(XMLType.UNKNOWN);
+ type.setLogical(XMLType.UNKNOWN);
return true;
} else {
return false;
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
Sun Jan 6 12:57:25 2008
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
/**
* Represents data binding for parameters of type Value
@@ -42,7 +43,7 @@
@Override
public boolean introspect(DataType type, Annotation[] annotations) {
if (super.introspect(type, annotations)) {
- // type.setLogical(XMLType.UNKNOWN);
+ type.setLogical(XMLType.UNKNOWN);
return true;
} else {
return false;
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
Sun Jan 6 12:57:25 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:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
Sun Jan 6 12:57:25 2008
@@ -25,7 +25,6 @@
import org.apache.tuscany.sca.databinding.TransformationContext;
import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
/**
* Transforms Value objects to generic java objects
@@ -36,7 +35,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);
}
@@ -51,11 +50,6 @@
@Override
protected Class getTargetType() {
return Object.class;
- }
-
- @Override
- public String getTargetDataBinding() {
- return JavaBeansDataBinding.NAME;
}
@Override
Modified:
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
(original)
+++
incubator/tuscany/branches/sca-java-1.1/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
Sun Jan 6 12:57:25 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: incubator/tuscany/branches/sca-java-1.1/samples/quote-xquery/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/quote-xquery/pom.xml?rev=609398&r1=609397&r2=609398&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/samples/quote-xquery/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/quote-xquery/pom.xml Sun
Jan 6 12:57:25 2008
@@ -66,19 +66,19 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-lib</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
- <version>9.0.0.2</version>
+ <version>8.7</version>
</dependency>
<dependency>
@@ -107,42 +107,6 @@
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
-
- <executions>
- <execution>
- <id>install-saxon</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-saxon.xml"
target="install-saxon">
- <property name="localRepository"
value="${settings.localRepository}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>clean-saxon-files</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-saxon.xml"
target="clean-saxon-files">
- <property name="localRepository"
value="${settings.localRepository}" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.0</version>
@@ -164,7 +128,7 @@
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
<executions>
<!--
<execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
