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/05/12 08:53:27 UTC

svn commit: r169783 - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/ core/src/org/apache/axis/deployment/ core/src/org/apache/axis/engine/ core/src/org/apache/axis/phaseresolver/ core/src/org/apache/axis/receivers/ core/src/org/apache/axis/transport/ core/src/org/apache/axis/transport/http/ core/src/org/apache/axis/transport/mail/ core/src/org/apache/axis/util/ core/test/org/apache/axis/engine/ core/test/org/apache/axis/phaserule/ samples/src/encoding/sample1/ samples/src/org/apache/axis/testUtils/ samples/test/org/apache/axis/integration/ wsdl/src/org/apache/axis/wsdl/ wsdl/src/org/apache/axis/wsdl/codegen/ wsdl/src/org/apache/axis/wsdl/codegen/emitter/ wsdl/src/org/apache/axis/wsdl/codegen/extension/ wsdl/src/org/apache/axis/wsdl/codegen/writer/ wsdl/src/org/apache/axis/wsdl/databinding/ wsdl/src/org/apache/axis/wsdl/util/ xml/src/org/apache/axis/om/impl/llom/builder/ xml/src/org/apache/axis/om/impl/llom/factory/ xml/src/org/apache/axis/om/impl/llom/soap/ xml/src/org/apache/axis/om/impl/llom/soap/soap11/ xml/test/org/apache/axis/om/ xml/test/org/apache/axis/om/factory/

Author: hemapani
Date: Wed May 11 23:53:25 2005
New Revision: 169783

URL: http://svn.apache.org/viewcvs?rev=169783&view=rev
Log:
clean the engine stuff

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/SystemContext.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.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/AxisEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/util/Utils.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
    webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
    webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
    webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDL2Java.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/CSharpEmitter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientInterfaceWriter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientJavaEmitter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientStubWriter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/JavaEmitter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/PolicyEvaluator.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java
    webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPBodyImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPEnvelopeImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPFaultImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderBlockImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderImpl.java
    webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java
    webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java Wed May 11 23:53:25 2005
@@ -21,8 +21,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.context.SystemContext;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContextFactory.java Wed May 11 23:53:25 2005
@@ -1,5 +1,12 @@
 package org.apache.axis.context;
 
+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.deployment.DeploymentEngine;
 import org.apache.axis.deployment.DeploymentException;
 import org.apache.axis.description.AxisModule;
@@ -11,12 +18,6 @@
 import org.apache.axis.modules.Module;
 import org.apache.axis.phaseresolver.PhaseException;
 import org.apache.axis.phaseresolver.PhaseResolver;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
 
 /**
  * Created by IntelliJ IDEA.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java Wed May 11 23:53:25 2005
@@ -16,12 +16,12 @@
 * limitations under the License.
 */
 
+import java.util.Map;
+
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.engine.AxisError;
 import org.apache.axis.engine.AxisFault;
 import org.apache.wsdl.WSDLConstants;
-
-import java.util.Map;
 
 /**
  * An OperationContext represents a running "instance" of an operation, which is

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/SystemContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/SystemContext.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/SystemContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/SystemContext.java Wed May 11 23:53:25 2005
@@ -18,17 +18,18 @@
  *  Runtime state of the engine
  */
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.PhasesInclude;
 import org.apache.axis.description.PhasesIncludeImpl;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.storage.AxisStorage;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 public class SystemContext extends AbstractContext implements PhasesInclude {
 

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=169783&r1=169782&r2=169783&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 Wed May 11 23:53:25 2005
@@ -16,6 +16,19 @@
 
 package org.apache.axis.deployment;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
 import org.apache.axis.context.EngineContextFactory;
 import org.apache.axis.deployment.listener.RepositoryListenerImpl;
 import org.apache.axis.deployment.repository.utill.ArchiveReader;
@@ -24,7 +37,12 @@
 import org.apache.axis.deployment.scheduler.DeploymentIterator;
 import org.apache.axis.deployment.scheduler.Scheduler;
 import org.apache.axis.deployment.scheduler.SchedulerTask;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetadata;
+import org.apache.axis.description.Parameter;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.AxisSystemImpl;
@@ -33,13 +51,6 @@
 import org.apache.axis.phaseresolver.PhaseException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 
 public class DeploymentEngine implements DeploymentConstants {

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=169783&r1=169782&r2=169783&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 Wed May 11 23:53:25 2005
@@ -17,8 +17,8 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.HandlerMetadata;

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=169783&r1=169782&r2=169783&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 Wed May 11 23:53:25 2005
@@ -18,8 +18,8 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.HandlerMetadata;

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=169783&r1=169782&r2=169783&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 Wed May 11 23:53:25 2005
@@ -18,9 +18,9 @@
 import java.util.ArrayList;
 
 import org.apache.axis.context.MessageContext;
-import org.apache.axis.context.ServiceContext;
+import org.apache.axis.context.OperationContext;
 import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisOperation;
 import org.apache.axis.om.OMAbstractFactory;
 import org.apache.axis.om.SOAPBody;
 import org.apache.axis.om.SOAPEnvelope;
@@ -62,55 +62,18 @@
      * @see Handler
      */
     public void send(MessageContext msgContext) throws AxisFault {
-//        try {
-//            verifyContextBuilt(msgContext);
-//
-//            OperationContext operationContext = msgContext.getOperationContext();
-//
-//            ArrayList phases = operationContext.getAxisOperation().getPhasesInOutFlow();
-
-//            /*
-//             * There is a two cases, at the server side(response) / client side
-//             * but in the server side there must be a Service object object set, as before the 
-//             * out flow is started the user knows the services that will be invoked. 
-//             */
-//
-//            if (serviceContext != null) {
-//
-//                // what are we suppose to do in the client side
-//                // how the client side handlers are deployed ??? this is a hack and no client side handlers
-//
-//                //                chain.addPhases(serviceContext.getPhases(EngineConfiguration.OUTFLOW));
-//                // TODO : Fix me Srinath
-//                throw new UnsupportedOperationException();
-//            } else {
-//                if (msgContext.isServerSide() && !msgContext.isProcessingFault()) {
-//                    throw new AxisFault("At the Send there must be a Service Object set at the Server Side");
-//                }
-//            }
-//
-//            // Add the phases that are are at Global scope
-//            chain.addPhases(engineContext.getPhases(AxisSystem.OUTFLOW));
-//            //Phase addressingPhase = new SimplePhase("addressing");
-//            //addressingPhase.addHandler(new AddressingOutHandler());
-//            // chain.addPhase(addressingPhase);
-//
-//            // Receiving is always a matter of running the transport handlers first
-//
-//            AxisTransportIn transport = msgContext.getTransportIn();
-//            chain.addPhases(transport.getPhases(AxisSystem.OUTFLOW));
-//
-//            // startet rolling
-//            chain.invoke(msgContext);
-//
-//            TransportSender sender = msgContext.getTransportOut().getSender();
-//            sender.invoke(msgContext);
-//
-//        } catch (AxisFault error) {
-//            //error.printStackTrace();
-//            handleFault(msgContext, error);
-//        }
+        try {
+            verifyContextBuilt(msgContext);
+            OperationContext operationContext = msgContext.getOperationContext();
+
+            ArrayList phases = operationContext.getAxisOperation().getPhasesInOutFlow();
+            invokePhases(phases, msgContext);
 
+            TransportSender sender = msgContext.getTransportOut().getSender();
+            sender.invoke(msgContext);
+        } catch (Throwable e) {
+            handleFault(msgContext, e);
+        }
     }
 
     /**
@@ -127,59 +90,21 @@
      */
     public void receive(MessageContext context) throws AxisFault {
         try {
-
-            log.info("starting the out flow");
-
-            // let us always start with a fresh EC
-            ExecutionChain chain = context.getExecutionChain();
-
-            // Construct the transport part of the Handlers
-            AxisTransportIn transport = context.getTransportIn();
-            if (transport != null) {
-                log.info("Using the transport" + transport.getName());
-                chain.addPhases(transport.getPhases(AxisSystem.INFLOW));
-            }
-
-            //  Phase addressingPhase = new SimplePhase("addressing");
-            //addressingPhase.addHandler(new AddressingInHandler());
-            //chain.addPhase(addressingPhase);
-            //add the Global flow
-            chain.addPhases(engineContext.getPhases(AxisSystem.INFLOW));
-
-            // create a Dispatch Phase and add it to the Execution Chain
-            Phase dispatchPhase = chain.getPhase(Phase.DISPATCH_PHASE);
-            if (dispatchPhase == null) {
-                dispatchPhase = new Phase(Phase.DISPATCH_PHASE);
-            }
-
-            if (context.isServerSide()) {
-                //This chain is the default Service diaptacher, the users may opt to overide this by 
-                //adding an Handlers to the DispatchPhase. 
-                dispatchPhase.addHandler(new RequestURIBasedDispatcher());
-                AddressingBasedDispatcher dispatcher = new AddressingBasedDispatcher();
-                dispatchPhase.addHandler(dispatcher);
-
-            }
-
-            //Service handlers are added to ExecutionChain by this Handler
-            //            ServiceHandlersChainBuilder handlerChainBuilder = new ServiceHandlersChainBuilder();
-            //            dispatchPhase.addHandler(handlerChainBuilder);
-            //            chain.addPhase(dispatchPhase);
-
-            // Start rolling the Service Handlers will,be added by the Dispatcher
-            chain.invoke(context);
-
+            SystemContext sysCtx = context.getSystemContext();
+            ArrayList phases = sysCtx.getEngineConfig().getInPhasesUptoAndIncludingPostDispatch();
+            invokePhases(phases, context);
+            
+            OperationContext operationContext = context.getOperationContext();
+            phases = operationContext.getAxisOperation().getPhasesInOutFlow();
+            invokePhases(phases, context);
             if (context.isServerSide()) {
                 // add invoke Phase
                 MessageReceiver reciver =
                     context.getOperationContext().getAxisOperation().getMessageReciever();
                 reciver.recieve(context);
             }
-
-            log.info("ending the out flow");
         } catch (Throwable e) {
             handleFault(context, e);
-
         }
     }
 
@@ -216,25 +141,19 @@
             body.addFault(new AxisFault(e.getMessage(), e));
             faultContext.setEnvelope(envelope);
 
-            ExecutionChain chain = faultContext.getExecutionChain();
-
-            ServiceContext serviceContext = context.getOperationContext().getServiceContext();
-            if (serviceContext != null) {
-                //                chain.addPhases(serviceContext.getPhases(EngineConfiguration.FAULT_IN_FLOW));
-                // TODO : Fix me Srinath
-                throw new UnsupportedOperationException();
+            OperationContext opContext  = context.getOperationContext();
+            if(opContext == null){
+                AxisOperation axisOperation = opContext.getAxisOperation();
+                ArrayList phases = axisOperation.getPhasesInFaultOutFlow();
+                invokePhases(phases, context);
             }
-
-            chain.invoke(faultContext);
-            // send the error
+            // Write the the error
             TransportSender sender = context.getTransportOut().getSender();
             sender.invoke(faultContext);
         } else if (!serverSide) {
-
             // if at the client side throw the exception
             throw new AxisFault("", e);
         } else {
-
             // TODO log and exit
             log.error("Error in fault flow", e);
         }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/MessageSender.java Wed May 11 23:53:25 2005
@@ -19,9 +19,9 @@
 import java.io.InputStream;
 
 import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContext;
+import org.apache.axis.context.SystemContext;
 
 /**
  * Class Sender

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/RequestURIBasedDispatcher.java Wed May 11 23:53:25 2005
@@ -18,8 +18,8 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;
 import org.apache.axis.description.HandlerMetadata;

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=169783&r1=169782&r2=169783&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 Wed May 11 23:53:25 2005
@@ -15,14 +15,26 @@
 */
 package org.apache.axis.phaseresolver;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.context.SystemContext;
-import org.apache.axis.description.*;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.description.AxisModule;
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.description.AxisTransportIn;
+import org.apache.axis.description.AxisTransportOut;
+import org.apache.axis.description.Flow;
+import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.AxisSystemImpl;
-
-import javax.xml.namespace.QName;
-import java.util.*;
 
 /**
  * Class PhaseResolver

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java Wed May 11 23:53:25 2005
@@ -19,18 +19,10 @@
 
 import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisOperation;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.om.OMAbstractFactory;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.SOAPFactory;
-import org.apache.axis.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.wsdl.WSDLService;
 
 /**
  * This is a Simple java Provider.

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/TransportReceiver.java Wed May 11 23:53:25 2005
@@ -16,8 +16,8 @@
 package org.apache.axis.transport;
 
 
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisFault;
 
 /**

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Wed May 11 23:53:25 2005
@@ -37,9 +37,9 @@
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.SessionContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.om.SOAPEnvelope;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java Wed May 11 23:53:25 2005
@@ -25,8 +25,8 @@
 
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.om.SOAPEnvelope;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java Wed May 11 23:53:25 2005
@@ -28,8 +28,8 @@
 import org.apache.axis.Constants;
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisTransportOut;
 import org.apache.axis.engine.AxisFault;
 import org.apache.commons.logging.Log;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java Wed May 11 23:53:25 2005
@@ -31,8 +31,8 @@
 import org.apache.axis.Constants;
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.om.SOAPEnvelope;

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=169783&r1=169782&r2=169783&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 Wed May 11 23:53:25 2005
@@ -18,10 +18,6 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.Constants;
-import org.apache.axis.addressing.AddressingConstants;
-import org.apache.axis.addressing.MessageInformationHeadersCollection;
-import org.apache.axis.addressing.miheaders.RelatesTo;
-import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisOperation;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java Wed May 11 23:53:25 2005
@@ -22,9 +22,9 @@
 
 import org.apache.axis.addressing.AddressingConstants;
 import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.description.AxisOperation;
 import org.apache.axis.description.AxisService;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java Wed May 11 23:53:25 2005
@@ -17,9 +17,9 @@
 package org.apache.axis.engine;
 
 import org.apache.axis.AbstractTestCase;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.context.OperationContextFactory;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.om.OMAbstractFactory;
 import org.apache.axis.om.SOAPFactory;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/InvalidPhaseRuleTest.java Wed May 11 23:53:25 2005
@@ -1,5 +1,9 @@
 package org.apache.axis.phaserule;
 
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.AbstractTestCase;
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.description.HandlerMetadata;
@@ -8,9 +12,6 @@
 import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.Handler;
 import org.apache.axis.phaseresolver.PhaseHolder;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/phaserule/PreDispatchPhaseRuleTest.java Wed May 11 23:53:25 2005
@@ -1,16 +1,17 @@
 package org.apache.axis.phaserule;
 
+import java.util.ArrayList;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axis.AbstractTestCase;
-import org.apache.axis.phaseresolver.PhaseHolder;
 import org.apache.axis.description.AxisGlobal;
 import org.apache.axis.description.HandlerMetadata;
 import org.apache.axis.description.PhaseRule;
 import org.apache.axis.engine.AxisSystem;
 import org.apache.axis.engine.AxisSystemImpl;
 import org.apache.axis.engine.Handler;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
+import org.apache.axis.phaseresolver.PhaseHolder;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java Wed May 11 23:53:25 2005
@@ -17,25 +17,9 @@
 package encoding.sample1;
 import java.lang.reflect.Method;
 
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
 import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisOperation;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMAbstractFactory;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.SOAPFactory;
-import org.apache.axis.testUtils.ArrayTypeEncoder;
-import org.apache.axis.testUtils.Encoder;
-import org.apache.axis.testUtils.ObjectToOMBuilder;
 import org.apache.axis.testUtils.SimpleJavaProvider;
-import org.apache.axis.testUtils.SimpleTypeEncoder;
-import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
-import org.apache.axis.util.Utils;
 
 public class EchoProvider extends SimpleJavaProvider {
 

Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java Wed May 11 23:53:25 2005
@@ -16,22 +16,14 @@
  
 package org.apache.axis.testUtils;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axis.Constants;
 import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisOperation;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.om.OMAbstractFactory;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.SOAPFactory;
 import org.apache.axis.receivers.AbstractInOutSyncMessageReceiver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Wed May 11 23:53:25 2005
@@ -22,8 +22,8 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.context.EngineContextFactory;
-import org.apache.axis.context.SystemContext;
 import org.apache.axis.context.ServiceContext;
+import org.apache.axis.context.SystemContext;
 import org.apache.axis.engine.AxisFault;
 import org.apache.axis.transport.http.SimpleHTTPServer;
 

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDL2Java.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDL2Java.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDL2Java.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/WSDL2Java.java Wed May 11 23:53:25 2005
@@ -2,7 +2,6 @@
 
 import org.apache.axis.wsdl.codegen.CodeGenerationEngine;
 import org.apache.axis.wsdl.codegen.CommandLineOptionConstants;
-import org.apache.axis.wsdl.codegen.CommandLineOptionConstants;
 import org.apache.axis.wsdl.codegen.CommandLineOptionParser;
 
 /**

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenConfiguration.java Wed May 11 23:53:25 2005
@@ -18,8 +18,6 @@
 
 import java.io.File;
 
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
 import org.apache.wsdl.WSDLDescription;
 
 /**

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CodeGenerationEngine.java Wed May 11 23:53:25 2005
@@ -26,19 +26,12 @@
 import javax.wsdl.WSDLException;
 
 import org.apache.axis.wsdl.builder.WOMBuilderFactory;
+import org.apache.axis.wsdl.codegen.emitter.CSharpEmitter;
 import org.apache.axis.wsdl.codegen.emitter.ClientJavaEmitter;
 import org.apache.axis.wsdl.codegen.emitter.Emitter;
-import org.apache.axis.wsdl.codegen.emitter.Emitter;
-import org.apache.axis.wsdl.codegen.emitter.CSharpEmitter;
-import org.apache.axis.wsdl.codegen.extension.AxisBindingBuilder;
+import org.apache.axis.wsdl.codegen.emitter.JavaEmitter;
 import org.apache.axis.wsdl.codegen.extension.AxisBindingBuilder;
 import org.apache.axis.wsdl.codegen.extension.CodeGenExtention;
-import org.apache.axis.wsdl.codegen.extension.CodeGenExtention;
-import org.apache.axis.wsdl.codegen.emitter.CSharpEmitter;
-import org.apache.axis.wsdl.codegen.emitter.JavaEmitter;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 import org.apache.wsdl.WSDLDescription;
 
 /**

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/CommandLineOptionParser.java Wed May 11 23:53:25 2005
@@ -16,9 +16,6 @@
 
 package org.apache.axis.wsdl.codegen;
 
-import org.apache.axis.wsdl.codegen.CommandLineOption;
-import org.apache.axis.wsdl.codegen.CommandLineOptionConstants;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/CSharpEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/CSharpEmitter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/CSharpEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/CSharpEmitter.java Wed May 11 23:53:25 2005
@@ -3,9 +3,9 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis.wsdl.databinding.CsharpTypeMapper;
 import org.apache.axis.wsdl.databinding.TypeMapper;
-import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 import org.apache.crimson.tree.XmlDocument;
 import org.apache.wsdl.WSDLBinding;
 import org.apache.wsdl.WSDLInterface;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientInterfaceWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientInterfaceWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientInterfaceWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientInterfaceWriter.java Wed May 11 23:53:25 2005
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 
 import org.apache.axis.wsdl.databinding.TypeMapper;
-import org.apache.axis.wsdl.codegen.emitter.ClassWriterConstants;
 import org.apache.wsdl.WSDLConstants;
 import org.apache.wsdl.WSDLInterface;
 import org.apache.wsdl.WSDLOperation;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientJavaEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientJavaEmitter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientJavaEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientJavaEmitter.java Wed May 11 23:53:25 2005
@@ -18,12 +18,10 @@
 
 import java.io.IOException;
 
-import org.apache.axis.wsdl.databinding.DefaultTypeMapper;
 import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis.wsdl.codegen.CodeGenerationException;
 import org.apache.axis.wsdl.codegen.extension.AxisBindingBuilder;
-import org.apache.axis.wsdl.codegen.emitter.ClientInterfaceWriter;
-import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
+import org.apache.axis.wsdl.databinding.DefaultTypeMapper;
 import org.apache.wsdl.WSDLBinding;
 
 /**

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientStubWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientStubWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/ClientStubWriter.java Wed May 11 23:53:25 2005
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 
 import org.apache.axis.wsdl.databinding.TypeMapper;
-import org.apache.axis.wsdl.codegen.emitter.ClassWriterConstants;
 import org.apache.wsdl.WSDLInterface;
 import org.apache.wsdl.WSDLOperation;
 

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/JavaEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/JavaEmitter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/JavaEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/JavaEmitter.java Wed May 11 23:53:25 2005
@@ -2,22 +2,17 @@
 
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Enumeration;
 
-import org.apache.axis.wsdl.databinding.JavaTypeMapper;
-import org.apache.axis.wsdl.databinding.TypeMapper;
 import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis.wsdl.codegen.CodeGenerationException;
+import org.apache.axis.wsdl.databinding.JavaTypeMapper;
+import org.apache.axis.wsdl.databinding.TypeMapper;
 import org.apache.crimson.tree.XmlDocument;
 import org.apache.wsdl.WSDLBinding;
 import org.apache.wsdl.WSDLInterface;
 import org.apache.wsdl.WSDLOperation;
-import org.apache.wsdl.WSDLExtensibilityElement;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
-
-import javax.wsdl.extensions.UnknownExtensibilityElement;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Wed May 11 23:53:25 2005
@@ -4,21 +4,18 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 
-import org.apache.axis.wsdl.databinding.TypeMapper;
 import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 import org.apache.axis.wsdl.codegen.CodeGenerationException;
-import org.apache.axis.wsdl.codegen.CodeGenerationException;
-import org.apache.axis.wsdl.codegen.emitter.Emitter;
-import org.apache.axis.wsdl.codegen.extension.AxisBindingBuilder;
 import org.apache.axis.wsdl.codegen.extension.AxisBindingBuilder;
+import org.apache.axis.wsdl.codegen.writer.BeanWriter;
 import org.apache.axis.wsdl.codegen.writer.ClassWriter;
-import org.apache.axis.wsdl.codegen.writer.InterfaceWriter;
 import org.apache.axis.wsdl.codegen.writer.InterfaceImplementationWriter;
-import org.apache.axis.wsdl.codegen.writer.BeanWriter;
+import org.apache.axis.wsdl.codegen.writer.InterfaceWriter;
+import org.apache.axis.wsdl.databinding.TypeMapper;
 import org.apache.crimson.tree.XmlDocument;
 import org.apache.wsdl.WSDLBinding;
 import org.apache.wsdl.WSDLOperation;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AbstractCodeGenerationExtension.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AbstractCodeGenerationExtension.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AbstractCodeGenerationExtension.java Wed May 11 23:53:25 2005
@@ -17,7 +17,6 @@
 package org.apache.axis.wsdl.codegen.extension;
 
 import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 
 /**
  * @author chathura@opensource.lk

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/AxisBindingBuilder.java Wed May 11 23:53:25 2005
@@ -19,7 +19,6 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis.wsdl.codegen.extension.AbstractCodeGenerationExtension;
 import org.apache.wsdl.WSDLBinding;
 import org.apache.wsdl.WSDLDescription;
 import org.apache.wsdl.WSDLInterface;

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/PolicyEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/PolicyEvaluator.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/PolicyEvaluator.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/extension/PolicyEvaluator.java Wed May 11 23:53:25 2005
@@ -17,8 +17,6 @@
 package org.apache.axis.wsdl.codegen.extension;
 
 import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
-import org.apache.axis.wsdl.codegen.extension.CodeGenExtention;
-import org.apache.axis.wsdl.codegen.CodeGenConfiguration;
 
 
 /**

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/BeanWriter.java Wed May 11 23:53:25 2005
@@ -1,8 +1,8 @@
 package org.apache.axis.wsdl.codegen.writer;
 
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
 import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/ClassWriter.java Wed May 11 23:53:25 2005
@@ -4,10 +4,9 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 
+import org.apache.axis.wsdl.codegen.XSLTConstants;
 import org.apache.axis.wsdl.util.FileWriter;
 import org.apache.axis.wsdl.util.XSLTTemplateProcessor;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceImplementationWriter.java Wed May 11 23:53:25 2005
@@ -1,10 +1,8 @@
 package org.apache.axis.wsdl.codegen.writer;
 
-import org.apache.axis.wsdl.codegen.writer.ClassWriter;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
 import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/codegen/writer/InterfaceWriter.java Wed May 11 23:53:25 2005
@@ -1,10 +1,8 @@
 package org.apache.axis.wsdl.codegen.writer;
 
-import org.apache.axis.wsdl.codegen.writer.ClassWriter;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
-
 import java.io.File;
+
+import org.apache.axis.wsdl.codegen.XSLTConstants;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/databinding/JavaTypeMapper.java Wed May 11 23:53:25 2005
@@ -1,8 +1,9 @@
 package org.apache.axis.wsdl.databinding;
 
-import javax.xml.namespace.QName;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import javax.xml.namespace.QName;
 
 
 /*

Modified: webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java (original)
+++ webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis/wsdl/util/FileWriter.java Wed May 11 23:53:25 2005
@@ -4,7 +4,6 @@
 import java.io.IOException;
 
 import org.apache.axis.wsdl.codegen.XSLTConstants;
-import org.apache.axis.wsdl.codegen.XSLTConstants;
 
 /*
 * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java Wed May 11 23:53:25 2005
@@ -27,13 +27,11 @@
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.SOAPFactory;
 import org.apache.axis.om.SOAPHeader;
+import org.apache.axis.om.impl.llom.exception.OMBuilderException;
 import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.soap.SOAPEnvelopeImpl;
-import org.apache.axis.om.impl.llom.exception.OMBuilderException;
 import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 import org.apache.axis.om.impl.llom.soap.soap12.SOAP12Constants;
-import org.apache.axis.om.impl.llom.soap.soap12.SOAP12Constants;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java Wed May 11 23:53:25 2005
@@ -10,14 +10,13 @@
 import org.apache.axis.om.SOAPHeader;
 import org.apache.axis.om.SOAPHeaderBlock;
 import org.apache.axis.om.impl.llom.OMNamespaceImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPBodyImpl;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.soap.SOAPEnvelopeImpl;
 import org.apache.axis.om.impl.llom.soap.SOAPFaultImpl;
 import org.apache.axis.om.impl.llom.soap.SOAPHeaderBlockImpl;
 import org.apache.axis.om.impl.llom.soap.SOAPHeaderImpl;
 import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.SOAPBodyImpl;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
-import org.apache.axis.om.impl.llom.soap.*;
 
 /**
  * Copyright 2001-2004 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPBodyImpl.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPBodyImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPBodyImpl.java Wed May 11 23:53:25 2005
@@ -22,9 +22,8 @@
 import org.apache.axis.om.SOAPBody;
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.SOAPFault;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 import org.apache.axis.om.impl.llom.OMElementImpl;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 
 /**
  * Class SOAPBodyImpl

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPEnvelopeImpl.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPEnvelopeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPEnvelopeImpl.java Wed May 11 23:53:25 2005
@@ -24,7 +24,6 @@
 import org.apache.axis.om.SOAPBody;
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.SOAPHeader;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.OMElementImpl;
 
 /**

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPFaultImpl.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPFaultImpl.java Wed May 11 23:53:25 2005
@@ -39,13 +39,10 @@
 import org.apache.axis.om.SOAPFaultReason;
 import org.apache.axis.om.SOAPFaultRole;
 import org.apache.axis.om.SOAPText;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
-import org.apache.axis.om.impl.llom.soap.SOAPFaulReasonImpl;
 import org.apache.axis.om.impl.llom.OMElementImpl;
 import org.apache.axis.om.impl.llom.OMNamespaceImpl;
 import org.apache.axis.om.impl.llom.OMTextImpl;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 
 /**
  * Class SOAPFaultImpl

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderBlockImpl.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderBlockImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderBlockImpl.java Wed May 11 23:53:25 2005
@@ -22,12 +22,10 @@
 import org.apache.axis.om.OMNamespace;
 import org.apache.axis.om.OMXMLParserWrapper;
 import org.apache.axis.om.SOAPHeaderBlock;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
-import org.apache.axis.om.impl.llom.OMElementImpl;
 import org.apache.axis.om.impl.llom.OMAttributeImpl;
+import org.apache.axis.om.impl.llom.OMElementImpl;
 import org.apache.axis.om.impl.llom.OMNamespaceImpl;
+import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 
 /**
  * Class SOAPHeaderBlockImpl

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderImpl.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/SOAPHeaderImpl.java Wed May 11 23:53:25 2005
@@ -28,12 +28,9 @@
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.SOAPHeader;
 import org.apache.axis.om.SOAPHeaderBlock;
+import org.apache.axis.om.impl.llom.OMElementImpl;
 import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
 import org.apache.axis.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
-import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
-import org.apache.axis.om.impl.llom.soap.SOAPHeaderBlockImpl;
-import org.apache.axis.om.impl.llom.OMElementImpl;
 
 /**
  * Class SOAPHeaderImpl

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap/soap11/SOAP11Constants.java Wed May 11 23:53:25 2005
@@ -1,7 +1,6 @@
 package org.apache.axis.om.impl.llom.soap.soap11;
 
 import org.apache.axis.om.impl.llom.soap.SOAPConstants;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 
 /**
  * Copyright 2001-2004 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMChildrenQNameIteratorTest.java Wed May 11 23:53:25 2005
@@ -21,8 +21,8 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
+import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.traverse.OMChildrenQNameIterator;
 
 public class OMChildrenQNameIteratorTest extends AbstractTestCase {

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java?rev=169783&r1=169782&r2=169783&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java Wed May 11 23:53:25 2005
@@ -30,7 +30,6 @@
 import org.apache.axis.om.SOAPHeaderBlock;
 import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 import org.apache.axis.om.impl.llom.soap.soap11.SOAP11Constants;
-import org.apache.axis.om.impl.llom.soap.SOAPConstants;
 
 /**
  * User: Eran Chinthaka (eran.chinthaka@gmail.com)