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 ch...@apache.org on 2005/07/27 10:08:21 UTC

svn commit: r225478 [3/4] - in /webservices/axis/trunk/java/modules: addressing/src/org/apache/axis2/handlers/addressing/ addressing/test/org/apache/axis2/handlers/addressing/ common/src/org/apache/axis2/ common/src/org/apache/axis2/i18n/ core/src/org/...

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java Wed Jul 27 00:57:39 2005
@@ -15,13 +15,13 @@
 */
 package org.apache.axis2.transport.http;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.SessionContext;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -56,12 +56,11 @@
             ServletContext context = config.getServletContext();
             String repoDir = context.getRealPath("/WEB-INF");
             ConfigurationContextFactory erfac =
-                new ConfigurationContextFactory();
+                    new ConfigurationContextFactory();
             configContext =
-                erfac.buildConfigurationContext(repoDir);
-            configContext.setProperty(
-                Constants.CONTAINER_MANAGED,
-                Constants.VALUE_TRUE);
+                    erfac.buildConfigurationContext(repoDir);
+            configContext.setProperty(Constants.CONTAINER_MANAGED,
+                    Constants.VALUE_TRUE);
             configContext.setRootDir(new File(context.getRealPath("/WEB-INF")));
             lister = new ListingAgent(configContext);
             context.setAttribute(CONFIGURATION_CONTEXT, configContext);
@@ -78,22 +77,19 @@
      * @throws ServletException
      * @throws IOException
      */
-    protected void doGet(
-        HttpServletRequest httpServletRequest,
-        HttpServletResponse httpServletResponse)
-        throws ServletException, IOException {
+    protected void doGet(HttpServletRequest httpServletRequest,
+                         HttpServletResponse httpServletResponse)
+            throws ServletException, IOException {
         httpServletResponse.setContentType("text/xml; charset=utf-8");
         MessageContext msgContext = null;
         OutputStream out = null;
         try {
             Object sessionContext =
-                httpServletRequest.getSession().getAttribute(
-                    Constants.SESSION_CONTEXT_PROPERTY);
+                    httpServletRequest.getSession().getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
             if (sessionContext == null) {
                 sessionContext = new SessionContext(null);
-                httpServletRequest.getSession().setAttribute(
-                    Constants.SESSION_CONTEXT_PROPERTY,
-                    sessionContext);
+                httpServletRequest.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
+                        sessionContext);
             }
 
             Enumeration enu = httpServletRequest.getParameterNames();
@@ -105,41 +101,35 @@
             }
 
             msgContext =
-                new MessageContext(
-                    configContext,
-                    (SessionContext) sessionContext,
-                    configContext.getAxisConfiguration().getTransportIn(
-                        new QName(Constants.TRANSPORT_HTTP)),
-                    configContext.getAxisConfiguration().getTransportOut(
-                        new QName(Constants.TRANSPORT_HTTP)));
+                    new MessageContext(configContext,
+                            (SessionContext) sessionContext,
+                            configContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+                            configContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
             msgContext.setDoingREST(true);
             msgContext.setServerSide(true);
-            msgContext.setProperty(
-                HTTPConstants.HTTPOutTransportInfo,
-                new ServletBasedOutTransportInfo(httpServletResponse));
-            msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,getTransportHeaders(httpServletRequest));    
-                
+            msgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
+                    new ServletBasedOutTransportInfo(httpServletResponse));
+            msgContext.setProperty(MessageContext.TRANSPORT_HEADERS, getTransportHeaders(httpServletRequest));
+
             out = httpServletResponse.getOutputStream();
             boolean processed =
