You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/07/01 05:20:33 UTC

svn commit: r208706 - in /webservices/axis/trunk/java: ./ modules/core/src/org/apache/axis/addressing/ modules/core/src/org/apache/axis/clientapi/ modules/core/src/org/apache/axis/deployment/ modules/core/src/org/apache/axis/description/ modules/core/s...

Author: hemapani
Date: Thu Jun 30 20:20:30 2005
New Revision: 208706

URL: http://svn.apache.org/viewcvs?rev=208706&view=rev
Log:
checked in refactoring 

Modified:
    webservices/axis/trunk/java/maven.xml
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AnyContentType.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/EndpointReference.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/MessageInformationHeadersCollection.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StreamWrapper.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StubSupporter.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/HandlerDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ModuleDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SOAPMessageBodyBasedDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportUtils.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailClient.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/tcpmon.java

Modified: webservices/axis/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/maven.xml?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/maven.xml (original)
+++ webservices/axis/trunk/java/maven.xml Thu Jun 30 20:20:30 2005
@@ -331,6 +331,7 @@
 						<ant:include name="**"/>
 						<ant:exclude name="**servlet**"/>
 						<ant:exclude name="commons-httpclient-*.jar"/>
+						<ant:exclude name="ant*.jar"/>
 		  	</ant:lib>  
 			<ant:classes dir="modules/core/conf">
       		    	<ant:include name="*.properties"/>
@@ -374,10 +375,13 @@
 		<ant:copy todir="${bin.dist.dir}/lib" flatten="true">
 			<ant:fileset dir="target/lib">
 				<ant:include name="*.jar"/>
+				<ant:exclude name="**servlet**.jar"/>
+				<ant:exclude name="commons-httpclient-*.jar"/>
+				<ant:exclude name="ant*.jar"/>
 			</ant:fileset> 
 		</ant:copy> 
 		<ant:copy file="target/axis2.war" tofile="${bin.dist.dir}/webapps/axis2.war"/>
-                <ant:copy file="modules/samples/script/build.xml" tofile="${bin.dist.dir}/samples/build.xml"/>
+        <ant:copy file="modules/samples/script/build.xml" tofile="${bin.dist.dir}/samples/build.xml"/>
 		<ant:copy todir="${bin.dist.dir}/samples">
 			<ant:fileset dir="modules/samples/conf/">
 				<ant:include name="*.xml"/>

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AddressingConstants.java Thu Jun 30 20:20:30 2005
@@ -15,7 +15,6 @@
  */
 package org.apache.axis.addressing;
 
-import javax.xml.namespace.QName;
 
 /**
  * Interface AddressingConstants

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AnyContentType.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AnyContentType.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AnyContentType.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/AnyContentType.java Thu Jun 30 20:20:30 2005
@@ -15,9 +15,10 @@
  */
 package org.apache.axis.addressing;
 
-import javax.xml.namespace.QName;
 import java.util.HashMap;
 import java.util.Iterator;
+
+import javax.xml.namespace.QName;
 
 /**
  * Class AnyContentType

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/EndpointReference.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/EndpointReference.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/EndpointReference.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/EndpointReference.java Thu Jun 30 20:20:30 2005
@@ -15,9 +15,9 @@
  */
 package org.apache.axis.addressing;
 
-import org.apache.axis.om.OMElement;
-
 import javax.xml.namespace.QName;
+
+import org.apache.axis.om.OMElement;
 
 /**
  * Class EndpointReference

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/MessageInformationHeadersCollection.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/MessageInformationHeadersCollection.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/MessageInformationHeadersCollection.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/addressing/MessageInformationHeadersCollection.java Thu Jun 30 20:20:30 2005
@@ -15,11 +15,11 @@
  */
 package org.apache.axis.addressing;
 
+import java.util.ArrayList;
+
 import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.soap.SOAPHeader;
 import org.apache.axis.om.OMElement;
