Return-Path: Delivered-To: apmail-xml-axis-dev-archive@xml.apache.org Received: (qmail 8619 invoked by uid 500); 4 Oct 2001 15:45:27 -0000 Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: axis-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-dev@xml.apache.org Received: (qmail 8595 invoked by uid 500); 4 Oct 2001 15:45:27 -0000 Delivered-To: apmail-xml-axis-cvs@apache.org Date: 4 Oct 2001 15:42:43 -0000 Message-ID: <20011004154243.4774.qmail@icarus.apache.org> From: rubys@apache.org To: xml-axis-cvs@apache.org Subject: cvs commit: xml-axis/java/src/org/apache/axis/wsdl Emitter.java Type.java TypeFactory.java Utils.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N rubys 01/10/04 08:42:43 Modified: java/src/org/apache/axis/message SOAPHeader.java java/src/org/apache/axis/transport/http SimpleAxisServer.java java/src/org/apache/axis/wsdl Emitter.java Type.java TypeFactory.java Utils.java Log: More import fixes. Note: I omitted tcpmon and did not resolve any of the rejects below. patching file `java/src/org/apache/axis/client/Service.java' Hunk #1 FAILED at 62. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/client/Service.java.rej patching file `java/src/org/apache/axis/deployment/wsdd/WSDDElement.java' Hunk #1 FAILED at 54. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/deployment/wsdd/WSDDElement.java.rej patching file `java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java' Hunk #1 FAILED at 54. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/deployment/wsdd/WSDDGlobalConfiguration.java.rej patching file `java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java' Hunk #1 FAILED at 54. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java.rej patching file `java/src/org/apache/axis/deployment/wsdd/WSDDOperation.java' Hunk #1 FAILED at 54. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/deployment/wsdd/WSDDOperation.java.rej patching file `java/src/org/apache/axis/deployment/wsdd/WSDDProvider.java' Hunk #1 FAILED at 54. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/deployment/wsdd/WSDDProvider.java.rej patching file `java/src/org/apache/axis/deployment/wsdd/WSDDTransport.java' Hunk #1 FAILED at 54. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/deployment/wsdd/WSDDTransport.java.rej patching file `java/src/org/apache/axis/message/SOAPHeader.java' patching file `java/src/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java' Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to java/src/org/apache/axis/transport/http/NonBlockingBufferedInputStream.java.rej patching file `java/src/org/apache/axis/transport/http/SimpleAxisServer.java' patching file `java/src/org/apache/axis/utils/tcpmon.java' patching file `java/src/org/apache/axis/wsdl/Emitter.java' patching file `java/src/org/apache/axis/wsdl/Type.java' patching file `java/src/org/apache/axis/wsdl/TypeFactory.java' patching file `java/src/org/apache/axis/wsdl/Utils.java' Submitted by: Davanum Srinivas Revision Changes Path 1.24 +1 -1 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java Index: SOAPHeader.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- SOAPHeader.java 2001/10/03 21:11:37 1.23 +++ SOAPHeader.java 2001/10/04 15:42:43 1.24 @@ -56,9 +56,9 @@ */ import org.apache.axis.Constants; -import org.apache.axis.utils.QName; import org.apache.axis.encoding.DeserializationContext; import org.apache.axis.encoding.SerializationContext; +import org.apache.axis.utils.QName; import org.w3c.dom.Element; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; 1.29 +2 -2 xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java Index: SimpleAxisServer.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- SimpleAxisServer.java 2001/10/03 21:09:32 1.28 +++ SimpleAxisServer.java 2001/10/04 15:42:43 1.29 @@ -59,10 +59,10 @@ import org.apache.axis.Constants; import org.apache.axis.Message; import org.apache.axis.MessageContext; -import org.apache.axis.message.SOAPEnvelope; -import org.apache.axis.message.SOAPFaultElement; import org.apache.axis.configuration.FileProvider; import org.apache.axis.encoding.Base64; +import org.apache.axis.message.SOAPEnvelope; +import org.apache.axis.message.SOAPFaultElement; import org.apache.axis.server.AxisServer; import org.apache.axis.session.Session; import org.apache.axis.session.SimpleSession; 1.34 +25 -33 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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Emitter.java 2001/10/02 18:37:16 1.33 +++ Emitter.java 2001/10/04 15:42:43 1.34 @@ -54,30 +54,22 @@ */ package org.apache.axis.wsdl; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Vector; -import java.util.StringTokenizer; -import java.net.URL; -import java.net.MalformedURLException; -import java.net.URLDecoder; +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.utils.XMLUtils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; import javax.wsdl.Binding; import javax.wsdl.BindingOperation; import javax.wsdl.Definition; import javax.wsdl.Fault; import javax.wsdl.Input; -import javax.wsdl.Message; import javax.wsdl.Operation; import javax.wsdl.Output; import javax.wsdl.Part; @@ -86,21 +78,21 @@ import javax.wsdl.QName; import javax.wsdl.Service; import javax.wsdl.WSDLException; - -import org.apache.axis.utils.XMLUtils; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import com.ibm.wsdl.xml.WSDLReader; -import com.ibm.wsdl.extensions.soap.SOAPAddress; -import com.ibm.wsdl.extensions.soap.SOAPOperation; -import com.ibm.wsdl.extensions.soap.SOAPBody; -import com.ibm.wsdl.extensions.soap.SOAPBinding; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.Vector; /** * This class produces java files for stubs, skeletons, and types from a 1.2 +0 -5 xml-axis/java/src/org/apache/axis/wsdl/Type.java Index: Type.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Type.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Type.java 2001/10/02 18:37:42 1.1 +++ Type.java 2001/10/04 15:42:43 1.2 @@ -55,12 +55,7 @@ package org.apache.axis.wsdl; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import javax.wsdl.QName; 1.2 +3 -7 xml-axis/java/src/org/apache/axis/wsdl/TypeFactory.java Index: TypeFactory.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/TypeFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TypeFactory.java 2001/10/02 18:37:42 1.1 +++ TypeFactory.java 2001/10/04 15:42:43 1.2 @@ -54,18 +54,14 @@ */ package org.apache.axis.wsdl; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Vector; - -import org.w3c.dom.Attr; import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import javax.wsdl.QName; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Vector; /** * This factory creates Type objects for the types supported by the WSDL2Java emitter. * The factory creates the Types by analyzing the XML Document. The Type encapsulates 1.2 +0 -8 xml-axis/java/src/org/apache/axis/wsdl/Utils.java Index: Utils.java =================================================================== RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Utils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Utils.java 2001/10/02 18:37:42 1.1 +++ Utils.java 2001/10/04 15:42:43 1.2 @@ -54,15 +54,7 @@ */ package org.apache.axis.wsdl; -import java.util.HashMap; -import java.util.Iterator; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import javax.wsdl.QName; /**