-                HTTPTransportUtils.processHTTPGetRequest(
-                    msgContext,
-                    httpServletRequest.getInputStream(),
-                    out,
-                    httpServletRequest.getContentType(),
-                    httpServletRequest.getHeader(
-                        HTTPConstants.HEADER_SOAP_ACTION),
-                    httpServletRequest.getRequestURL().toString(),
-                    configContext,
-                    map);
+                    HTTPTransportUtils.processHTTPGetRequest(msgContext,
+                            httpServletRequest.getInputStream(),
+                            out,
+                            httpServletRequest.getContentType(),
+                            httpServletRequest.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
+                            httpServletRequest.getRequestURL().toString(),
+                            configContext,
+                            map);
             if (!processed) {
                 lister.handle(httpServletRequest, httpServletResponse, out);
             }
-        } catch (Exception e) {
+        } catch (AxisFault e) {
             if (msgContext != null) {
                 msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
                 AxisEngine engine = new AxisEngine(configContext);
                 MessageContext faultContext =
-                    engine.createFaultMessageContext(msgContext, e);
+                        engine.createFaultMessageContext(msgContext, e);
                 engine.sendFault(faultContext);
             } else {
                 throw new ServletException(e);
@@ -162,55 +152,46 @@
      * @throws IOException
      */
     protected void doPost(HttpServletRequest req, HttpServletResponse res)
-        throws ServletException, IOException {
+            throws ServletException, IOException {
         MessageContext msgContext = null;
         try {
             Object sessionContext =
-                req.getSession().getAttribute(
-                    Constants.SESSION_CONTEXT_PROPERTY);
+                    req.getSession().getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
             if (sessionContext == null) {
                 sessionContext = new SessionContext(null);
-                req.getSession().setAttribute(
-                    Constants.SESSION_CONTEXT_PROPERTY,
-                    sessionContext);
+                req.getSession().setAttribute(Constants.SESSION_CONTEXT_PROPERTY,
+                        sessionContext);
             }
             msgContext =
-                new MessageContext(
-                    configContext,
-                    (SessionContext) sessionContext,
-                    configContext.getAxisConfiguration().getTransportIn(
-                        new QName(Constants.TRANSPORT_HTTP)),
-                    configContext.getAxisConfiguration().getTransportOut(
-                        new QName(Constants.TRANSPORT_HTTP)));
-            msgContext.setProperty(
-                HTTPConstants.HTTPOutTransportInfo,
-                new ServletBasedOutTransportInfo(res));
-            msgContext.setProperty(MessageContext.TRANSPORT_HEADERS,getTransportHeaders(req));
-                
+                    new MessageContext(configContext,
+                            (SessionContext) sessionContext,
+                            configContext.getAxisConfiguration().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+                            configContext.getAxisConfiguration().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+            msgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
+                    new ServletBasedOutTransportInfo(res));
+            msgContext.setProperty(MessageContext.TRANSPORT_HEADERS, getTransportHeaders(req));
+
             res.setContentType("text/xml; charset=utf-8");
-            HTTPTransportUtils.processHTTPPostRequest(
-                msgContext,
-                req.getInputStream(),
-                res.getOutputStream(),
-                req.getContentType(),
-                req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
-                req.getRequestURL().toString(),
-                configContext);
+            HTTPTransportUtils.processHTTPPostRequest(msgContext,
+                    req.getInputStream(),
+                    res.getOutputStream(),
+                    req.getContentType(),
+                    req.getHeader(HTTPConstants.HEADER_SOAP_ACTION),
+                    req.getRequestURL().toString(),
+                    configContext);
             Object contextWritten =
-                msgContext.getOperationContext().getProperty(
-                    Constants.RESPONSE_WRITTEN);
+                    msgContext.getOperationContext().getProperty(Constants.RESPONSE_WRITTEN);
             if (contextWritten == null
-                || !Constants.VALUE_TRUE.equals(contextWritten)) {
+                    || !Constants.VALUE_TRUE.equals(contextWritten)) {
                 res.setStatus(HttpServletResponse.SC_ACCEPTED);
             }
         } catch (AxisFault e) {
             if (msgContext != null) {
-                msgContext.setProperty(
-                    MessageContext.TRANSPORT_OUT,
-                    res.getOutputStream());
+                msgContext.setProperty(MessageContext.TRANSPORT_OUT,
+                        res.getOutputStream());
                 AxisEngine engine = new AxisEngine(configContext);
                 MessageContext faultContext =
-                    engine.createFaultMessageContext(msgContext, e);
+                        engine.createFaultMessageContext(msgContext, e);
                 engine.sendFault(faultContext);
             } else {
                 throw new ServletException(e);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Wed Jul 27 00:57:39 2005
@@ -17,6 +17,7 @@
 package org.apache.axis2.transport.http;
 
 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.context.ConfigurationContext;
@@ -24,7 +25,6 @@
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.OMElement;
@@ -194,7 +194,7 @@
             }
         }
 
-        public void writeRequest(OutputStream out) throws IOException {
+        public void writeRequest(OutputStream out) throws IOException{
             try {
                 if (chuncked || doingMTOM) {
                     omOutput.setOutputStream(out, doingMTOM);
@@ -213,7 +213,7 @@
                 throw new AxisFault(e);
             } catch (IOException e) {
                 throw new AxisFault(e);
-            }
+            } 
         }
 
         public long getContentLength() {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java Wed Jul 27 00:57:39 2005
@@ -18,8 +18,8 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.AxisFault;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -214,7 +214,7 @@
      *
      * @param terminal
      * @return
-     * @throws AxisFault
+     * @throws org.apache.axis2.AxisFault
      */
     private String readFirstLineArg(char terminal) throws AxisFault {
         StringBuffer str = new StringBuffer();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportSender.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportSender.java Wed Jul 27 00:57:39 2005
@@ -21,11 +21,11 @@
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.soap.impl.llom.soap11.SOAP11Constants;
 import org.apache.axis2.soap.impl.llom.soap12.SOAP12Constants;
 import org.apache.axis2.transport.AbstractTransportSender;
+import org.apache.axis2.AxisFault;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Wed Jul 27 00:57:39 2005
@@ -17,6 +17,7 @@
  */
 package org.apache.axis2.transport.http;
 
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.addressing.EndpointReference;
@@ -24,12 +25,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
-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.OMText;
+import org.apache.axis2.om.*;
 import org.apache.axis2.om.impl.llom.OMNamespaceImpl;
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
@@ -47,26 +43,20 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
+import java.io.*;
 import java.util.Iterator;
 import java.util.Map;
 
 public class HTTPTransportUtils {
 
-    public static void processHTTPPostRequest(
-        MessageContext msgContext,
-        InputStream in,
-        OutputStream out,
-        String contentType,
-        String soapActionHeader,
-        String requestURI,
-        ConfigurationContext configurationContext)
-        throws AxisFault {
+    public static void processHTTPPostRequest(MessageContext msgContext,
+                                              InputStream in,
+                                              OutputStream out,
+                                              String contentType,
+                                              String soapActionHeader,
+                                              String requestURI,
+                                              ConfigurationContext configurationContext)
+            throws AxisFault {
         try {
 
 
@@ -92,7 +82,7 @@
                 } else {
                     Reader reader = new InputStreamReader(in);
                     XMLStreamReader xmlreader =
-                        XMLInputFactory.newInstance().createXMLStreamReader(reader);
+                            XMLInputFactory.newInstance().createXMLStreamReader(reader);
                     if (contentType.indexOf(SOAP12Constants.SOAP_12_CONTENT_TYPE) > -1) {
                         //it is SOAP 1.2
                         builder = new StAXSOAPModelBuilder(xmlreader, SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
@@ -101,7 +91,7 @@
                         //it is SOAP 1.1
                         Object enable = msgContext.getProperty(Constants.Configuration.ENABLE_REST);
                         if ((soapActionHeader == null || soapActionHeader.length() == 0)
-                            && Constants.VALUE_TRUE.equals(enable)) {
+                                && Constants.VALUE_TRUE.equals(enable)) {
                             //If the content Type is text/xml (BTW which is the SOAP 1.1 Content type ) and
                             //the SOAP Action is absent it is rest !!
                             msgContext.setDoingREST(true);
@@ -110,7 +100,7 @@
                             builder.setOmbuilderFactory(soapFactory);
                             envelope = soapFactory.getDefaultEnvelope();
                             envelope.getBody().addChild(builder.getDocumentElement());
-                        }else{
+                        } else {
                             builder = new StAXSOAPModelBuilder(xmlreader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
                             envelope = (SOAPEnvelope) builder.getDocumentElement();
                         }
@@ -137,16 +127,15 @@
         }
     }
 
-    public static boolean processHTTPGetRequest(
-        MessageContext msgContext,
-        InputStream in,
-        OutputStream out,
-        String contentType,
-        String soapAction,
-        String requestURI,
-        ConfigurationContext configurationContext,
-        Map requestParameters)
-        throws AxisFault {
+    public static boolean processHTTPGetRequest(MessageContext msgContext,
+                                                InputStream in,
+                                                OutputStream out,
+                                                String contentType,
+                                                String soapAction,
+                                                String requestURI,
+                                                ConfigurationContext configurationContext,
+                                                Map requestParameters)
+            throws AxisFault {
         if (soapAction != null && soapAction.startsWith("\"") && soapAction.endsWith("\"")) {
             soapAction = soapAction.substring(1, soapAction.length() - 1);
         }
@@ -155,20 +144,16 @@
         msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO, requestURI));
         msgContext.setProperty(MessageContext.TRANSPORT_OUT, out);
         msgContext.setServerSide(true);
-        try {
-            SOAPEnvelope envelope =
+        SOAPEnvelope envelope =
                 HTTPTransportUtils.createEnvelopeFromGetRequest(requestURI, requestParameters);
-            if (envelope == null) {
-                return false;
-            } else {
-                msgContext.setDoingREST(true);
-                msgContext.setEnvelope(envelope);
-                AxisEngine engine = new AxisEngine(configurationContext);
-                engine.receive(msgContext);
-                return true;
-            }
-        } catch (IOException e) {
-            throw new AxisFault(e);
+        if (envelope == null) {
+            return false;
+        } else {
+            msgContext.setDoingREST(true);
+            msgContext.setEnvelope(envelope);
+            AxisEngine engine = new AxisEngine(configurationContext);
+            engine.receive(msgContext);
+            return true;
         }
     }
 
@@ -201,28 +186,26 @@
         }
     }
 
-    public static StAXBuilder selectBuilderForMIME(
-        MessageContext msgContext,
-        InputStream inStream,
-        String contentTypeString)
-        throws OMException, XMLStreamException, FactoryConfigurationError {
+    public static StAXBuilder selectBuilderForMIME(MessageContext msgContext,
+                                                   InputStream inStream,
+                                                   String contentTypeString)
+            throws OMException, XMLStreamException, FactoryConfigurationError {
         StAXBuilder builder = null;
 
         boolean fileCacheForAttachments =
-            (Constants
+                (Constants
                 .VALUE_TRUE
                 .equals(msgContext.getProperty(Constants.Configuration.CACHE_ATTACHMENTS)));
         String attachmentRepoDir = null;
         if (fileCacheForAttachments) {
             attachmentRepoDir =
-                (String) msgContext.getProperty(Constants.Configuration.ATTACHMENT_TEMP_DIR);
+                    (String) msgContext.getProperty(Constants.Configuration.ATTACHMENT_TEMP_DIR);
         }
 
         MIMEHelper mimeHelper =
-            new MIMEHelper(inStream, contentTypeString, fileCacheForAttachments, attachmentRepoDir);
+                new MIMEHelper(inStream, contentTypeString, fileCacheForAttachments, attachmentRepoDir);
         XMLStreamReader reader =
-            XMLInputFactory.newInstance().createXMLStreamReader(
-                new BufferedReader(new InputStreamReader(mimeHelper.getSOAPPartInputStream())));
+                XMLInputFactory.newInstance().createXMLStreamReader(new BufferedReader(new InputStreamReader(mimeHelper.getSOAPPartInputStream())));
 
         /*
          * put a reference to Attachments in to the message context
@@ -235,7 +218,7 @@
             builder = new MTOMStAXSOAPModelBuilder(reader, mimeHelper, SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
         } else if (mimeHelper.getAttachmentSpecType().equals(MIMEHelper.SWA_TYPE)) {
             builder = new StAXSOAPModelBuilder(reader, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-        } 
+        }
         return builder;
     }
 
@@ -261,11 +244,10 @@
         boolean enableMTOM = false;
         if (msgContext.getProperty(Constants.Configuration.ENABLE_MTOM) != null) {
             enableMTOM =
-                Constants.VALUE_TRUE.equals(
-                    msgContext.getProperty(Constants.Configuration.ENABLE_MTOM));
+                    Constants.VALUE_TRUE.equals(msgContext.getProperty(Constants.Configuration.ENABLE_MTOM));
         }
         boolean envelopeContainsOptimise =
-            HTTPTransportUtils.checkEnvelopeForOptimise(msgContext.getEnvelope());
+                HTTPTransportUtils.checkEnvelopeForOptimise(msgContext.getEnvelope());
         boolean doMTOM = enableMTOM && envelopeContainsOptimise;
         msgContext.setDoingMTOM(doMTOM);
         return doMTOM;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/HTTPWorker.java Wed Jul 27 00:57:39 2005
@@ -18,11 +18,11 @@
 package org.apache.axis2.transport.http;
 
 import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.util.threadpool.AxisWorker;
 import org.apache.commons.logging.Log;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/ListingAgent.java Wed Jul 27 00:57:39 2005
@@ -18,12 +18,12 @@
 package org.apache.axis2.transport.http;
 
 import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.deployment.util.PhasesInfo;
 import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 
 import javax.servlet.http.HttpServletRequest;
@@ -194,7 +194,7 @@
         res.sendRedirect(SELECT_SERVICE_JSP_NAME);
     }
 
-    private void adminLogging(HttpServletRequest req, HttpServletResponse res) throws IOException {
+    private void adminLogging(HttpServletRequest req, HttpServletResponse res) throws AxisFault, IOException {
         String username = req.getParameter("userName");
         String password = req.getParameter("password");
         if (username == null

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPOutputStream.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPOutputStream.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPOutputStream.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPOutputStream.java Wed Jul 27 00:57:39 2005
@@ -17,7 +17,7 @@
  */
 package org.apache.axis2.transport.http;
 
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -22,8 +22,8 @@
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -129,7 +129,7 @@
                             new HTTPWorker(configurationContext, socket));
                 }
             }
-        } catch (IOException e) {
+        } catch (AxisFault e) {
             log.error(e);
         }
         stop();

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Wed Jul 27 00:57:39 2005
@@ -18,13 +18,13 @@
 package org.apache.axis2.transport.local;
 
 import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/local/LocalTransportSender.java Wed Jul 27 00:57:39 2005
@@ -19,8 +19,8 @@
 
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.transport.AbstractTransportSender;
+import org.apache.axis2.AxisFault;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/EMailSender.java Wed Jul 27 00:57:39 2005
@@ -17,8 +17,8 @@
  */
 package org.apache.axis2.transport.mail;
 
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.transport.EmailReceiver;
+import org.apache.axis2.AxisFault;
 
 import javax.mail.Authenticator;
 import javax.mail.Flags;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/MailTransportSender.java Wed Jul 27 00:57:39 2005
@@ -19,10 +19,10 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.AbstractTransportSender;
 import org.apache.axis2.util.Utils;
+import org.apache.axis2.AxisFault;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -17,6 +17,7 @@
 package org.apache.axis2.transport.mail;
 
 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.context.ConfigurationContext;
@@ -24,7 +25,6 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.soap.SOAPEnvelope;

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -17,12 +17,12 @@
 package org.apache.axis2.transport.mail;
 
 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.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.EmailReceiver;
 import org.apache.axis2.transport.TransportListener;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/MailServer.java Wed Jul 27 00:57:39 2005
@@ -2,8 +2,8 @@
 
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.transport.mail.SimpleMailListener;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -1,12 +1,12 @@
 package org.apache.axis2.transport.mail.server;
 
 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.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/POP3Server.java Wed Jul 27 00:57:39 2005
@@ -1,8 +1,8 @@
 package org.apache.axis2.transport.mail.server;
 
-import org.apache.axis2.engine.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.axis2.AxisFault;
 
 import java.io.IOException;
 import java.net.ServerSocket;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/mail/server/SMTPServer.java Wed Jul 27 00:57:39 2005
@@ -1,7 +1,7 @@
 package org.apache.axis2.transport.mail.server;
 
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
 
 import java.io.IOException;
 import java.net.ServerSocket;

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -23,9 +23,9 @@
 import org.apache.axis2.deployment.DeploymentException;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.engine.AxisFault;
 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;
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPTransportSender.java Wed Jul 27 00:57:39 2005
@@ -17,10 +17,10 @@
 
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.AbstractTransportSender;
 import org.apache.axis2.util.URL;
+import org.apache.axis2.AxisFault;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java Wed Jul 27 00:57:39 2005
@@ -28,13 +28,13 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
 import org.apache.axis2.soap.SOAPEnvelope;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Wed Jul 27 00:57:39 2005
@@ -16,6 +16,7 @@
 package org.apache.axis2.util;
 
 import org.apache.axis2.Constants;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.Flow;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.OperationDescription;
@@ -24,7 +25,6 @@
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.phaseresolver.PhaseException;

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/util/threadpool/ThreadPool.java Wed Jul 27 00:57:39 2005
@@ -1,7 +1,7 @@
 package org.apache.axis2.util.threadpool;
 
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -59,7 +59,7 @@
      * This will wait till all the workers that are already handed over to the
      * thread pool get executed.
      *
-     * @throws AxisFault
+     * @throws org.apache.axis2.AxisFault
      */
     public void safeShutDown() throws AxisFault {
         synchronized (this) {

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/Handler3.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/Handler3.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/Handler3.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/Handler3.java Wed Jul 27 00:57:39 2005
@@ -17,9 +17,9 @@
 package org.apache.axis2.registry;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/org/apache/module/Module1Impl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/org/apache/module/Module1Impl.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/org/apache/module/Module1Impl.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/module1/org/apache/module/Module1Impl.java Wed Jul 27 00:57:39 2005
@@ -1,8 +1,8 @@
 package org.apache.module;
 
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.modules.Module;
+import org.apache.axis2.AxisFault;
 
 /**
  * Created by IntelliJ IDEA.

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/service1/org/apache/axis/sample/handlers/LoggingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/service1/org/apache/axis/sample/handlers/LoggingHandler.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/service1/org/apache/axis/sample/handlers/LoggingHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/service1/org/apache/axis/sample/handlers/LoggingHandler.java Wed Jul 27 00:57:39 2005
@@ -17,8 +17,8 @@
 package org.apache.axis2.sample.handlers;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/service2/Handler2.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/service2/Handler2.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/service2/Handler2.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/service2/Handler2.java Wed Jul 27 00:57:39 2005
@@ -1,11 +1,11 @@
 import javax.xml.namespace.QName;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 
 public class Handler2  extends AbstractHandler implements Handler {
     private Log log = LogFactory.getLog(getClass());

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/InavalidModuleImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/InavalidModuleImpl.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/InavalidModuleImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/InavalidModuleImpl.java Wed Jul 27 00:57:39 2005
@@ -2,7 +2,6 @@
 
 import org.apache.axis2.modules.Module;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/ModuleHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/ModuleHandler1.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/ModuleHandler1.java (original)
+++ webservices/axis/trunk/java/modules/core/test-resources/deployment/serviceModule/org/apache/axis/ModuleHandler1.java Wed Jul 27 00:57:39 2005
@@ -3,7 +3,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/ContextHierarchyTest.java Wed Jul 27 00:57:39 2005
@@ -21,7 +21,7 @@
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/context/OperationContextTest.java Wed Jul 27 00:57:39 2005
@@ -17,12 +17,12 @@
 package org.apache.axis2.context;
 
 import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.miheaders.RelatesTo;
 import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.engine.AxisFault;
 
 import javax.xml.namespace.QName;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/DeploymentTotalTest.java Wed Jul 27 00:57:39 2005
@@ -19,8 +19,8 @@
 import junit.framework.TestCase;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.phaseresolver.PhaseException;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.stream.XMLStreamException;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/SpeakingHandler.java Wed Jul 27 00:57:39 2005
@@ -17,9 +17,9 @@
 package org.apache.axis2.deployment;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/deployment/TransportDeploymentTest.java Wed Jul 27 00:57:39 2005
@@ -17,10 +17,10 @@
 package org.apache.axis2.deployment;
 
 import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.phaseresolver.PhaseException;
 
 import javax.xml.namespace.QName;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/RegistryTest.java Wed Jul 27 00:57:39 2005
@@ -17,9 +17,9 @@
 package org.apache.axis2.description;
 
 import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler.java Wed Jul 27 00:57:39 2005
@@ -17,9 +17,9 @@
 package org.apache.axis2.description;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -38,7 +38,8 @@
         return name;
     }
 
-    public void invoke(MessageContext msgContext) throws AxisFault {
+    public void invoke(MessageContext msgContext) throws
+            AxisFault {
         log.info("I am " + message + " Handler Running :)");
     }
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingHandler1.java Wed Jul 27 00:57:39 2005
@@ -17,9 +17,9 @@
 package org.apache.axis2.description;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/description/SpeakingProvider.java Wed Jul 27 00:57:39 2005
@@ -17,8 +17,8 @@
 package org.apache.axis2.description;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java Wed Jul 27 00:57:39 2005
@@ -19,6 +19,7 @@
 import junit.framework.TestCase;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
+import org.apache.axis2.AxisFault;
 
 public class AbstractEngineTest extends TestCase {
 //    protected ArrayList executedHandlers = new ArrayList();

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java Wed Jul 27 00:57:39 2005
@@ -31,6 +31,7 @@
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.transport.http.HTTPTransportSender;
+import org.apache.axis2.AxisFault;
 import org.apache.wsdl.WSDLService;
 
 import javax.xml.namespace.QName;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Wed Jul 27 00:57:39 2005
@@ -29,6 +29,7 @@
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.transport.http.HTTPTransportSender;
+import org.apache.axis2.AxisFault;
 import org.apache.wsdl.WSDLConstants;
 import org.apache.wsdl.WSDLService;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextEnabledEcho.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextEnabledEcho.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextEnabledEcho.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextEnabledEcho.java Wed Jul 27 00:57:39 2005
@@ -18,6 +18,7 @@
 
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.om.OMElement;
+import org.apache.axis2.AxisFault;
 
 /**
  * @version $Rev: $ $Date: $

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/MessageContextTest.java Wed Jul 27 00:57:39 2005
@@ -17,6 +17,7 @@
 package org.apache.axis2.engine;
 
 import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.ServiceDescription;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleEngageTest.java Wed Jul 27 00:57:39 2005
@@ -7,6 +7,7 @@
 import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.ServiceDescription;
 import org.apache.axis2.phaseresolver.PhaseException;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/misc/MiscTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/misc/MiscTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/misc/MiscTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/misc/MiscTest.java Wed Jul 27 00:57:39 2005
@@ -17,8 +17,8 @@
 package org.apache.axis2.misc;
 
 import org.apache.axis2.AbstractTestCase;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.SessionContext;
-import org.apache.axis2.engine.AxisFault;
 
 import java.lang.reflect.InvocationTargetException;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeAfterTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/BeforeWithNoFirstHandlerTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstRulesTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseFirstTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaseLastRuleTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/InvalidPhaselastTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseFirstTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseLastTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/PhaseRuleHandlers.java Wed Jul 27 00:57:39 2005
@@ -1,9 +1,9 @@
 package org.apache.axis2.phaserule;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/phaserule/SingleHandlerPhaseTest.java Wed Jul 27 00:57:39 2005
@@ -6,10 +6,10 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.PhaseRule;
 import org.apache.axis2.engine.AxisConfigurationImpl;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseHolder;
+import org.apache.axis2.AxisFault;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTrasportHeaderParsingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTrasportHeaderParsingTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTrasportHeaderParsingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/HTTPTrasportHeaderParsingTest.java Wed Jul 27 00:57:39 2005
@@ -18,7 +18,7 @@
 
 
 import org.apache.axis2.AbstractTestCase;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.http.HTTPTransportReceiver;
 

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/transport/tcp/TCPTransportTest.java Wed Jul 27 00:57:39 2005
@@ -16,10 +16,10 @@
 package org.apache.axis2.transport.tcp;
 
 import junit.framework.TestCase;
-import org.apache.axis2.engine.AxisFault;
 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.AxisFault;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;

Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis2/util/threadpool/TestThreadPool.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis2/util/threadpool/TestThreadPool.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis2/util/threadpool/TestThreadPool.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis2/util/threadpool/TestThreadPool.java Wed Jul 27 00:57:39 2005
@@ -1,7 +1,7 @@
 package org.apache.axis2.util.threadpool;
 
 import org.apache.axis2.AbstractTestCase;
-import org.apache.axis2.engine.AxisFault;
+import org.apache.axis2.AxisFault;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp (original)
+++ webservices/axis/trunk/java/modules/core/webapp/HappyAxis.jsp Wed Jul 27 00:57:39 2005
@@ -9,10 +9,11 @@
                  org.apache.axis2.om.*,
                  org.apache.axis2.Constants,
                  javax.xml.stream.XMLOutputFactory,
-                 org.apache.axis2.engine.AxisFault,
+                 org.apache.axis2.AxisFault,
                  javax.xml.stream.XMLStreamException,
                  javax.xml.namespace.QName,
-                 java.io.StringWriter"
+                 java.io.StringWriter,
+                 org.apache.axis2.AxisFault"
    session="false" %>
 <%
      /*

Modified: webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?rev=225478&r1=225477&r2=225478&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java (original)
+++ webservices/axis/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java Wed Jul 27 00:57:39 2005
@@ -16,10 +16,10 @@
 package org.apache.axis2.saaj;
 
 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.engine.AxisFault;
 
 import javax.xml.soap.SOAPConnection;
 import javax.xml.soap.SOAPException;

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -16,11 +16,11 @@
 package sample.amazon.amazonSimpleQueueService.util;
 
 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.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.om.OMElement;
 import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -16,11 +16,11 @@
 package sample.amazon.amazonSimpleQueueService.util;
 
 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.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.om.OMElement;
 import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -16,11 +16,11 @@
 package sample.amazon.amazonSimpleQueueService.util;
 
 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.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.om.OMElement;
 import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -16,11 +16,11 @@
 package sample.amazon.amazonSimpleQueueService.util;
 
 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.clientapi.Callback;
-import org.apache.axis2.engine.AxisFault;
 import org.apache.axis2.om.OMElement;
 import sample.amazon.amazonSimpleQueueService.OMElementCreator;
 

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=225478&r1=225477&r2=225478&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 Wed Jul 27 00:57:39 2005
@@ -17,12 +17,12 @@
 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.axis2.engine.AxisFault;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLOutputFactory;