You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2005/08/04 13:07:20 UTC

svn commit: r227344 [1/2] - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis2/transport/http/ core/src/org/apache/axis2/transport/mail/ core/src/org/apache/axis2/transport/mail/server/ core/src/org/apache/axis2/transport/tcp/ core/test...

Author: ruchithf
Date: Thu Aug  4 04:05:16 2005
New Revision: 227344

URL: http://svn.apache.org/viewcvs?rev=227344&view=rev
Log:
Fixed Axis2-118 and organized imports

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/soap12testsuite/SOAP12TestWithFaults.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
    webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
    webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
    webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
    webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
    webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java
    webservices/axis/trunk/java/modules/samples/src/userguide/example1/MyService.java
    webservices/axis/trunk/java/modules/samples/src/userguide/example2/MyService.java
    webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMAttributeImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/SOAPFaultTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/ElementSerializerTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/impl/serializer/OMSerializerTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPEnvelopeTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/soap/SOAPHeaderBlockTest.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Thu Aug  4 04:05:16 2005
@@ -15,7 +15,12 @@
  */
 package org.apache.axis2.transport.http;
 
-import org.apache.axis2.addressing.AddressingConstants;
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.ListenerManager;
 import org.apache.axis2.context.ConfigurationContext;
@@ -23,14 +28,8 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
 
 /**
  * This is a simple implementation of an HTTP server for processing

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailWorker.java Thu Aug  4 04:05:16 2005
@@ -16,9 +16,19 @@
 
 package org.apache.axis2.transport.mail;
 
-import org.apache.axis2.Constants;
+import java.io.ByteArrayInputStream;
+import java.util.Properties;
+
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
@@ -29,21 +39,11 @@
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.soap.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.util.threadpool.AxisWorker;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
-import java.util.Properties;
 
 public class MailWorker implements AxisWorker {
     protected static Log log = LogFactory.getLog(MailWorker.class.getName());

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/SimpleMailListener.java Thu Aug  4 04:05:16 2005
@@ -16,9 +16,15 @@
 
 package org.apache.axis2.transport.mail;
 
-import org.apache.axis2.Constants;
+import java.io.File;
+
+import javax.mail.Flags;
+import javax.mail.Message;
+import javax.mail.internet.MimeMessage;
+import javax.xml.namespace.QName;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
@@ -29,12 +35,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.mail.Flags;
-import javax.mail.Message;
-import javax.mail.internet.MimeMessage;
-import javax.xml.namespace.QName;
-import java.io.File;
 
 /**
  * This is a simple implementation of an SMTP/POP3 server for processing SOAP

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailSorter.java Thu Aug  4 04:05:16 2005
@@ -1,8 +1,17 @@
 package org.apache.axis2.transport.mail.server;
 
-import org.apache.axis2.Constants;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
@@ -10,20 +19,11 @@
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
-import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.soap.impl.llom.soap11.SOAP11Constants;
+import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.transport.mail.MailConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
 
 /**
  * This class will be used to sort the messages into normal messages and mails

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPServer.java Thu Aug  4 04:05:16 2005
@@ -15,7 +15,12 @@
  */
 package org.apache.axis2.transport.tcp;
 
-import org.apache.axis2.addressing.AddressingConstants;
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.ListenerManager;
 import org.apache.axis2.context.ConfigurationContext;
@@ -25,14 +30,8 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.transport.TransportListener;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
 
 /**
  * Class HTTPTransportReceiver

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java Thu Aug  4 04:05:16 2005
@@ -1,13 +1,14 @@
 package org.apache.axis2.transport.http;
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
+
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMText;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-
-import javax.xml.namespace.QName;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java Thu Aug  4 04:05:16 2005
@@ -22,9 +22,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.axis2.Constants;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.MessageSender;
 import org.apache.axis2.context.ConfigurationContext;

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java Thu Aug  4 04:05:16 2005
@@ -18,22 +18,22 @@
 
 //todo
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.OperationDescription;
-import org.apache.axis2.description.ParameterImpl;
 import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.engine.MessageReceiver;
@@ -41,19 +41,11 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
 import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.impl.OMOutputImpl;
 import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.transport.mail.MailTransportSender;
 import org.apache.axis2.transport.mail.SimpleMailListener;
-import org.apache.axis2.transport.mail.server.MailConstants;
-import org.apache.axis2.transport.mail.server.MailServer;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
 
 public class MailRequestResponseRawXMLTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java Thu Aug  4 04:05:16 2005
@@ -22,9 +22,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.axis2.Constants;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Thu Aug  4 04:05:16 2005
@@ -20,17 +20,16 @@
  * @author <a href="mailto:thilina@opensource.lk">Thilina Gunarathne </a>
  */
 
-import java.io.ByteArrayInputStream;
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.attachments.ByteArrayDataSource;
-import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMAbstractFactory;
@@ -44,9 +43,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.activation.DataHandler;
-import javax.xml.namespace.QName;
 
 public class EchoRawMTOMLoadTest extends TestCase {
     private EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:"

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Thu Aug  4 04:05:16 2005
@@ -21,7 +21,6 @@
  */
 
 import java.awt.Image;
-import java.io.FileOutputStream;
 import java.io.InputStream;
 
 import javax.activation.DataHandler;

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMToBase64Test.java Thu Aug  4 04:05:16 2005
@@ -26,13 +26,10 @@
 import junit.framework.TestCase;
 
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.attachments.ByteArrayDataSource;
-import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.om.OMAbstractFactory;

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Thu Aug  4 04:05:16 2005
@@ -16,11 +16,13 @@
 
 package org.apache.axis2.rest;
 
-//todo
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
 
 import junit.framework.TestCase;
+
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
@@ -39,9 +41,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
 
 
 public class RESTBasedEchoRawXMLTest extends TestCase {

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/soap12testsuite/SOAP12TestWithFaults.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/soap12testsuite/SOAP12TestWithFaults.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/soap12testsuite/SOAP12TestWithFaults.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/soap12testing/soap12testsuite/SOAP12TestWithFaults.java Thu Aug  4 04:05:16 2005
@@ -17,11 +17,10 @@
 package org.apache.axis2.soap12testing.soap12testsuite;
 
 import junit.framework.TestCase;
-import org.apache.axis2.soap12testing.server.SimpleServer;
-import org.apache.axis2.soap12testing.client.SOAP12TestClient;
-import org.apache.axis2.soap12testing.client.MessageComparator;
 
-import java.io.InputStream;
+import org.apache.axis2.soap12testing.client.MessageComparator;
+import org.apache.axis2.soap12testing.client.SOAP12TestClient;
+import org.apache.axis2.soap12testing.server.SimpleServer;
 
 public class SOAP12TestWithFaults extends TestCase {
     private SimpleServer server;

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Thu Aug  4 04:05:16 2005
@@ -17,10 +17,14 @@
 package org.apache.axis2.tcp;
 
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
@@ -34,16 +38,11 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
 import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.impl.OMOutputImpl;
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
 
 public class TCPEchoRawXMLTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Thu Aug  4 04:05:16 2005
@@ -17,10 +17,14 @@
 package org.apache.axis2.tcp;
 
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import junit.framework.TestCase;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
@@ -38,10 +42,6 @@
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
 
 public class TCPTwoChannelEchoRawXMLTest extends TestCase {
     private EndpointReference targetEPR =

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableCreateQueue.java Thu Aug  4 04:05:16 2005
@@ -15,18 +15,17 @@
 */
 package sample.amazon.amazonSimpleQueueService.util;
 
-import org.apache.axis2.Constants;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
-import javax.swing.*;
+import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
 /**
  * This will create the Excutable code which runs seperately of GUI interations

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableDeleteQueue.java Thu Aug  4 04:05:16 2005
@@ -15,16 +15,18 @@
 */
 package sample.amazon.amazonSimpleQueueService.util;
 
-import org.apache.axis2.Constants;
+import javax.swing.JButton;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
-import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
-import javax.swing.*;
+import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
 /**
  * This will create the Excutable code which runs seperately of GUI interations

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableListMyQueues.java Thu Aug  4 04:05:16 2005
@@ -15,16 +15,18 @@
 */
 package sample.amazon.amazonSimpleQueueService.util;
 
-import org.apache.axis2.Constants;
+import javax.swing.JButton;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
-import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
-import javax.swing.*;
+import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
 /**
  * This will create the Excutable code which runs seperately of GUI interations

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/amazonSimpleQueueService/util/RunnableReadQueue.java Thu Aug  4 04:05:16 2005
@@ -15,16 +15,17 @@
 */
 package sample.amazon.amazonSimpleQueueService.util;
 
-import org.apache.axis2.Constants;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
-import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
-import javax.swing.*;
+import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 
 /**
  * This will create the Excutable code which runs seperately of GUI interations

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/AsynchronousClient.java Thu Aug  4 04:05:16 2005
@@ -16,25 +16,23 @@
 
 package sample.amazon.search;
 
-import org.apache.axis2.Constants;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.OperationDescription;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.clientapi.Call;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.OperationDescription;
 
 /**
  * This class implements main() method and sendMsg() methods,

Modified: webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/amazon/search/ClientCallbackHandler.java Thu Aug  4 04:05:16 2005
@@ -16,19 +16,19 @@
 
 package sample.amazon.search;
 
+import java.util.Iterator;
+
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.impl.OMOutputImpl;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import java.util.Iterator;
 
 /**
  * This class implements the onComplete method extended by call back

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/AsynchronousClient.java Thu Aug  4 04:05:16 2005
@@ -1,17 +1,18 @@
 package sample.google.search;
 
-import org.apache.axis2.Constants;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.OperationDescription;
-import sample.google.common.util.PropertyLoader;
 
-import javax.xml.namespace.QName;
-import java.net.MalformedURLException;
-import java.net.URL;
+import sample.google.common.util.PropertyLoader;
 
 /*
 * Copyright 2001-2004 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/search/ClientUtil.java Thu Aug  4 04:05:16 2005
@@ -16,17 +16,16 @@
 
 package sample.google.search;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.AxisFault;
 
 /**
  * Builds the MessageContext as called by AsynchronousClient

Modified: webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/sample/google/spellcheck/FormModel.java Thu Aug  4 04:05:16 2005
@@ -1,6 +1,11 @@
 package sample.google.spellcheck;
 
-import org.apache.axis2.addressing.AddressingConstants;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Call;
@@ -11,12 +16,8 @@
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.AxisFault;
-import sample.google.common.util.PropertyLoader;
 
-import javax.xml.namespace.QName;
-import java.net.MalformedURLException;
-import java.net.URL;
+import sample.google.common.util.PropertyLoader;
 
 /**
  * class sample.google.spellcheck.FormModel

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/ClientForWebServiceWithModule.java Thu Aug  4 04:05:16 2005
@@ -1,16 +1,31 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package userguide.clients;
 
-import org.apache.axis2.Constants;
+import java.io.StringWriter;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.OMOutputImpl;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.StringWriter;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingClient.java Thu Aug  4 04:05:16 2005
@@ -1,15 +1,3 @@
-package userguide.clients;
-
-import org.apache.axis2.Constants;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.clientapi.Call;
-import org.apache.axis2.om.OMElement;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.StringWriter;
 
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
@@ -26,6 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package userguide.clients;
+
+import java.io.StringWriter;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.clientapi.Call;
+import org.apache.axis2.om.OMElement;
+
 
 public class EchoBlockingClient {
     private static EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:8080/axis2/services/MyService/echo");

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoBlockingDualClient.java Thu Aug  4 04:05:16 2005
@@ -1,15 +1,31 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package userguide.clients;
 
-import org.apache.axis2.Constants;
+import java.io.StringWriter;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMElement;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import java.io.StringWriter;
 
 /**
  * Created by IntelliJ IDEA.

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingClient.java Thu Aug  4 04:05:16 2005
@@ -1,18 +1,33 @@
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package userguide.clients;
 
-import org.apache.axis2.Constants;
+import java.io.StringWriter;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.OMOutputImpl;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.StringWriter;
 
 /**
  * Created by IntelliJ IDEA.

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/EchoNonBlockingDualClient.java Thu Aug  4 04:05:16 2005
@@ -1,19 +1,34 @@
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package userguide.clients;
 
-import org.apache.axis2.Constants;
+import java.io.StringWriter;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.AsyncResult;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.clientapi.Callback;
 import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.OMOutputImpl;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.StringWriter;
 
 /**
  * Created by IntelliJ IDEA.

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/MailClient.java Thu Aug  4 04:05:16 2005
@@ -15,9 +15,8 @@
  */
 package userguide.clients;
 
-import org.apache.axis2.Constants;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.MessageSender;
 import org.apache.axis2.om.OMAbstractFactory;

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/PingClient.java Thu Aug  4 04:05:16 2005
@@ -1,8 +1,23 @@
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package userguide.clients;
 
-import org.apache.axis2.Constants;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.MessageSender;
 import org.apache.axis2.om.OMElement;

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/RESTClient.java Thu Aug  4 04:05:16 2005
@@ -15,20 +15,19 @@
  */
 package userguide.clients;
 
-import org.apache.axis2.Constants;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
 import org.apache.axis2.om.OMNamespace;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
 
 /**
  * This is a Client progam that accesses 'MyService' web service in Axis2 samples

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/clients/TCPClient.java Thu Aug  4 04:05:16 2005
@@ -15,20 +15,19 @@
  */
 package userguide.clients;
 
-import org.apache.axis2.Constants;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.clientapi.Call;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMFactory;
 import org.apache.axis2.om.OMNamespace;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
 
 /**
  * This is a Client progam that accesses 'MyService' web service in Axis2 samples

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/example1/MyService.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/example1/MyService.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/example1/MyService.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/example1/MyService.java Thu Aug  4 04:05:16 2005
@@ -1,3 +1,19 @@
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package userguide.example1;
 
 import org.apache.axis2.om.OMElement;

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/example2/MyService.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/example2/MyService.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/example2/MyService.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/example2/MyService.java Thu Aug  4 04:05:16 2005
@@ -1,3 +1,19 @@
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package userguide.example2;
 
 import org.apache.axis2.om.OMElement;

Modified: webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/loggingmodule/LoggingModule.java Thu Aug  4 04:05:16 2005
@@ -1,3 +1,19 @@
+
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package userguide.loggingmodule;
 
 import org.apache.axis2.engine.AxisConfiguration;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Thu Aug  4 04:05:16 2005
@@ -1,5 +1,22 @@
 package org.apache.axis2.wsdl.codegen.emitter;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.codegen.CodeGenerationException;
 import org.apache.axis2.wsdl.codegen.Constants;
@@ -19,6 +36,7 @@
 import org.apache.axis2.wsdl.databinding.TypeMapper;
 import org.apache.wsdl.MessageReference;
 import org.apache.wsdl.WSDLBinding;
+import org.apache.wsdl.WSDLBindingMessageReference;
 import org.apache.wsdl.WSDLBindingOperation;
 import org.apache.wsdl.WSDLConstants;
 import org.apache.wsdl.WSDLDescription;
@@ -28,30 +46,13 @@
 import org.apache.wsdl.WSDLOperation;
 import org.apache.wsdl.WSDLService;
 import org.apache.wsdl.WSDLTypes;
-import org.apache.wsdl.WSDLBindingMessageReference;
 import org.apache.wsdl.extensions.ExtensionConstants;
 import org.apache.wsdl.extensions.SOAPBody;
 import org.apache.wsdl.extensions.SOAPOperation;
 import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
-import org.w3c.dom.Document;
-
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 
 
 /*

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java Thu Aug  4 04:05:16 2005
@@ -17,12 +17,8 @@
 package org.apache.axis2.wsdl.codegen.extension;
 
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.codegen.CommandLineOption;
-import org.apache.axis2.wsdl.codegen.CommandLineOptionConstants;
 import org.apache.axis2.wsdl.util.URLProcessor;
 import org.apache.wsdl.WSDLBinding;
-
-import java.util.Map;
 
 /**
  * @author chathura@opensource.lk

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java Thu Aug  4 04:05:16 2005
@@ -16,16 +16,15 @@
 
 package org.apache.axis2.wsdl.codegen.extension;
 
+import java.util.Iterator;
+
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis2.wsdl.codegen.CodeGenerationException;
-import org.apache.wsdl.WSDLDescription;
 import org.apache.wsdl.WSDLExtensibilityElement;
 import org.apache.wsdl.WSDLTypes;
 import org.apache.wsdl.extensions.ExtensionConstants;
 import org.apache.wsdl.extensions.Schema;
 import org.w3c.dom.NamedNodeMap;
-
-import java.util.Iterator;
 
 /**
  * @author chathura@opensource.lk

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Thu Aug  4 04:05:16 2005
@@ -1,8 +1,18 @@
 package org.apache.axis2.wsdl.codegen.extension;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.List;
+import java.util.Stack;
+import java.util.Vector;
+
 import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
 import org.apache.axis2.wsdl.databinding.DefaultTypeMapper;
+import org.apache.axis2.wsdl.databinding.JavaTypeMapper;
 import org.apache.wsdl.WSDLExtensibilityElement;
 import org.apache.wsdl.WSDLTypes;
 import org.apache.wsdl.extensions.ExtensionConstants;
@@ -12,21 +22,8 @@
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.SchemaTypeSystem;
 import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
-import org.w3c.dom.Element;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.List;
-import java.util.Stack;
-import java.util.Vector;
-import java.net.URLClassLoader;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java Thu Aug  4 04:05:16 2005
@@ -35,9 +35,6 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.apache.axis2.attachments.Base64;
-import org.apache.axis2.i18n.Messages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Document;

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/OMFactory.java Thu Aug  4 04:05:16 2005
@@ -15,10 +15,6 @@
  */
 package org.apache.axis2.om;
 
-import org.apache.axis2.om.impl.llom.OMDocTypeImpl;
-import org.apache.axis2.om.impl.llom.OMProcessingInstructionImpl;
-import org.apache.axis2.om.impl.llom.OMCommentImpl;
-
 import javax.activation.DataHandler;
 import javax.xml.namespace.QName;
 
@@ -26,6 +22,13 @@
  * Class OMFactory
  */
 public interface OMFactory {
+
+	/**
+	 * Create a new OMDocument
+	 * @return
+	 */
+	public OMDocument createOMDocument();
+	
     /**
      * @param localName
      * @param ns

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMAttributeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMAttributeImpl.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMAttributeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMAttributeImpl.java Thu Aug  4 04:05:16 2005
@@ -15,12 +15,10 @@
  */
 package org.apache.axis2.om.impl.llom;
 
+import javax.xml.namespace.QName;
+
 import org.apache.axis2.om.OMAttribute;
 import org.apache.axis2.om.OMNamespace;
-
-import javax.xml.namespace.QName;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Class OMAttributeImpl

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMElementImpl.java Thu Aug  4 04:05:16 2005
@@ -318,7 +318,7 @@
 
         // go up to check with ancestors
         if (parent != null) {
-            //For the OMDocument there won't be any explicit namespace
+            //For the OMDocumentImpl there won't be any explicit namespace
             //declarations, so going up the parent chain till the document
             //element should be enough.
             if (parent instanceof OMElement) {
@@ -618,6 +618,31 @@
                 if (textNode.getText() != null &&
                         !"".equals(textNode.getText())) {
                     childText += textNode.getText();
+                }
+            }
+            child = child.getNextSibling();
+        }
+
+        return childText;
+    }
+    
+    /**
+     * Returns the concatanation of TRIMMED values of all 
+     * OMText  child nodes of this element
+     * This is incuded purely to improve usability
+     * @return
+     */
+    public String getTrimmedText() {
+        String childText = "";
+        OMNode child = this.getFirstChild();
+        OMText textNode;
+
+        while (child != null) {
+            if (child.getType() == OMNode.TEXT_NODE) {
+                textNode = (OMText) child;
+                if (textNode.getText() != null &&
+                        !"".equals(textNode.getText().trim())) {
+                    childText += textNode.getText().trim();
                 }
             }
             child = child.getNextSibling();

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMStAXWrapper.java Thu Aug  4 04:05:16 2005
@@ -15,15 +15,8 @@
  */
 package org.apache.axis2.om.impl.llom;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.OMText;
-import org.apache.axis2.om.OMXMLParserWrapper;
-import org.apache.axis2.om.impl.llom.exception.OMStreamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Iterator;
+import java.util.Stack;
 
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
@@ -31,8 +24,14 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import java.util.Iterator;
-import java.util.Stack;
+
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
+import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.OMXMLParserWrapper;
+import org.apache.axis2.om.impl.llom.exception.OMStreamingException;
 
 /**
  * Note  - This class also implements the streaming constants interface

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Thu Aug  4 04:05:16 2005
@@ -23,7 +23,7 @@
 import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.om.OMNode;
 import org.apache.axis2.om.OMText;
-import org.apache.axis2.om.impl.llom.OMDocument;
+import org.apache.axis2.om.impl.llom.OMDocumentImpl;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
@@ -36,7 +36,7 @@
     /**
      * Field document
      */
-    protected OMDocument document;
+    protected OMDocumentImpl document;
 
     /**
      * Constructor StAXOMBuilder
@@ -46,7 +46,7 @@
      */
     public StAXOMBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
         super(ombuilderFactory, parser);
-        document = new OMDocument(this);
+        document = new OMDocumentImpl(this);
         //omfactory = OMAbstractFactory.getOMFactory();
     }
 
@@ -57,7 +57,7 @@
      */
     public StAXOMBuilder(XMLStreamReader parser) {
         super(parser);
-        document = new OMDocument(this);
+        document = new OMDocumentImpl(this);
         omfactory = OMAbstractFactory.getOMFactory();
     }
 
@@ -72,7 +72,7 @@
         String elementName = parser.getLocalName();
         if (lastNode == null) {
             node = omfactory.createOMElement(elementName, null, null, this);
-            document.setRootElement(node);
+            document.setDocumentElement(node);
             document.addChild(node);
         } else if (lastNode.isComplete()) {
             node = omfactory.createOMElement(elementName, null,
@@ -217,7 +217,7 @@
      * @return root element
      */
     public OMElement getDocumentElement() {
-        return document.getRootElement();
+        return document.getDocumentElement();
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java Thu Aug  4 04:05:16 2005
@@ -19,6 +19,7 @@
 import org.apache.axis2.om.OMComment;
 import org.apache.axis2.om.OMContainer;
 import org.apache.axis2.om.OMDocType;
+import org.apache.axis2.om.OMDocument;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMException;
 import org.apache.axis2.om.OMFactory;
@@ -29,6 +30,7 @@
 import org.apache.axis2.om.impl.llom.OMAttributeImpl;
 import org.apache.axis2.om.impl.llom.OMCommentImpl;
 import org.apache.axis2.om.impl.llom.OMDocTypeImpl;
+import org.apache.axis2.om.impl.llom.OMDocumentImpl;
 import org.apache.axis2.om.impl.llom.OMElementImpl;
 import org.apache.axis2.om.impl.llom.OMNamespaceImpl;
 import org.apache.axis2.om.impl.llom.OMProcessingInstructionImpl;
@@ -216,4 +218,11 @@
     public OMComment createOMComment(OMContainer parent, String content) {
         return new OMCommentImpl(parent, content);
     }
+
+	/* (non-Javadoc)
+	 * @see org.apache.axis2.om.OMFactory#createOMDocument()
+	 */
+	public OMDocument createOMDocument() {
+		return new OMDocumentImpl();
+	}
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java Thu Aug  4 04:05:16 2005
@@ -8,7 +8,7 @@
 import org.apache.axis2.om.OMText;
 import org.apache.axis2.om.OMProcessingInstruction;
 import org.apache.axis2.om.OMComment;
-import org.apache.axis2.om.impl.llom.OMDocument;
+import org.apache.axis2.om.impl.llom.OMDocumentImpl;
 import org.apache.axis2.om.impl.llom.OMNamespaceImpl;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
 import org.jaxen.*;
@@ -126,7 +126,7 @@
      *         else <code>false</code>
      */
     public boolean isDocument(Object object) {
-        return object instanceof OMDocument;
+        return object instanceof OMDocumentImpl;
     }
 
     /**
@@ -342,7 +342,7 @@
         List nsList = new ArrayList();
         HashSet prefixes = new HashSet();
         for (OMContainer context = (OMContainer) contextNode;
-             context != null && !(context instanceof OMDocument);
+             context != null && !(context instanceof OMDocumentImpl);
              context = ((OMElement) context).getParent()) {
             OMElement element = (OMElement) context;
             ArrayList declaredNS = new ArrayList();
@@ -578,7 +578,7 @@
      * @see #isDocument(Object)
      */
     public Object getDocumentNode(Object contextNode) {
-        if (contextNode instanceof OMDocument) {
+        if (contextNode instanceof OMDocumentImpl) {
             return contextNode;
         }
         return getDocumentNode(((OMNode) contextNode).getParent());
@@ -653,7 +653,7 @@
      */
     public Object getParentNode(Object contextNode) throws UnsupportedAxisException {
         if (contextNode == null ||
-                contextNode instanceof OMDocument) {
+                contextNode instanceof OMDocumentImpl) {
             return null;
         } else if (contextNode instanceof OMAttributeEx) {
             return ((OMAttributeEx) contextNode).getParent();

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/builder/StAXSOAPModelBuilder.java Thu Aug  4 04:05:16 2005
@@ -15,10 +15,14 @@
 */
 package org.apache.axis2.soap.impl.llom.builder;
 
-import org.apache.axis2.om.*;
-import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axis2.om.OMAbstractFactory;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMException;
+import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.om.OMNode;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-import org.apache.axis2.om.impl.llom.exception.OMBuilderException;
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.SOAPFactory;
@@ -28,12 +32,8 @@
 import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
 import org.apache.axis2.soap.impl.llom.soap11.SOAP11Constants;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
-import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
 
 /**
  * Class StAXSOAPModelBuilder

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/soap11/SOAP11FaultImpl.java Thu Aug  4 04:05:16 2005
@@ -1,8 +1,9 @@
 package org.apache.axis2.soap.impl.llom.soap11;
 
+import javax.xml.stream.XMLStreamException;
+
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.om.OMXMLParserWrapper;
-import org.apache.axis2.om.impl.llom.OMSerializerUtil;
 import org.apache.axis2.soap.SOAPBody;
 import org.apache.axis2.soap.SOAPFault;
 import org.apache.axis2.soap.SOAPFaultCode;
@@ -12,8 +13,6 @@
 import org.apache.axis2.soap.SOAPFaultRole;
 import org.apache.axis2.soap.impl.llom.SOAPFaultImpl;
 import org.apache.axis2.soap.impl.llom.SOAPProcessingException;
-
-import javax.xml.stream.XMLStreamException;
 
 
 /**

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/OMNavigatorTest.java Thu Aug  4 04:05:16 2005
@@ -15,19 +15,19 @@
  */
 package org.apache.axis2.om;
 
-import org.apache.axis2.om.impl.llom.OMNavigator;
-import org.apache.axis2.om.impl.OMOutputImpl;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
+
+import org.apache.axis2.om.impl.llom.OMNavigator;
+import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axis2.soap.SOAPFactory;
+import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
 
 public class OMNavigatorTest extends AbstractTestCase {
     private SOAPEnvelope envelope = null;

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/SOAPFaultTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/SOAPFaultTest.java?rev=227344&r1=227343&r2=227344&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/SOAPFaultTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis2/om/SOAPFaultTest.java Thu Aug  4 04:05:16 2005
@@ -15,12 +15,11 @@
  */
 package org.apache.axis2.om;
 
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.om.impl.OMOutputImpl;
-
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axis2.soap.SOAPEnvelope;
 
 public class SOAPFaultTest extends AbstractTestCase {
     private SOAPEnvelope soapEnvelope;