You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/02/06 08:27:00 UTC

svn commit: r741452 - in /tuscany/java/sca/tools/sdo/java2wsdl: pom.xml src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java

Author: antelder
Date: Fri Feb  6 07:26:59 2009
New Revision: 741452

URL: http://svn.apache.org/viewvc?rev=741452&view=rev
Log:
Simplfy the java2wsdl tool to not have a dependency on the tuscany runtime

Modified:
    tuscany/java/sca/tools/sdo/java2wsdl/pom.xml
    tuscany/java/sca/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java

Modified: tuscany/java/sca/tools/sdo/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/sdo/java2wsdl/pom.xml?rev=741452&r1=741451&r2=741452&view=diff
==============================================================================
--- tuscany/java/sca/tools/sdo/java2wsdl/pom.xml (original)
+++ tuscany/java/sca/tools/sdo/java2wsdl/pom.xml Fri Feb  6 07:26:59 2009
@@ -48,12 +48,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
             <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0-2</version>

Modified: tuscany/java/sca/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java?rev=741452&r1=741451&r2=741452&view=diff
==============================================================================
--- tuscany/java/sca/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java (original)
+++ tuscany/java/sca/tools/sdo/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java Fri Feb  6 07:26:59 2009
@@ -25,13 +25,11 @@
 import java.util.Vector;
 
 import org.apache.axiom.om.OMElement;
+import org.apache.axis2.util.XMLPrettyPrinter;
 import org.apache.ws.java2wsdl.Java2WSDL;
 import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
 import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOptionParser;
 import org.apache.ws.java2wsdl.utils.Java2WSDLOptionsValidator;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -111,23 +109,8 @@
 
         // transform the OMElement
         OMElement om = java2WsdlBuilder.getWsdlDocument();
-        javax.xml.stream.XMLStreamReader stream = om.getXMLStreamReader();
-
-        org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node xform =
-            new org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node();
-
-        Node node = xform.transform(stream, null);
-
-        Document doc = node.getOwnerDocument();
-
-        // pretty-print WSDL document
-        OutputFormat format = new OutputFormat(doc);
-        format.setLineWidth(65);
-        format.setIndenting(true);
-        format.setIndent(2);
-        XMLSerializer serializer = new XMLSerializer(getOutputStream(), format);
-        serializer.serialize(doc);
-
+        XMLPrettyPrinter.prettify(om, getOutputStream());        
+        
         return isComplete;
 
     }