-
-import java.util.ArrayList;
+import org.apache.axis.soap.SOAPHeader;
 
 /**
  * This holds the WSA Message Information Headers

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/MEPClient.java Thu Jun 30 20:20:30 2005
@@ -29,7 +29,6 @@
 import org.apache.axis.om.OMElement;
 import org.apache.axis.soap.SOAPEnvelope;
 import org.apache.axis.soap.SOAPFactory;
-import org.apache.axis.soap.impl.llom.SOAPProcessingException;
 import org.apache.axis.soap.impl.llom.soap11.SOAP11Constants;
 import org.apache.axis.soap.impl.llom.soap12.SOAP12Constants;
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StreamWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StreamWrapper.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StreamWrapper.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StreamWrapper.java Thu Jun 30 20:20:30 2005
@@ -1,10 +1,10 @@
 package org.apache.axis.clientapi;
 
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.Location;
-import javax.xml.namespace.QName;
 import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Stub.java Thu Jun 30 20:20:30 2005
@@ -16,7 +16,8 @@
 
 package org.apache.axis.clientapi;
 
-import org.apache.axis.addressing.EndpointReference;
+import javax.xml.stream.XMLStreamReader;
+
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
@@ -29,14 +30,11 @@
 import org.apache.axis.om.OMNamespace;
 import org.apache.axis.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
-import org.apache.axis.soap.SOAPEnvelope;
 import org.apache.axis.soap.SOAPBody;
+import org.apache.axis.soap.SOAPEnvelope;
 import org.apache.axis.soap.SOAPFactory;
 import org.apache.axis.soap.impl.llom.SOAPProcessingException;
 import org.apache.wsdl.WSDLService;
-
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLInputFactory;
 
 
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StubSupporter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StubSupporter.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StubSupporter.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/StubSupporter.java Thu Jun 30 20:20:30 2005
@@ -1,8 +1,8 @@
 package org.apache.axis.clientapi;
 
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMFactory;
 import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/TwoChannelBasedSender.java Thu Jun 30 20:20:30 2005
@@ -15,25 +15,12 @@
  */
 package org.apache.axis.clientapi;
 
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.TransportInDescription;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis.soap.SOAPEnvelope;
-import org.apache.axis.soap.impl.llom.builder.StAXSOAPModelBuilder;
 import org.apache.axis.transport.TransportUtils;
