You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/07/31 22:33:12 UTC

svn commit: r561495 - in /incubator/tuscany/java: sca/modules/assembly-xml/ sca/modules/binding-ws-axis2/ sca/modules/contribution-impl/ sca/modules/contribution-java/ sca/modules/core-databinding/ sca/modules/core-spi/ sca/modules/core/ sca/modules/da...

Author: rfeng
Date: Tue Jul 31 13:33:10 2007
New Revision: 561495

URL: http://svn.apache.org/viewvc?view=rev&rev=561495
Log:
Move woodstox version from 3.2.0 to 3.2.1 (3.2.1 is ued by Axis2 1.2/1.3 too)

Modified:
    incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
    incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
    incubator/tuscany/java/sca/modules/contribution-impl/pom.xml
    incubator/tuscany/java/sca/modules/contribution-java/pom.xml
    incubator/tuscany/java/sca/modules/core-databinding/pom.xml
    incubator/tuscany/java/sca/modules/core-spi/pom.xml
    incubator/tuscany/java/sca/modules/core/pom.xml
    incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml
    incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
    incubator/tuscany/java/sca/modules/databinding/pom.xml
    incubator/tuscany/java/sca/modules/java2wsdl/pom.xml
    incubator/tuscany/java/sca/modules/wsdl2java/pom.xml
    incubator/tuscany/java/sdo/impl/pom.xml
    incubator/tuscany/java/sdo/sample/pom.xml

Modified: incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/pom.xml Tue Jul 31 13:33:10 2007
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Tue Jul 31 13:33:10 2007
@@ -85,12 +85,6 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
             <version>1.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/java/sca/modules/contribution-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/pom.xml Tue Jul 31 13:33:10 2007
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

Modified: incubator/tuscany/java/sca/modules/contribution-java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/pom.xml Tue Jul 31 13:33:10 2007
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

Modified: incubator/tuscany/java/sca/modules/core-databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/pom.xml Tue Jul 31 13:33:10 2007
@@ -56,7 +56,7 @@
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
             <scope>runtime</scope>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/java/sca/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core-spi/pom.xml Tue Jul 31 13:33:10 2007
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/core/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core/pom.xml Tue Jul 31 13:33:10 2007
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml Tue Jul 31 13:33:10 2007
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java Tue Jul 31 13:33:10 2007
@@ -19,11 +19,15 @@
 
 package org.apache.tuscany.sca.databinding.sdo2om;
 
+import java.io.StringWriter;
+
 import javax.xml.stream.XMLStreamException;
 
 import junit.framework.Assert;
 
+import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
 import org.apache.tuscany.sca.interfacedef.DataType;
 import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
@@ -49,9 +53,25 @@
         OMElement element = new DataObject2OMElement().transform(dataObject, context);
         Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
         Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
-//      TODO: This fails with Axiom 1.2.4        
-//        StringWriter writer = new StringWriter();
-//        element.serialize(writer);
+        // TODO: See https://issues.apache.org/jira/browse/WSCOMMONS-226
+        // element.getBuilder().setCache(false);
+        StringWriter writer = new StringWriter();
+        element.serialize(writer);
+    }
+
+    public final void testTransformWrapper() throws XMLStreamException {
+        OMElement element = new DataObject2OMElement().transform(dataObject, context);
+        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
+        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
+
+        OMNamespace ns = OMAbstractFactory.getOMFactory().createOMNamespace("http://ns1", "ns1");
+        element.setNamespace(ns);
+        element.setLocalName("dummy");
+        // TODO: See https://issues.apache.org/jira/browse/WSCOMMONS-226
+        // element.getBuilder().setCache(true);
+        StringWriter writer = new StringWriter();
+        element.serializeAndConsume(writer);
+        // System.out.println(writer);
     }
 
 }

Modified: incubator/tuscany/java/sca/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding/pom.xml Tue Jul 31 13:33:10 2007
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

Modified: incubator/tuscany/java/sca/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/java2wsdl/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/java2wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/java2wsdl/pom.xml Tue Jul 31 13:33:10 2007
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sca/modules/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/wsdl2java/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sca/modules/wsdl2java/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/wsdl2java/pom.xml Tue Jul 31 13:33:10 2007
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>runtime</scope>
         </dependency>
 

Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Jul 31 13:33:10 2007
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
         </dependency>
 
        <!-- dependencies for test cases -->

Modified: incubator/tuscany/java/sdo/sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/pom.xml?view=diff&rev=561495&r1=561494&r2=561495
==============================================================================
--- incubator/tuscany/java/sdo/sample/pom.xml (original)
+++ incubator/tuscany/java/sdo/sample/pom.xml Tue Jul 31 13:33:10 2007
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
-            <version>3.2.0</version>
+            <version>3.2.1</version>
             <scope>test</scope>
         </dependency>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org