You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/03/26 07:52:16 UTC
svn commit: r641175 - in /incubator/tuscany/branches/sca-java-1.2:
demos/xml-bigbank/ modules/databinding-saxon/
modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/
modules/implementation-bpel/ modules/implementation-xquer...
Author: lresende
Date: Tue Mar 25 23:52:13 2008
New Revision: 641175
URL: http://svn.apache.org/viewvc?rev=641175&view=rev
Log:
More updates to bring all modules to use saxon 8.7
Removed:
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/build-saxon.xml
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/implementation-xquery/pom.xml
incubator/tuscany/branches/sca-java-1.2/samples/quote-xquery/pom.xml
incubator/tuscany/branches/sca-java-1.2/samples/store/build.xml
Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml Tue Mar 25 23:52:13 2008
@@ -30,13 +30,6 @@
<name>Apache Tuscany SCA XML BigBank Demo</name>
<description>Apache Tuscany SCA XML BigBank Demo</description>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://svn.apache.org/repos/asf/incubator/tuscany/maven</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/pom.xml?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/pom.xml Tue Mar 25 23:52:13 2008
@@ -28,13 +28,6 @@
<artifactId>tuscany-databinding-saxon</artifactId>
<name>Apache Tuscany SCA Data Binding for Saxon</name>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://svn.apache.org/repos/asf/incubator/tuscany/maven</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -51,19 +44,13 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
- <version>9.0.0.2</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-api</artifactId>
- <version>9.0.0.2</version>
+ <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>
@@ -85,45 +72,4 @@
<scope>test</scope>
</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.2/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.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java Tue Mar 25 23:52:13 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.2/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.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java Tue Mar 25 23:52:13 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.2/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.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java Tue Mar 25 23:52:13 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;
@@ -61,26 +61,26 @@
}
public Value transform(Object source, TransformationContext context) {
- Value result = null;
- if (source instanceof Integer) {
- result = new Int64Value((Integer)source);
- } else if (source instanceof Long) {
- result = new Int64Value((Long)source);
- } else if (source instanceof Short) {
- result = new Int64Value((Short)source);
- } else if (source instanceof Byte) {
- result = new Int64Value((Byte)source);
- } else if (source instanceof Double) {
- result = new DoubleValue((Double)source);
- } else if (source instanceof Float) {
- result = new FloatValue((Float)source);
- } else if (source instanceof BigDecimal) {
- result = new DecimalValue((BigDecimal)source);
- } else if (source instanceof String) {
- result = new StringValue(((String)source));
- } else {
- result = new ObjectValue(source);
- }
+ Value result = null;
+ if (source instanceof Integer) {
+ result = new IntegerValue((Integer)source);
+ } else if (source instanceof Long) {
+ result = new IntegerValue((Long)source);
+ } else if (source instanceof Short) {
+ result = new IntegerValue((Short)source);
+ } else if (source instanceof Byte) {
+ result = new IntegerValue((Byte)source);
+ } else if (source instanceof Double) {
+ result = new DoubleValue((Double)source);
+ } else if (source instanceof Float) {
+ result = new FloatValue((Float)source);
+ } else if (source instanceof BigDecimal) {
+ result = new DecimalValue((BigDecimal)source);
+ } else if (source instanceof String) {
+ result = new StringValue(((String)source));
+ } else {
+ result = new ObjectValue(source);
+ }
return result;
}
Modified: incubator/tuscany/branches/sca-java-1.2/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.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java Tue Mar 25 23:52:13 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.2/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.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java Tue Mar 25 23:52:13 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.2/modules/implementation-bpel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml Tue Mar 25 23:52:13 2008
@@ -315,19 +315,16 @@
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
<version>8.7</version>
- <!--version>9.0.0.2</version-->
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-dom</artifactId>
<version>8.7</version>
- <!--version>9.0.0.2</version-->
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon-xpath</artifactId>
<version>8.7</version>
- <!--version>9.0.0.2</version-->
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: incubator/tuscany/branches/sca-java-1.2/modules/implementation-xquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-xquery/pom.xml?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/implementation-xquery/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-xquery/pom.xml Tue Mar 25 23:52:13 2008
@@ -29,13 +29,6 @@
<artifactId>tuscany-implementation-xquery</artifactId>
<name>Apache Tuscany SCA XQuery Implementation Extension</name>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://svn.apache.org/repos/asf/incubator/tuscany/maven</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: incubator/tuscany/branches/sca-java-1.2/samples/quote-xquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/quote-xquery/pom.xml?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/quote-xquery/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/quote-xquery/pom.xml Tue Mar 25 23:52:13 2008
@@ -28,13 +28,6 @@
<artifactId>sample-quote-xquery</artifactId>
<name>Apache Tuscany SCA XQuery Quote Implementation Sample</name>
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -78,7 +71,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
- <version>9.0.0.2</version>
+ <version>8.7</version>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-1.2/samples/store/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/store/build.xml?rev=641175&r1=641174&r2=641175&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/store/build.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/store/build.xml Tue Mar 25 23:52:13 2008
@@ -74,6 +74,6 @@
</target>
<fileset id="3rdparty.jars" dir="../../lib">
- <include name="saxon-9.0.0.2.jar"/>
+ <include name="saxon-8.7.jar"/>
</fileset>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org