axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl Emitter.java
Date Wed, 21 Nov 2001 15:50:47 GMT
dims        01/11/21 07:50:47

  Modified:    java/lib wsdl4j.jar
               java/src/org/apache/axis/client Service.java
               java/src/org/apache/axis/utils WSDLUtils.java
               java/src/org/apache/axis/wsdl Emitter.java
  Log:
  Updating to latest WSDL4J from IBM's cvs.
  
  Revision  Changes    Path
  1.2       +184 -180  xml-axis/java/lib/wsdl4j.jar
  
  	<<Binary file>>
  
  
  1.24      +4 -16     xml-axis/java/src/org/apache/axis/client/Service.java
  
  Index: Service.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Service.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Service.java	2001/11/19 21:18:34	1.23
  +++ Service.java	2001/11/21 15:50:46	1.24
  @@ -56,35 +56,24 @@
   package org.apache.axis.client ;
   
   import com.ibm.wsdl.extensions.soap.SOAPAddress;
  -import com.ibm.wsdl.extensions.soap.SOAPBody;
  -import com.ibm.wsdl.extensions.soap.SOAPOperation;
  -import com.ibm.wsdl.xml.WSDLReader;
  -import org.apache.axis.Constants;
   import org.apache.axis.AxisEngine;
  -import org.apache.axis.encoding.XMLType;
  +import org.apache.axis.Constants;
   import org.apache.axis.configuration.FileProvider;
  -import org.apache.axis.transport.http.HTTPConstants;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.XMLUtils;
   import org.w3c.dom.Document;
   
   import javax.wsdl.Binding;
  -import javax.wsdl.BindingInput;
  -import javax.wsdl.BindingOperation;
   import javax.wsdl.Definition;
  -import javax.wsdl.Input;
  -import javax.wsdl.Message;
  -import javax.wsdl.Operation;
  -import javax.wsdl.Output;
  -import javax.wsdl.Part;
   import javax.wsdl.Port;
   import javax.wsdl.PortType;
  +import javax.wsdl.factory.WSDLFactory;
   import javax.xml.rpc.JAXRPCException;
   import javax.xml.rpc.encoding.TypeMappingRegistry;
   import javax.xml.rpc.namespace.QName;
   import java.io.FileInputStream;
  -import java.io.InputStream;
   import java.io.FileNotFoundException;
  +import java.io.InputStream;
   import java.net.URL;
   import java.util.HashSet;
   import java.util.Iterator;
  @@ -198,8 +187,7 @@
               throws JAXRPCException {
           try {
               // Start by reading in the WSDL using WSDL4J
  -            WSDLReader           reader = new WSDLReader();
  -            Definition           def    = reader.readWSDL( null, doc );
  +            Definition           def    = WSDLFactory.newInstance().newWSDLReader().readWSDL(
null, doc );
   
               this.wsdlLocation   = null ;
               this.wsdlDefinition = def ;
  
  
  
  1.22      +3 -5      xml-axis/java/src/org/apache/axis/utils/WSDLUtils.java
  
  Index: WSDLUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/WSDLUtils.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WSDLUtils.java	2001/11/15 19:56:52	1.21
  +++ WSDLUtils.java	2001/11/21 15:50:46	1.22
  @@ -78,7 +78,7 @@
   import javax.wsdl.Port;
   import javax.wsdl.PortType;
   import javax.wsdl.Service;
  -import javax.wsdl.factory.DefinitionFactory;
  +import javax.wsdl.factory.WSDLFactory;
   import javax.xml.rpc.namespace.QName;
   import java.lang.reflect.Method;
   import java.util.ArrayList;
  @@ -105,9 +105,7 @@
           if ((serviceName == null) || ("JWSProcessor".equals(serviceName)))
               serviceName = "";
   
  -        DefinitionFactory factory = DefinitionFactory.
  -                newInstance("com.ibm.wsdl.factory.DefinitionFactoryImpl");
  -        Definition def = factory.newDefinition();
  +        Definition def = WSDLFactory.newInstance().newDefinition();
           Binding binding = def.createBinding();
           Service service = def.createService();
   
  @@ -208,7 +206,7 @@
   
           service.addPort(port);
   
  -        return com.ibm.wsdl.xml.WSDLWriter.getDocument(def);
  +        return WSDLFactory.newInstance().newWSDLWriter().getDocument(def);
       }
   
       public static Message getRequestMessage(Definition def,
  
  
  
  1.104     +3 -4      xml-axis/java/src/org/apache/axis/wsdl/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Emitter.java,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- Emitter.java	2001/11/16 19:08:25	1.103
  +++ Emitter.java	2001/11/21 15:50:46	1.104
  @@ -54,11 +54,8 @@
    */
   package org.apache.axis.wsdl;
   
  -import com.ibm.wsdl.xml.WSDLReader;
  -
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.XMLUtils;
  -
   import org.w3c.dom.Document;
   
   import javax.wsdl.Binding;
  @@ -73,6 +70,8 @@
   import javax.wsdl.PortType;
   import javax.wsdl.QName;
   import javax.wsdl.Service;
  +import javax.wsdl.factory.WSDLFactory;
  +import javax.wsdl.xml.WSDLReader;
   import java.io.IOException;
   import java.util.ArrayList;
   import java.util.Collection;
  @@ -168,7 +167,7 @@
        */
       public void emit(Document doc) throws IOException {
           try {
  -            WSDLReader reader = new WSDLReader();
  +            WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
               reader.setVerbose(bVerbose);
               def = reader.readWSDL(null, doc);
               namespaces = new Namespaces(outputDir);
  
  
  

Mime
View raw message