-import org.apache.axis.transport.http.HTTPTransportReceiver;
 
 
 public class TwoChannelBasedSender {
@@ -55,35 +42,11 @@
         response.setServerSide(false);
         response.setOperationContext(msgctx.getOperationContext());
         response.setServiceContext(msgctx.getServiceContext());
+        
+        //If request is REST we assume the response is REST, so set the variable
         response.setDoingREST(msgctx.isDoingREST());
         
         SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(response);
-//                try {
-//                    //TODO Fix this we support only the HTTP Sync cases, so we hardcode this
-//                    if (Constants.TRANSPORT_HTTP.equals(transportIn.getName().getLocalPart())) {
-//                        HTTPTransportReceiver receiver = new HTTPTransportReceiver();
-//                        resenvelope =
-//                            receiver.checkForMessage(response,msgctx.getSystemContext());
-//                    } else if (Constants.TRANSPORT_TCP.equals(transportIn.getName().getLocalPart())) {
-//                        InputStream inStream = (InputStream) response.getProperty(MessageContext.TRANSPORT_IN);
-//                        response.setProperty(MessageContext.TRANSPORT_IN,null);
-//                        Reader in = new InputStreamReader(inStream);
-//                        if(in != null){
-//                            XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
-//                            StAXBuilder builder = new StAXSOAPModelBuilder(xmlreader);
-//                            resenvelope = (SOAPEnvelope) builder.getDocumentElement();
-//                        }else{
-//                            throw new AxisFault("Sync invocation expect a proeprty "+ MessageContext.TRANSPORT_IN + " set ");
-//                        }
-//                    }
-//                } catch (XMLStreamException e) {
-//                    throw new AxisFault(e);
-//                } catch (FactoryConfigurationError e) {
-//                    throw new AxisFault(e);
-//                }
-                
-
-
 
         if (resenvelope != null) {
             response.setEnvelope(resenvelope);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Thu Jun 30 20:20:30 2005
@@ -30,7 +30,6 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
-import javax.wsdl.factory.WSDLFactory;
 
 import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.deployment.listener.RepositoryListenerImpl;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentParser.java Thu Jun 30 20:20:30 2005
@@ -16,8 +16,26 @@
 
 package org.apache.axis.deployment;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
 import org.apache.axis.deployment.util.DeploymentData;
-import org.apache.axis.description.*;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.FlowImpl;
+import org.apache.axis.description.HandlerDescription;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.ParameterImpl;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
 import org.apache.axis.engine.AxisConfigurationImpl;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.MessageReceiver;
@@ -25,14 +43,6 @@
 import org.apache.axis.transport.TransportSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.InputStream;
-import java.util.ArrayList;
 
 /**
  * This class is used to parse the following xml douments

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/HandlerDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/HandlerDescription.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/HandlerDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/HandlerDescription.java Thu Jun 30 20:20:30 2005
@@ -15,9 +15,9 @@
  */
 package org.apache.axis.description;
 
-import org.apache.axis.engine.Handler;
-
 import javax.xml.namespace.QName;
+
+import org.apache.axis.engine.Handler;
 
 /**
  * represent the deployment information about the handler

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ModuleDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ModuleDescription.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ModuleDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ModuleDescription.java Thu Jun 30 20:20:30 2005
@@ -15,10 +15,11 @@
 */
 package org.apache.axis.description;
 
-import org.apache.axis.modules.Module;
+import java.util.HashMap;
 
 import javax.xml.namespace.QName;
-import java.util.HashMap;
+
+import org.apache.axis.modules.Module;
 
 /**
  * <p>This holds the information about a Module. </p>

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java Thu Jun 30 20:20:30 2005
@@ -1,6 +1,16 @@
 package org.apache.axis.description;
 
-import org.apache.axis.context.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.context.ConfigurationContext;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.OperationContext;
+import org.apache.axis.context.OperationContextFactory;
+import org.apache.axis.context.ServiceContext;
 import org.apache.axis.engine.AxisError;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.MessageReceiver;
@@ -10,11 +20,6 @@
 import org.apache.wsdl.WSDLConstants;
 import org.apache.wsdl.WSDLOperation;
 import org.apache.wsdl.impl.WSDLOperationImpl;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
 
 /**
  * @author chathura@opensource.lk

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java Thu Jun 30 20:20:30 2005
@@ -15,15 +15,21 @@
 */
 package org.apache.axis.description;
 
-import java.util.*;
-import java.io.OutputStream;
-import java.io.Writer;
 import java.io.IOException;
-import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.*;
 import javax.wsdl.factory.WSDLFactory;
 import javax.xml.namespace.QName;
 
@@ -38,6 +44,7 @@
 import org.apache.wsdl.extensions.SOAPOperation;
 import org.apache.wsdl.impl.WSDLInterfaceImpl;
 import org.apache.wsdl.impl.WSDLServiceImpl;
+
 import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
 import com.ibm.wsdl.extensions.soap.SOAPConstants;
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportInDescription.java Thu Jun 30 20:20:30 2005
@@ -17,9 +17,9 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.transport.TransportListener;
 import org.apache.axis.engine.Phase;
 import org.apache.axis.phaseresolver.PhaseMetadata;
+import org.apache.axis.transport.TransportListener;
 
 /**
  * Represents a transport deployed in AXis2

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/TransportOutDescription.java Thu Jun 30 20:20:30 2005
@@ -17,9 +17,9 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.transport.TransportSender;
 import org.apache.axis.engine.Phase;
 import org.apache.axis.phaseresolver.PhaseMetadata;
+import org.apache.axis.transport.TransportSender;
 
 /**
  * Represents a transport deployed in AXis2

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AbstractDispatcher.java Thu Jun 30 20:20:30 2005
@@ -15,6 +15,8 @@
 */
 package org.apache.axis.engine;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContext;
@@ -22,8 +24,6 @@
 import org.apache.axis.description.OperationDescription;
 import org.apache.axis.description.ServiceDescription;
 import org.apache.axis.handlers.AbstractHandler;
-
-import javax.xml.namespace.QName;
 
 /**
  * Class Dispatcher

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AddressingBasedDispatcher.java Thu Jun 30 20:20:30 2005
@@ -15,13 +15,13 @@
 */
 package org.apache.axis.engine;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.HandlerDescription;
 import org.apache.axis.description.OperationDescription;
 import org.apache.axis.description.ServiceDescription;
-
-import javax.xml.namespace.QName;
 
 /**
  * Class Dispatcher

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfiguration.java Thu Jun 30 20:20:30 2005
@@ -15,12 +15,17 @@
  */
 package org.apache.axis.engine;
 
-import org.apache.axis.description.*;
-
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.ParameterInclude;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
 
 /**
  * The palce where all the Global states of Axis is kept.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisConfigurationImpl.java Thu Jun 30 20:20:30 2005
@@ -15,15 +15,27 @@
 */
 package org.apache.axis.engine;
 
-import org.apache.axis.description.*;
-import org.apache.axis.phaseresolver.PhaseMetadata;
-import org.apache.axis.phaseresolver.PhaseResolver;
-import org.apache.axis.deployment.repository.util.ArchiveReader;
-import org.apache.axis.deployment.DeploymentEngine;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.xml.namespace.QName;
-import java.util.*;
-import java.io.File;
+
+import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.deployment.repository.util.ArchiveReader;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.Parameter;
+import org.apache.axis.description.ParameterInclude;
+import org.apache.axis.description.ParameterIncludeImpl;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
+import org.apache.axis.phaseresolver.PhaseMetadata;
+import org.apache.axis.phaseresolver.PhaseResolver;
 
 /**
  * Class EngineRegistryImpl

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Thu Jun 30 20:20:30 2005
@@ -15,23 +15,25 @@
  */
 package org.apache.axis.engine;
 
+import java.util.ArrayList;
+
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContext;
 import org.apache.axis.description.OperationDescription;
 import org.apache.axis.description.TransportOutDescription;
 import org.apache.axis.om.OMAbstractFactory;
-import org.apache.axis.om.OMOutput;
-import org.apache.axis.soap.*;
+import org.apache.axis.soap.SOAPBody;
+import org.apache.axis.soap.SOAPEnvelope;
+import org.apache.axis.soap.SOAPFault;
+import org.apache.axis.soap.SOAPFaultCode;
+import org.apache.axis.soap.SOAPFaultDetail;
+import org.apache.axis.soap.SOAPFaultReason;
 import org.apache.axis.soap.impl.llom.SOAPProcessingException;
-import org.apache.axis.soap.impl.llom.SOAPConstants;
 import org.apache.axis.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis.transport.TransportSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.stream.XMLStreamException;
-import java.util.ArrayList;
 
 /**
  * There is one engine for the Server and the Client. the send() and receive()

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Handler.java Thu Jun 30 20:20:30 2005
@@ -15,12 +15,13 @@
  */
 package org.apache.axis.engine;
 
+import java.io.Serializable;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.HandlerDescription;
 import org.apache.axis.description.Parameter;
-
-import javax.xml.namespace.QName;
-import java.io.Serializable;
 
 /**
  * Interface Handler

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/Phase.java Thu Jun 30 20:20:30 2005
@@ -15,15 +15,15 @@
 */
 package org.apache.axis.engine;
 
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.HandlerDescription;
 import org.apache.axis.phaseresolver.PhaseException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
-
-import javax.xml.namespace.QName;
 
 /**
  * <p>This is Phase, a orderd collection of Handlers.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SOAPMessageBodyBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SOAPMessageBodyBasedDispatcher.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SOAPMessageBodyBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/SOAPMessageBodyBasedDispatcher.java Thu Jun 30 20:20:30 2005
@@ -15,7 +15,8 @@
  */
 package org.apache.axis.engine;
 
-import org.apache.axis.addressing.EndpointReference;
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.HandlerDescription;
@@ -23,8 +24,6 @@
 import org.apache.axis.description.ServiceDescription;
 import org.apache.axis.om.OMElement;
 import org.apache.axis.om.OMNamespace;
-
-import javax.xml.namespace.QName;
 
 /**
  * Class Dispatcher

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseHolder.java Thu Jun 30 20:20:30 2005
@@ -15,11 +15,11 @@
 */
 package org.apache.axis.phaseresolver;
 
+import java.util.ArrayList;
+
 import org.apache.axis.description.HandlerDescription;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.engine.Phase;
-
-import java.util.ArrayList;
 
 
 /**

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseMetadata.java Thu Jun 30 20:20:30 2005
@@ -15,9 +15,6 @@
 */
 package org.apache.axis.phaseresolver;
 
-import org.apache.axis.description.HandlerDescription;
-
-import java.util.ArrayList;
 
 /**
  * Class PhaseMetadata

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Thu Jun 30 20:20:30 2005
@@ -15,18 +15,25 @@
 */
 package org.apache.axis.phaseresolver;
 
-import org.apache.axis.description.*;
-import org.apache.axis.engine.AxisConfiguration;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.AxisConfigurationImpl;
-import org.apache.axis.engine.Phase;
-import org.apache.axis.phaseresolver.util.PhaseValidator;
-
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerDescription;
+import org.apache.axis.description.ModuleDescription;
+import org.apache.axis.description.OperationDescription;
+import org.apache.axis.description.ServiceDescription;
+import org.apache.axis.description.TransportInDescription;
+import org.apache.axis.description.TransportOutDescription;
+import org.apache.axis.engine.AxisConfiguration;
+import org.apache.axis.engine.AxisConfigurationImpl;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.Phase;
+import org.apache.axis.phaseresolver.util.PhaseValidator;
 
 /**
  * Class PhaseResolver

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportUtils.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportUtils.java Thu Jun 30 20:20:30 2005
@@ -22,7 +22,6 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContext;
 import org.apache.axis.engine.AxisFault;
@@ -59,6 +58,7 @@
             SOAPEnvelope envelope = null;
 
             if (contentType != null) {
+                msgContext.setDoingMTOM(true);
                 builder = HTTPTransportUtils.selectBuilderForMIME(msgContext, inStream, (String)contentType);
                 envelope = (SOAPEnvelope) builder.getDocumentElement();
             }else if (msgContext.isDoingREST()) {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportSender.java Thu Jun 30 20:20:30 2005
@@ -26,7 +26,6 @@
 import java.net.URL;
 import java.util.Map;
 
-import org.apache.axis.Constants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.MessageContext;
@@ -44,7 +43,7 @@
  */
 public class HTTPTransportSender extends AbstractTransportSender {
     private boolean chuncked = false;
-    private boolean doMTOM = false;
+
     private String httpVersion = HTTPConstants.HEADER_PROTOCOL_10;
     public static final String TRANSPORT_SENDER_INFO = "TRANSPORT_SENDER_INFO";
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/ListingAgent.java Thu Jun 30 20:20:30 2005
@@ -18,7 +18,6 @@
 package org.apache.axis.transport.http;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/EMailSender.java Thu Jun 30 20:20:30 2005
@@ -17,10 +17,6 @@
  */
 package org.apache.axis.transport.mail;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.util.Properties;
 
 import javax.mail.Authenticator;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailClient.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailClient.java Thu Jun 30 20:20:30 2005
@@ -1,8 +1,17 @@
 package org.apache.axis.transport.mail;
-import javax.mail.*;
-import javax.mail.internet.MimeMessage;
 import java.io.IOException;
 import java.util.Properties;
+
+import javax.mail.Authenticator;
+import javax.mail.Flags;
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Store;
+import javax.mail.Transport;
+import javax.mail.internet.MimeMessage;
 
 public class MailClient
   extends Authenticator

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java Thu Jun 30 20:20:30 2005
@@ -18,7 +18,6 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.Constants;
-import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.Flow;
 import org.apache.axis.description.HandlerDescription;
 import org.apache.axis.description.OperationDescription;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/tcpmon.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/tcpmon.java?rev=208706&r1=208705&r2=208706&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/tcpmon.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/tcpmon.java Thu Jun 30 20:20:30 2005
@@ -15,7 +15,52 @@
  */
 package org.apache.axis.util;
 
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.ResourceBundle;
+import java.util.Vector;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ListSelectionEvent;
@@ -28,19 +73,6 @@
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.*;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-import java.util.Vector;
 
 /**
  * TCP monitor to log http messages and responses, both SOAP and plain HTTP.