commit 3827d665e787e8cd4ce633a6e54aaa10c5f8f6e2
author Robert Lazarski <robertlazarski@gmail.com> Thu Jun 02 20:48:38 2022 -0400
committer Robert Lazarski <robertlazarski@gmail.com> Thu Jun 02 20:48:38 2022 -0400
tree d6734cbd551ed102efe698ba9ba2ebaedd8cf9a0
parent 9e036b3e3887c1e0a6028135818db806b621db1e

AXIS2-4311, rename package from modules/kernel/src/org/apache/axis2/transport to modules/kernel/src/org/apache/axis2/kernel because it conflicts with modules/transport/http/src/org/apache/axis2/transport

modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java

diff --git a/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java b/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
index 7b1565b..507cdfe 100644
--- a/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
+++ b/modules/adb/src/org/apache/axis2/transport/java/JavaTransportSender.java
@@ -37,7 +37,7 @@
 import org.apache.axis2.handlers.AbstractHandler;

 import org.apache.axis2.i18n.Messages;

 import org.apache.axis2.rpc.receivers.RPCUtil;

-import org.apache.axis2.transport.TransportSender;

+import org.apache.axis2.kernel.TransportSender;

 import org.apache.axis2.wsdl.WSDLConstants;

 

 import javax.xml.namespace.QName;

modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java

diff --git a/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java b/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
index c169d35..36bddd0 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
+++ b/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
@@ -2407,13 +2407,13 @@
             methodElement.appendChild(generateOptionParamComponent(doc,
                     "org.apache.axis2.Constants.Configuration.CONTENT_TYPE",
                     "\"" +
-                            org.apache.axis2.transport.http.HTTPConstants
+                            org.apache.axis2.kernel.http.HTTPConstants
                                     .MEDIA_TYPE_X_WWW_FORM +
                             "\""));
             methodElement.appendChild(generateOptionParamComponent(doc,
                     "org.apache.axis2.Constants.Configuration.MESSAGE_TYPE",
                     "\"" +
-                            org.apache.axis2.transport.http.HTTPConstants
+                            org.apache.axis2.kernel.http.HTTPConstants
                                     .MEDIA_TYPE_X_WWW_FORM +
                             "\""));
             methodElement.appendChild(generateOptionParamComponent(doc,
@@ -2527,7 +2527,7 @@
         if (!"".equals(transferCoding)) {
             if ("gzip".equals(transferCoding) || "compress".equals(transferCoding)) {
                 methodElement.appendChild(generateOptionParamComponent(doc,
-                        "org.apache.axis2.transport.http.HTTPConstants.MC_GZIP_REQUEST",
+                        "org.apache.axis2.kernel.http.HTTPConstants.MC_GZIP_REQUEST",
                         "true"));
             }
         }

modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl

diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
index 4967f60..7bf7d97 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
+++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
@@ -482,7 +482,7 @@
                                 java.lang.Object object = fromOM(
                                              _returnEnv.getBody().getFirstElement() ,
                                              <xsl:value-of select="$outputtype"/>.class);
-                                org.apache.axis2.transport.TransportUtils.detachInputStream(_returnMessageContext);
+                                org.apache.axis2.kernel.TransportUtils.detachInputStream(_returnMessageContext);
                                <xsl:choose>
                                    <xsl:when test="$outputparamcount=1">
                                         return get<xsl:value-of select="$outputparamshorttype"/><xsl:value-of

modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java

diff --git a/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java b/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
index 1f1cc35..f2d1ecb 100644
--- a/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
+++ b/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
@@ -25,7 +25,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,7 +43,7 @@
     /**
      * Fast Infoset message formatter doesn't need to handle SOAP. Hence do nothing.
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#formatSOAPAction(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
+     * @see org.apache.axis2.kernel.MessageFormatter#formatSOAPAction(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
      */
     public String formatSOAPAction(MessageContext messageContext,
             OMOutputFormat format, String soapAction) {
@@ -54,7 +54,7 @@
     /**
      * Returns the content type
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#getContentType(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
+     * @see org.apache.axis2.kernel.MessageFormatter#getContentType(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
      */
     public String getContentType(MessageContext messageContext,
             OMOutputFormat format, String soapAction) {
@@ -77,7 +77,7 @@
      * Returns the target address to send the response
      * FIXME This is very HTTP specific. What about other transport?
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#getTargetAddress(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.net.URL)
+     * @see org.apache.axis2.kernel.MessageFormatter#getTargetAddress(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.net.URL)
      */
     public URL getTargetAddress(MessageContext messageContext,
             OMOutputFormat format, URL targetURL) throws AxisFault {
@@ -108,7 +108,7 @@
     /**
      * Write the SOAP envelop to the given OutputStream.
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#writeTo(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.io.OutputStream, boolean)
+     * @see org.apache.axis2.kernel.MessageFormatter#writeTo(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.io.OutputStream, boolean)
      */
     public void writeTo(MessageContext messageContext, OMOutputFormat format,
             OutputStream outputStream, boolean preserve) throws AxisFault {

modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java

diff --git a/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java b/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
index b4f2a20..69a14c0 100644
--- a/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
+++ b/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
@@ -25,7 +25,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,7 +43,7 @@
     /**
      * Plain Fast Infoset message formatter doesn't need to handle SOAP. Hence do nothing.
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#formatSOAPAction(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
+     * @see org.apache.axis2.kernel.MessageFormatter#formatSOAPAction(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
      */
     public String formatSOAPAction(MessageContext messageContext,
             OMOutputFormat format, String soapAction) {
@@ -54,7 +54,7 @@
     /**
      * Returns the content type
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#getContentType(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
+     * @see org.apache.axis2.kernel.MessageFormatter#getContentType(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.lang.String)
      */
     public String getContentType(MessageContext messageContext,
             OMOutputFormat format, String soapAction) {
@@ -77,7 +77,7 @@
      * Returns the target address to send the response
      * FIXME This is very HTTP specific. What about other transport?
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#getTargetAddress(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.net.URL)
+     * @see org.apache.axis2.kernel.MessageFormatter#getTargetAddress(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.net.URL)
      */
     public URL getTargetAddress(MessageContext messageContext,
             OMOutputFormat format, URL targetURL) throws AxisFault {
@@ -108,7 +108,7 @@
     /**
      * Write the SOAP envelop to the given OutputStream.
      * 
-     * @see org.apache.axis2.transport.MessageFormatter#writeTo(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.io.OutputStream, boolean)
+     * @see org.apache.axis2.kernel.MessageFormatter#writeTo(org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat, java.io.OutputStream, boolean)
      */
     public void writeTo(MessageContext messageContext, OMOutputFormat format,
             OutputStream outputStream, boolean preserve) throws AxisFault {

modules/fastinfoset/test-resources/axis2.xml

diff --git a/modules/fastinfoset/test-resources/axis2.xml b/modules/fastinfoset/test-resources/axis2.xml
index 21bc381..499c6fa 100644
--- a/modules/fastinfoset/test-resources/axis2.xml
+++ b/modules/fastinfoset/test-resources/axis2.xml
@@ -98,11 +98,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
 	<messageFormatter contentType="application/fastinfoset"
                          class="org.apache.axis2.fastinfoset.FastInfosetPOXMessageFormatter"/>
 	<messageFormatter contentType="application/soap+fastinfoset"

modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml

diff --git a/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml b/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml
index 41f7733..be7f06b 100644
--- a/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml
+++ b/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml
@@ -142,15 +142,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/integration/test/org/apache/axis2/async/AsyncService2Test.java

diff --git a/modules/integration/test/org/apache/axis2/async/AsyncService2Test.java b/modules/integration/test/org/apache/axis2/async/AsyncService2Test.java
index 47150ed..bb61621 100644
--- a/modules/integration/test/org/apache/axis2/async/AsyncService2Test.java
+++ b/modules/integration/test/org/apache/axis2/async/AsyncService2Test.java
@@ -40,7 +40,7 @@
 import org.apache.axis2.engine.util.TestConstants;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.util.threadpool.ThreadPool;
 import org.apache.commons.logging.Log;

modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java

diff --git a/modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java b/modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java
index 25533be..9be4c34 100644
--- a/modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java
+++ b/modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java
@@ -32,7 +32,7 @@
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 
 
 public class UnknownContentBuilderTest extends AbstractTestCase{

modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java

diff --git a/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java b/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
index 44753b1..6edef35 100644
--- a/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
+++ b/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
@@ -32,7 +32,7 @@
 import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.HttpTransportProperties;
 import org.apache.axis2.util.Utils;
 

modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java

diff --git a/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java b/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
index 9e1c8a0..22cad82 100644
--- a/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
+++ b/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
@@ -39,7 +39,7 @@
 import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java

diff --git a/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java b/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java
index 2265769..35887b3 100644
--- a/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java
+++ b/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java
@@ -33,7 +33,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.axis2.util.Utils;
 

modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java

diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java
index c996e21..ce2ecea 100644
--- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java
+++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java
@@ -127,9 +127,9 @@
         Map attachments = new HashMap();

         Map requestContext = dispatch.getRequestContext();

 

-//        requestContext.put(org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT , new 

+//        requestContext.put(org.apache.axis2.kernel.http.HTTPConstants.SO_TIMEOUT , new 

 //        Integer(999999));

-//        requestContext.put(org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT, new 

+//        requestContext.put(org.apache.axis2.kernel.http.HTTPConstants.CONNECTION_TIMEOUT, new 

 //        Integer(999999));

 

         requestContext.put(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS,

modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java

diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java
index f1b6ad2..28cefe1 100644
--- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java
+++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/provider/message/source/XMessageSourceProvider.java
@@ -33,7 +33,7 @@
 import javax.xml.ws.WebServiceProvider;

 import javax.xml.ws.http.HTTPBinding;

 

-import org.apache.axis2.transport.http.HTTPConstants;

+import org.apache.axis2.kernel.http.HTTPConstants;

 

 /**

  * Sample XML/HTTP String Provider 

modules/jaxws-integration/test-resources/axis2.xml

diff --git a/modules/jaxws-integration/test-resources/axis2.xml b/modules/jaxws-integration/test-resources/axis2.xml
index 0879d7c..4b920b3 100644
--- a/modules/jaxws-integration/test-resources/axis2.xml
+++ b/modules/jaxws-integration/test-resources/axis2.xml
@@ -98,11 +98,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/jaxws-integration/test-resources/axis2_addressing.xml

diff --git a/modules/jaxws-integration/test-resources/axis2_addressing.xml b/modules/jaxws-integration/test-resources/axis2_addressing.xml
index d41ce1d..3f3e00a 100644
--- a/modules/jaxws-integration/test-resources/axis2_addressing.xml
+++ b/modules/jaxws-integration/test-resources/axis2_addressing.xml
@@ -141,15 +141,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

         <messageFormatter contentType="text/xml"

-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

         <messageFormatter contentType="application/soap+xml"

-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java

diff --git a/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java b/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
index ac3673e..9cc8e08 100644
--- a/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
+++ b/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
@@ -25,7 +25,7 @@
 import org.apache.axis2.Constants;

 import org.apache.axis2.context.MessageContext;

 import org.apache.axis2.java.security.AccessController;

-import org.apache.axis2.transport.http.HTTPConstants;

+import org.apache.axis2.kernel.http.HTTPConstants;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java b/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
index 9473b85..cdf9cde 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
@@ -35,7 +35,7 @@
 import org.apache.axis2.jaxws.handler.HandlerResolverImpl;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.spi.ServiceDelegate;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.LoggingControl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java b/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
index 183049d..03e5d63 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/client/dispatch/BaseDispatch.java
@@ -44,7 +44,7 @@
 import org.apache.axis2.jaxws.spi.Constants;
 import org.apache.axis2.jaxws.spi.ServiceDelegate;
 import org.apache.axis2.jaxws.spi.migrator.ApplicationContextMigratorUtil;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Node;

modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java b/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
index 7378d65..1041a4f 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
@@ -47,7 +47,7 @@
 import org.apache.axis2.jaxws.spi.ServiceDelegate;
 import org.apache.axis2.jaxws.spi.migrator.ApplicationContextMigratorUtil;
 import org.apache.axis2.jaxws.util.WSDLExtensionUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java b/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
index 57076da..3ccc288 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
@@ -38,7 +38,7 @@
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.server.endpoint.lifecycle.impl.EndpointLifecycleManagerImpl;
 import org.apache.axis2.jaxws.utility.JavaUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java b/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
index 79922f2..9224c49 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
@@ -28,7 +28,7 @@
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.axis2.jaxws.message.util.MessageUtils;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;

modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java b/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
index b7cd527..a4a4a1c 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
@@ -47,7 +47,7 @@
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
 import org.apache.axis2.jaxws.util.Constants;
 import org.apache.axis2.jaxws.utility.ClassUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.HttpTransportProperties;
 import org.apache.axis2.transport.http.impl.httpclient4.HttpTransportPropertiesImpl;
 import org.apache.axis2.util.ThreadContextMigratorUtil;

modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java b/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
index 9d118ce..a264d99 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
@@ -22,7 +22,7 @@
 import org.apache.axis2.i18n.Messages;

 import org.apache.axis2.jaxws.ExceptionFactory;

 import org.apache.axis2.jaxws.core.MessageContext;

-import org.apache.axis2.transport.http.HTTPConstants;

+import org.apache.axis2.kernel.http.HTTPConstants;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java b/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java
index 707c4e7..e73e9ba 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/Attachment.java
@@ -24,7 +24,7 @@
 import org.apache.axis2.jaxws.description.AttachmentDescription;

 import org.apache.axis2.jaxws.i18n.Messages;

 import org.apache.axis2.jaxws.utility.ConvertUtils;

-import org.apache.axis2.transport.http.HTTPConstants;

+import org.apache.axis2.kernel.http.HTTPConstants;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

 

modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageFactoryImpl.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageFactoryImpl.java b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageFactoryImpl.java
index a49f3df..23ae11f 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageFactoryImpl.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageFactoryImpl.java
@@ -31,7 +31,7 @@
 import org.apache.axis2.jaxws.message.databinding.SOAPEnvelopeBlock;
 import org.apache.axis2.jaxws.message.databinding.DataSourceBlock;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.WrappedDataHandler;
 
 import javax.xml.soap.AttachmentPart;

modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java b/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
index 608bb09..2168395 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
@@ -36,7 +36,7 @@
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
 import org.apache.axis2.jaxws.utility.JavaUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java b/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
index b1a797c..4d2f7b7 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
@@ -42,7 +42,7 @@
 import org.apache.axis2.jaxws.message.util.MessageUtils;
 import org.apache.axis2.jaxws.registry.InvocationListenerRegistry;
 import org.apache.axis2.jaxws.util.Constants;
-import org.apache.axis2.transport.RequestResponseTransport;
+import org.apache.axis2.kernel.RequestResponseTransport;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.ThreadContextMigratorUtil;
 import org.apache.commons.logging.Log;

modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java b/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
index 620df9c..93a16cf 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaDispatcher.java
@@ -33,7 +33,7 @@
 import org.apache.axis2.jaxws.server.InvocationListenerBean;
 import org.apache.axis2.jaxws.utility.ClassUtils;
 import org.apache.axis2.jaxws.utility.JavaUtils;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java

diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java b/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
index 1acb522..3efa326 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
@@ -26,9 +26,9 @@
 import org.apache.axis2.AxisFault;

 import org.apache.axis2.jaxws.handler.AttachmentsAdapter;

 import org.apache.axis2.jaxws.message.databinding.DataSourceBlock;

-import org.apache.axis2.transport.MessageFormatter;

-import org.apache.axis2.transport.http.ApplicationXMLFormatter;

-import org.apache.axis2.transport.http.util.URLTemplatingUtil;

+import org.apache.axis2.kernel.MessageFormatter;

+import org.apache.axis2.kernel.http.ApplicationXMLFormatter;

+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;

 import org.apache.axis2.util.WrappedDataHandler;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

modules/jaxws/test-resources/axis2.xml

diff --git a/modules/jaxws/test-resources/axis2.xml b/modules/jaxws/test-resources/axis2.xml
index 30f0843..55c1697 100644
--- a/modules/jaxws/test-resources/axis2.xml
+++ b/modules/jaxws/test-resources/axis2.xml
@@ -88,11 +88,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchSharedSessionTest.java

diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchSharedSessionTest.java b/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchSharedSessionTest.java
index 3eb9a65..f04bb2a 100644
--- a/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchSharedSessionTest.java
+++ b/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchSharedSessionTest.java
@@ -34,7 +34,7 @@
 import org.apache.axis2.jaxws.client.InterceptableClientTestCase;
 import org.apache.axis2.jaxws.client.TestClientInvocationController;
 import org.apache.axis2.jaxws.core.InvocationContext;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 
 
 public class DispatchSharedSessionTest extends InterceptableClientTestCase {

modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxySharedSessionTest.java

diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxySharedSessionTest.java b/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxySharedSessionTest.java
index cd8830b..9f1bf1c 100644
--- a/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxySharedSessionTest.java
+++ b/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxySharedSessionTest.java
@@ -40,7 +40,7 @@
 import org.apache.axis2.jaxws.client.TestClientInvocationController;
 import org.apache.axis2.jaxws.core.InvocationContext;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 
 /**
  * Testing shared session property

modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java

diff --git a/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java b/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
index ec08832..768f8dc 100644
--- a/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
+++ b/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
@@ -28,8 +28,8 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URIEncoderDecoder;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.http.util.URIEncoderDecoder;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;

modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java

diff --git a/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java b/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
index 7551bd5..af3af85 100644
--- a/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
+++ b/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
@@ -27,7 +27,7 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.builder.Builder;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.util.URIEncoderDecoder;
+import org.apache.axis2.kernel.http.util.URIEncoderDecoder;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;

modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java

diff --git a/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java b/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
index 6c42c44..b58cb6a 100644
--- a/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
+++ b/modules/json/src/org/apache/axis2/json/gson/JsonFormatter.java
@@ -28,7 +28,7 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.json.factory.JsonConstant;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java

diff --git a/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java b/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java
index 1936873..475d20f 100644
--- a/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java
+++ b/modules/json/src/org/apache/axis2/json/moshi/JsonFormatter.java
@@ -32,7 +32,7 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.json.factory.JsonConstant;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/json/test/org/apache/axis2/json/Echo.java

diff --git a/modules/json/test/org/apache/axis2/json/Echo.java b/modules/json/test/org/apache/axis2/json/Echo.java
index 6beb61f..36315d4 100644
--- a/modules/json/test/org/apache/axis2/json/Echo.java
+++ b/modules/json/test/org/apache/axis2/json/Echo.java
@@ -23,7 +23,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
 
 public class Echo {

modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java

diff --git a/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java b/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java
index 0e46994..a70a72b 100644
--- a/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java
+++ b/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java
@@ -36,8 +36,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.builder.Builder;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.SOAPMessageFormatter;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.http.SOAPMessageFormatter;
 import org.codehaus.jettison.json.JSONException;
 import org.xml.sax.SAXException;
 

modules/kernel/conf/axis2.xml

diff --git a/modules/kernel/conf/axis2.xml b/modules/kernel/conf/axis2.xml
index 80b6923..d57b3ad 100644
--- a/modules/kernel/conf/axis2.xml
+++ b/modules/kernel/conf/axis2.xml
@@ -167,15 +167,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/kernel/src/org/apache/axis2/Constants.java

diff --git a/modules/kernel/src/org/apache/axis2/Constants.java b/modules/kernel/src/org/apache/axis2/Constants.java
index 7d950dc..c02c509 100644
--- a/modules/kernel/src/org/apache/axis2/Constants.java
+++ b/modules/kernel/src/org/apache/axis2/Constants.java
@@ -22,7 +22,7 @@
 
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 
 /**
  * Class Constants
@@ -409,7 +409,7 @@
         /**
          * This is used to specify the message format which the message needs to be serializes.
          *
-         * @see org.apache.axis2.transport.MessageFormatter
+         * @see org.apache.axis2.kernel.MessageFormatter
          */
         public static final String MESSAGE_TYPE = "messageType";
         

modules/kernel/src/org/apache/axis2/builder/Builder.java

diff --git a/modules/kernel/src/org/apache/axis2/builder/Builder.java b/modules/kernel/src/org/apache/axis2/builder/Builder.java
index 20e0a30..205ebea 100644
--- a/modules/kernel/src/org/apache/axis2/builder/Builder.java
+++ b/modules/kernel/src/org/apache/axis2/builder/Builder.java
@@ -28,7 +28,7 @@
 
 /**
  * Message builder able to convert a byte stream into a SOAP infoset.
- * Message builders are used by {@link org.apache.axis2.transport.TransportListener}
+ * Message builders are used by {@link org.apache.axis2.kernel.TransportListener}
  * implementations to process the raw payload of the message and turn it into SOAP.
  * Transports should use
  * {@link MessageProcessorSelector#getMessageBuilder(String, MessageContext)}

modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java

diff --git a/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java b/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
index 99be383..09f34ea 100644
--- a/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
+++ b/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
@@ -47,7 +47,7 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.java.security.AccessController;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.MessageProcessorSelector;
 import org.apache.axis2.util.MultipleEntryHashMap;

modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java b/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java
index 37b29f7..99d7389 100644
--- a/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java
@@ -32,7 +32,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.MultipleEntryHashMap;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileUploadException;

modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java b/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java
index 10aec9b..7b46673 100644
--- a/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java
@@ -35,7 +35,7 @@
 import org.apache.axis2.description.WSDL20DefaultValueHolder;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.http.util.URIEncoderDecoder;
+import org.apache.axis2.kernel.http.util.URIEncoderDecoder;
 import org.apache.axis2.util.MultipleEntryHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -352,4 +352,4 @@
             throw new AxisFault(Messages.getMessage("invalidSOAPversion"));
         }
     }
-}
\ No newline at end of file
+}

modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentOMDataSource.java

diff --git a/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentOMDataSource.java b/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentOMDataSource.java
index 8b307f7..075a4aa 100644
--- a/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentOMDataSource.java
+++ b/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentOMDataSource.java
@@ -34,7 +34,7 @@
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 
 public class UnknownContentOMDataSource implements OMDataSource {
 

modules/kernel/src/org/apache/axis2/client/Options.java

diff --git a/modules/kernel/src/org/apache/axis2/client/Options.java b/modules/kernel/src/org/apache/axis2/client/Options.java
index dbd93e9..8aed71a 100644
--- a/modules/kernel/src/org/apache/axis2/client/Options.java
+++ b/modules/kernel/src/org/apache/axis2/client/Options.java
@@ -36,7 +36,7 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.MetaDataEntry;
 import org.apache.axis2.util.Utils;
@@ -756,14 +756,14 @@
      * <h3>HTTP Constants</h3>
      * <ul>
      * <a name="CHUNKED"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.CHUNKED</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.CHUNKED</b>
      * <p>This will enable/disable chunking support. </p>
      * <p/>
      * <p>Possible values are:</p>
      * <pre>"true"/"false" or Boolean.TRUE/Boolean.FALSE</pre>
      * </li>
      * <p><a name="NTLM"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.NTLM_AUTHENTICATION</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.NTLM_AUTHENTICATION</b>
      * <p>This enables the user to pass in NTLM authentication information, such as host, port, realm, username, password to be used with HTTP transport sender. </p>
      * <p>The value should always be an instance of:  </p>
      * <pre>org.apache.axis2.transport.http.HttpTransportProperties.
@@ -771,7 +771,7 @@
      * </li>
      * <p/>
      * <p><a name="PROXY"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.PROXY</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.PROXY</b>
      * <p>This enables the user to pass in proxy information, such as proxy host name, port, domain, username, password to be used with HTTP transport sender. </p>
      * <p>The value should always be an instance of:</p>
      * <pre>org.apache.axis2.transport.http.HttpTransportProperties.ProxyProperties</pre>
@@ -780,38 +780,38 @@
      * <pre>org.apache.axis2.transport.http.HttpTransportProperties.BasicAuthentication</pre>
      * </li>
      * <p><a name="SO_TIMEOUT"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.SO_TIMEOUT</b>
      * <p>This enables the user to pass in socket timeout value as an Integer. If nothing is set, the default value is 60000 milliseconds.</p>
      * </li>
      * <p><a name="CON_TIMEOUT"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.CONNECTION_TIMEOUT</b>
      * <p/>
      * <p>This enables the user to pass in connection timeout value as an Integer. If nothing is set, the default value is 60000 milliseconds.</p>
      * </li>
      * <p><a name="USER_AGENT"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.USER_AGENT</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.USER_AGENT</b>
      * <p>This enables the user to set the user agent header in the outgoing HTTP request. Default value is "Axis2"</p>
      * </li>
      * <p><a name="GZIP"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.MC_GZIP_REQUEST</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.MC_GZIP_REQUEST</b>
      * <p>If set this will GZip your request and send over to the destination. Before doing this, you must make sure that the receiving end supports GZip compressed streams. <br></p>
      * <p/>
      * <p>Possible values are: </p>
      * <pre>"true"/"false" or Boolean.TRUE/Boolean.FALSE</pre>
      * </li>
      * <p><a name="ACCEPT_GZIP"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.MC_ACCEPT_GZIP</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.MC_ACCEPT_GZIP</b>
      * <p>Whether or not you send a gzip-ped request, you can choose to receive GZIP back from the server using this flag.</p>
      * <p>Possible values are: </p>
      * <pre>"true"/"false" or Boolean.TRUE/Boolean.FALSE</pre>
      * </li>
      * <p/>
      * <p><a name="COOKIE"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.COOKIE_STRING</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.COOKIE_STRING</b>
      * <p>This enables the user to set the cookie string header in the outgoing HTTP request.</p>
      * </li>
      * <p><a name="HTTP_PROTOCOL_VERSION"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.HTTP_PROTOCOL_VERSION</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.HTTP_PROTOCOL_VERSION</b>
      * <p>This will set the HTTP protocol version to be used in sending the SOAP requests. </p>
      * <p>Possible values are :</p>
      * <pre>
@@ -820,17 +820,17 @@
      * HTTP/1.0 - HTTPConstants.HEADER_PROTOCOL_10
      * </pre><p>    Default is to use HTTP/1.1.</li>
      * <p><a name="HTTP_HEADERS"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.HTTP_HEADERS</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.HTTP_HEADERS</b>
      * <p>You might sometimes want to send your own custom HTTP headers. You can set an ArrayList filled with </p>
      * <pre>org.apache.commons.httpclient.Header</pre><p> objects using the above property. You must not try to override the Headers the Axis2 engine is setting to the outgoing message.</p>
      * </li>
      * <p><a name="REUSE_HTTP_CLIENT"></a></p>
      * <p/>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.REUSE_HTTP_CLIENT</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.REUSE_HTTP_CLIENT</b>
      * <p>You might want to use the same HTTPClient instance for multiple invocations. This flag will notify the engine to use the same HTTPClient between invocations.</p>
      * </li>
      * <p><a name="CACHED_HTTP_CLIENT"></a></p>
-     * <li><b>org.apache.axis2.transport.http.HTTPConstants.CACHED_HTTP_CLIENT</b>
+     * <li><b>org.apache.axis2.kernel.http.HTTPConstants.CACHED_HTTP_CLIENT</b>
      * <p>If user had requested to re-use an HTTPClient using the above property, this property can be used to set a custom HTTPClient to be re-used.</p>
      * </li>
      * </ul>

modules/kernel/src/org/apache/axis2/client/Stub.java

diff --git a/modules/kernel/src/org/apache/axis2/client/Stub.java b/modules/kernel/src/org/apache/axis2/client/Stub.java
index 9f379f1..adb5ffc 100644
--- a/modules/kernel/src/org/apache/axis2/client/Stub.java
+++ b/modules/kernel/src/org/apache/axis2/client/Stub.java
@@ -41,7 +41,7 @@
 import org.apache.axis2.description.OutOnlyAxisOperation;
 import org.apache.axis2.description.RobustOutOnlyAxisOperation;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 
 import java.util.ArrayList;
 import java.util.Iterator;

modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java

diff --git a/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java b/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
index 04626e1..9a5f443 100644
--- a/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
+++ b/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
@@ -32,7 +32,7 @@
 import org.apache.axis2.engine.DependencyManager;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.modules.Module;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.util.Loader;
 import org.apache.axis2.util.SessionUtils;
 import org.apache.commons.logging.Log;

modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java

diff --git a/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java b/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java
index 997bbb5..fdfc5b5 100644
--- a/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java
+++ b/modules/kernel/src/org/apache/axis2/context/externalize/ActivateUtils.java
@@ -39,7 +39,7 @@
 import org.apache.axis2.description.WSDL11ToAllAxisServicesBuilder;

 import org.apache.axis2.engine.AxisConfiguration;

 import org.apache.axis2.engine.Handler;

-import org.apache.axis2.transport.TransportListener;

+import org.apache.axis2.kernel.TransportListener;

 import org.apache.axis2.util.MetaDataEntry;

 import org.apache.axis2.wsdl.WSDLConstants;

 import org.apache.commons.logging.Log;

modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java

diff --git a/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java b/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
index 78c9066..4e8dc8c 100644
--- a/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
+++ b/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
@@ -31,7 +31,7 @@
 import org.apache.axis2.Constants;

 import org.apache.axis2.builder.BuilderUtil;

 import org.apache.axis2.context.MessageContext;

-import org.apache.axis2.transport.MessageFormatter;

+import org.apache.axis2.kernel.MessageFormatter;

 import org.apache.axis2.util.MessageProcessorSelector;

 import org.apache.commons.logging.Log;

 import org.apache.commons.logging.LogFactory;

modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java b/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
index c7d6148..367ad3a 100644
--- a/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
@@ -43,9 +43,9 @@
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.phaseresolver.PhaseException;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.Loader;
 import org.apache.axis2.util.PolicyUtil;

modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java b/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
index 7234b70..f5bb35e 100644
--- a/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
@@ -38,7 +38,7 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axis2.util.Loader;
 import org.apache.axis2.util.XMLUtils;
 import org.apache.commons.logging.Log;

modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

diff --git a/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java b/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
index 7133f58..a580497 100644
--- a/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
+++ b/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
@@ -28,7 +28,7 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisConfigurator;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.Loader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml

diff --git a/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml b/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
index 2c37fa8..8f6bcbf 100644
--- a/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
+++ b/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
@@ -106,15 +106,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java

diff --git a/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java b/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
index 5662706..3e20a03 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
@@ -26,7 +26,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.util.WSDLSerializationUtil;
 import org.apache.commons.logging.Log;

modules/kernel/src/org/apache/axis2/description/AxisService.java

diff --git a/modules/kernel/src/org/apache/axis2/description/AxisService.java b/modules/kernel/src/org/apache/axis2/description/AxisService.java
index 0fa8fc6..a89454e 100644
--- a/modules/kernel/src/org/apache/axis2/description/AxisService.java
+++ b/modules/kernel/src/org/apache/axis2/description/AxisService.java
@@ -56,7 +56,7 @@
 import org.apache.axis2.engine.ServiceLifeCycle;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.phaseresolver.PhaseResolver;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.util.IOUtils;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.Loader;

modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java

diff --git a/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java b/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
index b36442f..d3120f7 100644
--- a/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
+++ b/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
@@ -39,8 +39,8 @@
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.CallbackReceiver;
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.wsdl.WSDLConstants;

modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java

diff --git a/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java b/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
index 56d3e9f..42fb5d5 100644
--- a/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
+++ b/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
@@ -27,8 +27,8 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.Utils;
 
 import javax.xml.namespace.QName;

modules/kernel/src/org/apache/axis2/description/TransportInDescription.java

diff --git a/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java b/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
index 8e2b989..725a11a 100644
--- a/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
+++ b/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
@@ -26,7 +26,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 
 /**
  * Represents an incoming transport deployed in Axis2.

modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java

diff --git a/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java b/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java
index 5e0bb50..de41e6f 100644
--- a/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java
+++ b/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java
@@ -24,7 +24,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.engine.Phase;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportSender;
 
 import java.util.ArrayList;
 

modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java b/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
index 7554452..9ba96d1 100644
--- a/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
@@ -30,7 +30,7 @@
 import org.apache.axis2.addressing.EndpointReferenceHelper;
 import org.apache.axis2.addressing.wsdl.WSDL11ActionHelper;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.LoggingControl;
 import org.apache.axis2.util.PolicyUtil;
 import org.apache.axis2.util.XMLUtils;

modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java b/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
index 5f8b520..39ff639 100644
--- a/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
@@ -24,7 +24,7 @@
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.namespace.Constants;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.wsdl.HTTPHeaderMessage;
 import org.apache.axis2.wsdl.SOAPHeaderMessage;
 import org.apache.axis2.wsdl.SOAPModuleMessage;

modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java

diff --git a/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java b/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
index 66cbd29..5a58882 100644
--- a/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
+++ b/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
@@ -28,7 +28,7 @@
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.engine.AbstractDispatcher;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java

diff --git a/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java b/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
index 03cc8c4..ae9b4df 100644
--- a/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
+++ b/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
@@ -64,7 +64,7 @@
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
 import org.apache.axis2.phaseresolver.PhaseResolver;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axis2.util.TargetResolver;
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.util.FaultyServiceData;

modules/kernel/src/org/apache/axis2/engine/AxisEngine.java

diff --git a/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java b/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
index 766976a..284811f 100644
--- a/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
+++ b/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
@@ -41,7 +41,7 @@
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.engine.Handler.InvocationResponse;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.util.CallbackReceiver;
 import org.apache.axis2.util.LoggingControl;
 import org.apache.axis2.util.MessageContextBuilder;

modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java

diff --git a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
index 148470c..24a96b0 100644
--- a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
+++ b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
@@ -37,9 +37,9 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.RequestResponseTransport;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.RequestResponseTransport;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/kernel/src/org/apache/axis2/engine/ListenerManager.java

diff --git a/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java b/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
index 6d13263..eee2c4f 100644
--- a/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
+++ b/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
@@ -26,8 +26,8 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.util.OnDemandLogger;
 
 import java.util.HashMap;
@@ -240,7 +240,7 @@
      *
      * <p>It is not possible to add a listener which is already initialized but not started to the
      * listener manager, even though the above is a condition that has to be satisfied there is no
-     * means of enforcing that, becuase the {@link org.apache.axis2.transport.TransportListener}
+     * means of enforcing that, because the {@link org.apache.axis2.kernel.TransportListener}
      * API doesn't provide a mechanism to test whether it is initialized or started.</p>
      *
      * <p>If the caller is using an already intialized listener, then it is the responsability of

modules/kernel/src/org/apache/axis2/kernel/MessageFormatter.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java b/modules/kernel/src/org/apache/axis2/kernel/MessageFormatter.java
similarity index 96%
rename from modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
rename to modules/kernel/src/org/apache/axis2/kernel/MessageFormatter.java
index d02823e..5271b32 100644
--- a/modules/kernel/src/org/apache/axis2/transport/MessageFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/MessageFormatter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axis2.AxisFault;
@@ -38,7 +38,7 @@
  * <p/>
  * <messageFormatters>
  * <messageFormatter contentType="application/soap+xml"
- * class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ * class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
  * </messageFormatters>
  * </p>
  */

modules/kernel/src/org/apache/axis2/kernel/OutTransportInfo.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/OutTransportInfo.java b/modules/kernel/src/org/apache/axis2/kernel/OutTransportInfo.java
similarity index 95%
rename from modules/kernel/src/org/apache/axis2/transport/OutTransportInfo.java
rename to modules/kernel/src/org/apache/axis2/kernel/OutTransportInfo.java
index 7bd8ec9..49cf7d4 100644
--- a/modules/kernel/src/org/apache/axis2/transport/OutTransportInfo.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/OutTransportInfo.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 public interface OutTransportInfo {
     public abstract void setContentType(String contentType);

modules/kernel/src/org/apache/axis2/kernel/RequestResponseTransport.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java b/modules/kernel/src/org/apache/axis2/kernel/RequestResponseTransport.java
similarity index 99%
rename from modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java
rename to modules/kernel/src/org/apache/axis2/kernel/RequestResponseTransport.java
index 1ff54e3..0268536 100644
--- a/modules/kernel/src/org/apache/axis2/transport/RequestResponseTransport.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/RequestResponseTransport.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;

modules/kernel/src/org/apache/axis2/kernel/SimpleAxis2Server.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java b/modules/kernel/src/org/apache/axis2/kernel/SimpleAxis2Server.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
rename to modules/kernel/src/org/apache/axis2/kernel/SimpleAxis2Server.java
index 03c5500..2c57cad 100755
--- a/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/SimpleAxis2Server.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.engine.AxisServer;

modules/kernel/src/org/apache/axis2/kernel/TransportListener.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/TransportListener.java b/modules/kernel/src/org/apache/axis2/kernel/TransportListener.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/TransportListener.java
rename to modules/kernel/src/org/apache/axis2/kernel/TransportListener.java
index 48105e2..5cb9756 100644
--- a/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/TransportListener.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;

modules/kernel/src/org/apache/axis2/kernel/TransportSender.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/TransportSender.java b/modules/kernel/src/org/apache/axis2/kernel/TransportSender.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/TransportSender.java
rename to modules/kernel/src/org/apache/axis2/kernel/TransportSender.java
index 32ba68e..4a47825 100644
--- a/modules/kernel/src/org/apache/axis2/transport/TransportSender.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/TransportSender.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;

modules/kernel/src/org/apache/axis2/kernel/TransportUtils.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java b/modules/kernel/src/org/apache/axis2/kernel/TransportUtils.java
similarity index 99%
rename from modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
rename to modules/kernel/src/org/apache/axis2/kernel/TransportUtils.java
index f147a25..ab9c80d 100644
--- a/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/TransportUtils.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.axis2.transport;
+package org.apache.axis2.kernel;
 
 import org.apache.axiom.attachments.Attachments;
 import org.apache.axiom.attachments.CachedFileDataSource;
@@ -42,7 +42,7 @@
 import org.apache.axis2.deployment.DeploymentConstants;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.MessageProcessorSelector;
 import org.apache.axis2.wsdl.WSDLConstants;

modules/kernel/src/org/apache/axis2/kernel/http/ApplicationXMLFormatter.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java b/modules/kernel/src/org/apache/axis2/kernel/http/ApplicationXMLFormatter.java
similarity index 96%
rename from modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/ApplicationXMLFormatter.java
index 5b70e27..0d21773 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/ApplicationXMLFormatter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
@@ -27,8 +27,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java b/modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java
similarity index 99%
rename from modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java
index 3a97a78..b6cc840 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/HTTPConstants.java
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import java.io.UnsupportedEncodingException;
 

modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java b/modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
similarity index 97%
rename from modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
index 5834fac..4c8cab3 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/MultipartFormDataFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/MultipartFormDataFormatter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import org.apache.axiom.mime.Header;
 import org.apache.axiom.om.OMAbstractFactory;
@@ -27,8 +27,8 @@
 import org.apache.axiom.om.impl.OMMultipartWriter;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 
 import java.io.IOException;
 import java.io.OutputStream;

modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java b/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
index 8e47543..82a6756 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/SOAPMessageFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import org.apache.axiom.attachments.Attachments;
 import org.apache.axiom.om.OMContainer;
@@ -31,8 +31,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;

modules/kernel/src/org/apache/axis2/kernel/http/XFormURLEncodedFormatter.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java b/modules/kernel/src/org/apache/axis2/kernel/http/XFormURLEncodedFormatter.java
similarity index 96%
rename from modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/XFormURLEncodedFormatter.java
index 9a7f425..3a36c79 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/XFormURLEncodedFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/XFormURLEncodedFormatter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
@@ -25,8 +25,8 @@
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 import org.apache.axis2.util.JavaUtils;
 
 import java.io.IOException;

modules/kernel/src/org/apache/axis2/kernel/http/util/ComplexPart.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java b/modules/kernel/src/org/apache/axis2/kernel/http/util/ComplexPart.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/util/ComplexPart.java
index 2bdffc6..a4eaa1b 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/util/ComplexPart.java
@@ -17,7 +17,7 @@
  * under the License.

  */

 

-package org.apache.axis2.transport.http.util;

+package org.apache.axis2.kernel.http.util;

 

 //import org.apache.commons.httpclient.methods.multipart.PartBase;

 //import org.apache.commons.httpclient.util.EncodingUtil;

modules/kernel/src/org/apache/axis2/kernel/http/util/QueryStringParser.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java b/modules/kernel/src/org/apache/axis2/kernel/http/util/QueryStringParser.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/util/QueryStringParser.java
index 73182b2..26f44fb 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/util/QueryStringParser.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.axis2.transport.http.util;
+package org.apache.axis2.kernel.http.util;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;

modules/kernel/src/org/apache/axis2/kernel/http/util/URIEncoderDecoder.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/util/URIEncoderDecoder.java b/modules/kernel/src/org/apache/axis2/kernel/http/util/URIEncoderDecoder.java
similarity index 99%
rename from modules/kernel/src/org/apache/axis2/transport/http/util/URIEncoderDecoder.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/util/URIEncoderDecoder.java
index 7719eb0..7ddc118 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/util/URIEncoderDecoder.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/util/URIEncoderDecoder.java
@@ -17,7 +17,7 @@
  * under the License.

  */

 

-package org.apache.axis2.transport.http.util;

+package org.apache.axis2.kernel.http.util;

 

 import java.io.ByteArrayOutputStream;

 import java.io.UnsupportedEncodingException;

@@ -209,4 +209,4 @@
         return result.toString();

     }

 

-}
\ No newline at end of file
+}

modules/kernel/src/org/apache/axis2/kernel/http/util/URLTemplatingUtil.java

diff --git a/modules/kernel/src/org/apache/axis2/transport/http/util/URLTemplatingUtil.java b/modules/kernel/src/org/apache/axis2/kernel/http/util/URLTemplatingUtil.java
similarity index 98%
rename from modules/kernel/src/org/apache/axis2/transport/http/util/URLTemplatingUtil.java
rename to modules/kernel/src/org/apache/axis2/kernel/http/util/URLTemplatingUtil.java
index 0001539..de6f5be 100644
--- a/modules/kernel/src/org/apache/axis2/transport/http/util/URLTemplatingUtil.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/util/URLTemplatingUtil.java
@@ -17,7 +17,7 @@
  * under the License.

  */

 

-package org.apache.axis2.transport.http.util;

+package org.apache.axis2.kernel.http.util;

 

 import org.apache.axiom.om.OMElement;

 import org.apache.axis2.AxisFault;

modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java

diff --git a/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java b/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
index 8256e76..514045d 100644
--- a/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
+++ b/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
@@ -49,7 +49,7 @@
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.*;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java

diff --git a/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java b/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java
index 0f831e8..f13720b 100644
--- a/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java
+++ b/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java
@@ -25,11 +25,11 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.http.ApplicationXMLFormatter;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.transport.http.SOAPMessageFormatter;
-import org.apache.axis2.transport.http.XFormURLEncodedFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.http.ApplicationXMLFormatter;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.http.SOAPMessageFormatter;
+import org.apache.axis2.kernel.http.XFormURLEncodedFormatter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -201,4 +201,4 @@
         return cType;
     }
 
-}
\ No newline at end of file
+}

modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java

diff --git a/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java b/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
index 981c663..ae7aa8b 100644
--- a/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
+++ b/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
@@ -28,7 +28,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/kernel/src/org/apache/axis2/util/Utils.java

diff --git a/modules/kernel/src/org/apache/axis2/util/Utils.java b/modules/kernel/src/org/apache/axis2/util/Utils.java
index 6898c2d..962a17d 100644
--- a/modules/kernel/src/org/apache/axis2/util/Utils.java
+++ b/modules/kernel/src/org/apache/axis2/util/Utils.java
@@ -50,8 +50,8 @@
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/kernel/src/org/apache/axis2/util/WSDL20Util.java

diff --git a/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java b/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java
index ff47b68..57acfad 100644
--- a/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java
+++ b/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java
@@ -26,7 +26,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.WSDL20DefaultValueHolder;
 import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.transport.http.util.URIEncoderDecoder;
+import org.apache.axis2.kernel.http.util.URIEncoderDecoder;
 import org.apache.woden.wsdl20.extensions.http.HTTPLocation;
 import org.apache.woden.wsdl20.extensions.http.HTTPLocationTemplate;
 import org.apache.woden.wsdl20.extensions.soap.SOAPFaultCode;

modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml

diff --git a/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml b/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
index 28fbd83..7bed1c5 100644
--- a/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
+++ b/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
@@ -98,11 +98,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/kernel/test-resources/deployment/axis2_a.xml

diff --git a/modules/kernel/test-resources/deployment/axis2_a.xml b/modules/kernel/test-resources/deployment/axis2_a.xml
index d8d43dc..6dab46a 100644
--- a/modules/kernel/test-resources/deployment/axis2_a.xml
+++ b/modules/kernel/test-resources/deployment/axis2_a.xml
@@ -86,11 +86,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/kernel/test-resources/deployment/exculeRepo/axis2.xml

diff --git a/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml b/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml
index 2e4114a..d7b3b8d 100644
--- a/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml
+++ b/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml
@@ -98,11 +98,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml

diff --git a/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml b/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
index 99a41fc..b6967ed 100644
--- a/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
+++ b/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
@@ -122,7 +122,7 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
     <!-- ================================================= -->
     <!-- Transport Ins -->

modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml

diff --git a/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml b/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml
index 2e4114a..d7b3b8d 100644
--- a/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml
+++ b/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml
@@ -98,11 +98,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml

diff --git a/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml b/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml
index 4e02e38..2643af8 100644
--- a/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml
+++ b/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml
@@ -97,11 +97,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml

diff --git a/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml b/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
index 270535b..00e96cc 100644
--- a/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
+++ b/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
@@ -98,11 +98,11 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java

diff --git a/modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java b/modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java
index 34298df..1ea192c 100644
--- a/modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java
+++ b/modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java
@@ -25,7 +25,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.SessionContext;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 
 public class DummyTransportListener implements TransportListener {
     public void init(ConfigurationContext axisConf, TransportInDescription transprtIn) throws AxisFault {

modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java

diff --git a/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java b/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
index 6a54cfe..184ebe0 100644
--- a/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
+++ b/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
@@ -45,7 +45,7 @@
         AxisConfiguration axisConfig = fsc.getAxisConfiguration();
         String className =
                 axisConfig.getMessageFormatter("application/soap+xml").getClass().getName();
-        assertEquals("org.apache.axis2.transport.http.SOAPMessageFormatter", className);
+        assertEquals("org.apache.axis2.kernel.http.SOAPMessageFormatter", className);
     }
 
     public void testBuilderSelectionInvalidEntry() throws AxisFault {

modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java

diff --git a/modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java b/modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java
index 88fffca..43cb5f8 100644
--- a/modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java
+++ b/modules/kernel/test/org/apache/axis2/transport/http/MultipartFormDataFormatterTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java

diff --git a/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java b/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
index 77a6bc6..c40c5bb 100644
--- a/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
+++ b/modules/kernel/test/org/apache/axis2/transport/http/SOAPMessageFormatterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import java.io.ByteArrayOutputStream;
 

modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java

diff --git a/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java b/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
index fb45df8..1f78126 100644
--- a/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
+++ b/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axis2.transport.http;
+package org.apache.axis2.kernel.http;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java

diff --git a/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java b/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
index 4366e40..7f4a4a9 100644
--- a/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
+++ b/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.axis2.transport.http.util;
+package org.apache.axis2.kernel.http.util;
 
 import junit.framework.TestCase;
 

modules/kernel/test/org/apache/axis2/transport/http/util/URLTemplatingUtilTest.java

diff --git a/modules/kernel/test/org/apache/axis2/transport/http/util/URLTemplatingUtilTest.java b/modules/kernel/test/org/apache/axis2/transport/http/util/URLTemplatingUtilTest.java
index a44fb25..cd8b263 100644
--- a/modules/kernel/test/org/apache/axis2/transport/http/util/URLTemplatingUtilTest.java
+++ b/modules/kernel/test/org/apache/axis2/transport/http/util/URLTemplatingUtilTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.transport.http.util;
+package org.apache.axis2.kernel.http.util;
 
 import junit.framework.TestCase;
 import org.apache.axiom.om.OMAbstractFactory;

modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java

diff --git a/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java b/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
index 11b5a86..c6f263a 100644
--- a/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
+++ b/modules/metadata/src/org/apache/axis2/jaxws/description/builder/JAXWSRIWSDLGenerator.java
@@ -33,7 +33,7 @@
 import org.apache.axis2.jaxws.catalog.impl.OASISCatalogManager;
 import org.apache.axis2.jaxws.description.EndpointDescription;
 import org.apache.axis2.jaxws.util.CatalogURIResolver;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.SchemaUtil;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.wsdl.WSDLUtil;
@@ -691,4 +691,4 @@
         return exists;
     }
     
-}
\ No newline at end of file
+}

modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml

diff --git a/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml b/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
index 8fb19bc..b7fe8b7 100644
--- a/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
+++ b/modules/osgi/resources/org/apache/axis2/osgi/deployment/axis2.xml
@@ -123,15 +123,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

         <messageFormatter contentType="text/xml"

-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

         <messageFormatter contentType="application/soap+xml"

-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiConfigurationContextFactory.java

diff --git a/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiConfigurationContextFactory.java b/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiConfigurationContextFactory.java
index 28a3ef6..5f2b353 100644
--- a/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiConfigurationContextFactory.java
+++ b/modules/osgi/src/org/apache/axis2/osgi/deployment/OSGiConfigurationContextFactory.java
@@ -29,9 +29,9 @@
 import org.apache.axis2.osgi.deployment.tracker.BundleTracker;
 import org.apache.axis2.osgi.deployment.tracker.WSTracker;
 import org.apache.axis2.osgi.tx.HttpListener;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.*;

modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java

diff --git a/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java b/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java
index d71f14d..f67f6d8 100644
--- a/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java
+++ b/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java
@@ -15,7 +15,7 @@
  */
 package org.apache.axis2.osgi.tx;
 
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.SessionContext;
 import org.apache.axis2.context.MessageContext;

modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java

diff --git a/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java b/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
index 1a61c40..4f6d9c1 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
@@ -23,7 +23,7 @@
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.util.base64.Base64Utils;
 import org.apache.axis2.saaj.util.SAAJDataSource;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 
 import javax.activation.DataHandler;
 import javax.xml.soap.AttachmentPart;

modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java

diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
index 9f6e49e..fe5609c 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
@@ -41,7 +41,7 @@
 import org.apache.axis2.saaj.util.IDGenerator;
 import org.apache.axis2.saaj.util.SAAJUtil;
 import org.apache.axis2.saaj.util.UnderstandAllHeadersHandler;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.wsdl.WSDLConstants;
 
 import javax.activation.DataHandler;

modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java

diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
index b15d38c..6d252a3 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
@@ -30,7 +30,7 @@
 import org.apache.axiom.soap.SOAPVersion;
 import org.apache.axiom.util.UIDGenerator;
 import org.apache.axis2.saaj.util.SAAJUtil;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 
 import javax.xml.soap.AttachmentPart;
 import javax.xml.soap.MimeHeader;

modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java

diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
index 5225613..ec78009 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
@@ -29,7 +29,7 @@
 import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axis2.saaj.util.IDGenerator;
 import org.apache.axis2.saaj.util.SAAJUtil;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Attr;

modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java

diff --git a/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java b/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
index cd020d7..24576a1 100644
--- a/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
+++ b/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
@@ -24,7 +24,7 @@
 import org.apache.axiom.mime.ContentType;
 import org.apache.axiom.mime.MediaType;
 import org.apache.axis2.saaj.util.SAAJDataSource;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml

diff --git a/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml b/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
index fceda4d..fd4f586 100644
--- a/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
+++ b/modules/samples/java_first_jaxws/src/webapp/WEB-INF/axis2.xml
@@ -133,15 +133,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

         <messageFormatter contentType="text/xml"

-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

         <messageFormatter contentType="application/soap+xml"

-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml

diff --git a/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml b/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
index 2a06d01..d9e8372 100644
--- a/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
+++ b/modules/samples/jaxws-samples/src/webapp/WEB-INF/axis2.xml
@@ -132,15 +132,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->

     <messageFormatters>

         <messageFormatter contentType="application/x-www-form-urlencoded"

-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>

+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>

         <messageFormatter contentType="multipart/form-data"

-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>

+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>

         <messageFormatter contentType="application/xml"

-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>

+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>

         <messageFormatter contentType="text/xml"

-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

         <messageFormatter contentType="application/soap+xml"

-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>

+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>

     </messageFormatters>

 

     <!-- ================================================= -->

modules/samples/json/resources/axis2.xml

diff --git a/modules/samples/json/resources/axis2.xml b/modules/samples/json/resources/axis2.xml
index 67003c2..edf0707 100644
--- a/modules/samples/json/resources/axis2.xml
+++ b/modules/samples/json/resources/axis2.xml
@@ -165,15 +165,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
 
 	<messageFormatter contentType="application/json-impl"
 			class="org.apache.axis2.json.gson.JsonFormatter" />

modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml

diff --git a/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml b/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml
index 923c0d5..7fb2f70 100644
--- a/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml
+++ b/modules/samples/transport/https-sample/httpsService/src/main/webapp/WEB-INF/axis2.xml
@@ -168,15 +168,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml

diff --git a/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml b/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml
index 937fad1..35e6280 100644
--- a/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml
+++ b/modules/samples/transport/jms-sample/jmsService/src/main/resources/axis2.xml
@@ -169,15 +169,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/samples/userguide/conf/axis2.xml

diff --git a/modules/samples/userguide/conf/axis2.xml b/modules/samples/userguide/conf/axis2.xml
index 15d7beb..87d214d 100644
--- a/modules/samples/userguide/conf/axis2.xml
+++ b/modules/samples/userguide/conf/axis2.xml
@@ -102,13 +102,13 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="application/echo+xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml

diff --git a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml
index dd06722..de8fe7d 100644
--- a/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml
+++ b/modules/samples/userguide/src/userguide/springbootdemo/resources-axis2/conf/axis2.xml
@@ -167,15 +167,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/json"
                           class="org.apache.axis2.json.moshi.JsonFormatter"/>
     </messageFormatters>

modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/webservices/secure/LoginService.java

diff --git a/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/webservices/secure/LoginService.java b/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/webservices/secure/LoginService.java
index 7bddf44..12447c6 100644
--- a/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/webservices/secure/LoginService.java
+++ b/modules/samples/userguide/src/userguide/springbootdemo/src/main/java/userguide/springboot/webservices/secure/LoginService.java
@@ -41,7 +41,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.owasp.esapi.ESAPI;
 import org.owasp.esapi.Validator;

modules/samples/yahoojsonsearch/resources/axis2.xml

diff --git a/modules/samples/yahoojsonsearch/resources/axis2.xml b/modules/samples/yahoojsonsearch/resources/axis2.xml
index 591efb3..2d0279a 100644
--- a/modules/samples/yahoojsonsearch/resources/axis2.xml
+++ b/modules/samples/yahoojsonsearch/resources/axis2.xml
@@ -112,7 +112,7 @@
     <!--formats  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/json"
                          class="org.apache.axis2.json.JSONMessageFormatter"/>
         <messageFormatter contentType="application/json/badgerfish"
@@ -120,7 +120,7 @@
         <messageFormatter contentType="text/javascript"
                          class="org.apache.axis2.json.JSONMessageFormatter"/>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
     </messageFormatters>
     
     <!-- ================================================= -->

modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java

diff --git a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java b/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java
index 22c6fc7..b333831 100644
--- a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java
+++ b/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java
@@ -23,7 +23,7 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axis2.Constants;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.addressing.EndpointReference;

modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java

diff --git a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java b/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
index a37dd3f..36507e0 100644
--- a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
+++ b/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
@@ -58,7 +58,7 @@
             options.setTo(new EndpointReference(epr));
             options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
             options.setProperty(Constants.Configuration.HTTP_METHOD, Constants.Configuration.HTTP_METHOD_GET);
-	    options.setProperty(Constants.Configuration.MESSAGE_TYPE,org.apache.axis2.transport.http.HTTPConstants.MEDIA_TYPE_X_WWW_FORM);
+	    options.setProperty(Constants.Configuration.MESSAGE_TYPE,org.apache.axis2.kernel.http.HTTPConstants.MEDIA_TYPE_X_WWW_FORM);
 
             //if post is through GET of HTTP
             OMElement response = client.sendReceive(getPayloadForYahooSearchCall(query, format));

modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java

diff --git a/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java b/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
index 8152dd3..7ff2340 100644
--- a/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
+++ b/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
@@ -24,7 +24,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;

modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Axis2Server.java

diff --git a/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Axis2Server.java b/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Axis2Server.java
index 223d7f1..00ad6ff 100644
--- a/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Axis2Server.java
+++ b/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Axis2Server.java
@@ -19,7 +19,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.transport.SimpleAxis2Server;
+import org.apache.axis2.kernel.SimpleAxis2Server;
 import org.apache.maven.plugin.logging.Log;
 
 import static org.apache.axis2.maven2.server.util.Constants.DEFAULT_REPO_LOCATION;

modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java b/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
index 0deb04e..d21b775 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
@@ -31,7 +31,7 @@
 import org.apache.axiom.om.OMText;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 import org.apache.axis2.transport.base.BaseConstants;
 
 public class BinaryFormatter implements MessageFormatterEx {

modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterEx.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterEx.java b/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterEx.java
index aee5acb..0653bb0 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterEx.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterEx.java
@@ -23,7 +23,7 @@
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 
 /**
  * Message formatter with extended capabilities.

modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterExAdapter.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterExAdapter.java b/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterExAdapter.java
index 5d36042..1a95307 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterExAdapter.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/format/MessageFormatterExAdapter.java
@@ -30,7 +30,7 @@
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 
 /**
  * Adapter to add the {@link MessageFormatterEx} interface to an

modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java b/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
index 8efc728..cb955b8 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
@@ -19,7 +19,7 @@
 
 package org.apache.axis2.format;
 
-import org.apache.axis2.transport.http.util.URLTemplatingUtil;
+import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.AxisFault;
 import org.apache.axiom.om.OMOutputFormat;

modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
index 3e75fb6..d18117c 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
@@ -29,7 +29,7 @@
 import org.apache.axis2.transport.base.tracker.AxisServiceFilter;
 import org.apache.axis2.transport.base.tracker.AxisServiceTracker;
 import org.apache.axis2.transport.base.tracker.AxisServiceTrackerListener;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.commons.logging.Log;

modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
index 5e8963f..16e6108 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportSender.java
@@ -26,8 +26,8 @@
 import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.axis2.handlers.AbstractHandler;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportSender;
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.TransportSender;
+import org.apache.axis2.kernel.OutTransportInfo;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.WSDL2Constants;

modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
index b272aa2..c8f7970 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
@@ -28,8 +28,8 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.format.BinaryFormatter;
 import org.apache.axis2.format.PlainTextFormatter;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.util.MessageProcessorSelector;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/transport/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
index cb8dfee..f2d15a4 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
@@ -105,7 +105,7 @@
      * @return an array of endpoint references
      * @throws AxisFault
      * 
-     * @see org.apache.axis2.transport.TransportListener#getEPRsForService(String, String)
+     * @see org.apache.axis2.kernel.TransportListener#getEPRsForService(String, String)
      */
     public abstract EndpointReference[] getEndpointReferences(AxisService service, String ip) throws AxisFault;
 

modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportMBeanSupport.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportMBeanSupport.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportMBeanSupport.java
index 703afc9..4fd1a79 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportMBeanSupport.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportMBeanSupport.java
@@ -25,8 +25,8 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportView.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportView.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
index 3eae31a..7bd02c6 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/TransportView.java
@@ -19,8 +19,8 @@
 
 package org.apache.axis2.transport.base;
 
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportSender;
 
 import java.util.Map;
 

modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java
index dbac4e4..8f6e5d6 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java
@@ -16,7 +16,7 @@
 
 package org.apache.axis2.transport.base.datagram;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 public class DatagramOutTransportInfo implements OutTransportInfo {
     private String contentType;

modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/ProcessPacketTask.java

diff --git a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/ProcessPacketTask.java b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/ProcessPacketTask.java
index a969222..fe1432a 100644
--- a/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/ProcessPacketTask.java
+++ b/modules/transport/base/src/main/java/org/apache/axis2/transport/base/datagram/ProcessPacketTask.java
@@ -24,7 +24,7 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.axis2.transport.base.MetricsCollector;

modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
index bdd1a30..86f11bc 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
@@ -29,9 +29,10 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.transport.http.server.AxisHttpResponse;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.MessageProcessorSelector;

modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java b/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
index 3c12f71..dc8324d 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/AxisRequestEntity.java
@@ -24,7 +24,7 @@
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.MessageFormatter;
 
 import java.io.IOException;
 import java.io.OutputStream;

modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
index c33db35..7780481 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServlet.java
@@ -43,12 +43,15 @@
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.engine.Handler.InvocationResponse;
 import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.transport.RequestResponseTransport;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.transport.http.util.QueryStringParser;
+
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.RequestResponseTransport;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.http.util.QueryStringParser;
 import org.apache.axis2.transport.http.util.RESTUtil;
+import org.apache.axis2.transport.http.AxisServletListener;
+import org.apache.axis2.transport.http.server.HttpUtils;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.axis2.util.OnDemandLogger;
@@ -855,7 +858,7 @@
             this.request = request;
             this.response = response;
             messageContext = createMessageContext(this.request, this.response, false);
-            messageContext.setProperty(org.apache.axis2.transport.http.HTTPConstants.HTTP_METHOD,
+            messageContext.setProperty(org.apache.axis2.kernel.http.HTTPConstants.HTTP_METHOD,
                     httpMethodString);
         }
 

modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java
index 4874079..452ce5a 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/AxisServletListener.java
@@ -27,7 +27,8 @@
 import org.apache.axis2.context.SessionContext;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
index 04c7443..48d2e1a 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
@@ -32,7 +32,8 @@
 import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axis2.util.MessageProcessorSelector;
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.wsdl.WSDLConstants;

modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportSender.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportSender.java
index 0f6641e..f63e492 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportSender.java
@@ -20,7 +20,7 @@
 package org.apache.axis2.transport.http;
 
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportSender;
 
 public interface HTTPTransportSender extends TransportSender {
 

modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
index 27a6a6e..c6e8fca 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
@@ -42,8 +42,9 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.engine.Handler.InvocationResponse;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
index 399650e..b67ec08 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
@@ -25,8 +25,9 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.Handler.InvocationResponse;
-import org.apache.axis2.transport.RequestResponseTransport;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.RequestResponseTransport;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.transport.http.server.AxisHttpRequest;
 import org.apache.axis2.transport.http.server.AxisHttpResponse;
 import org.apache.axis2.transport.http.server.HttpUtils;

modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java b/modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
index eb9195f..68095d6 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java
@@ -20,7 +20,7 @@
 
 package org.apache.axis2.transport.http;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 import javax.servlet.http.HttpServletResponse;
 

modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java b/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
index 7ea6d3c..fd8e532 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
@@ -30,7 +30,8 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.transport.http.server.HttpFactory;
 import org.apache.axis2.transport.http.server.SessionManager;
 import org.apache.axis2.transport.http.server.SimpleHttpServer;
@@ -60,6 +61,9 @@
 
     public static int DEFAULT_PORT = 8080;
 
+    public static String PARAM_PORT = "port";
+
+
     protected ConfigurationContext configurationContext;
     private TransportInDescription trpInDesc;
     protected HttpFactory httpFactory;
@@ -238,7 +242,7 @@
      * @param serviceName
      * @param ip
      * @return an EndpointReference
-     * @see org.apache.axis2.transport.TransportListener#getEPRForService(String,String)
+     * @see org.apache.axis2.kernel.TransportListener#getEPRForService(String,String)
      */
     public EndpointReference[] getEPRsForService(String serviceName, String ip) throws AxisFault {
         if (embedded == null) {
@@ -272,7 +276,7 @@
      * @param serviceName
      * @param ip
      * @return an EndpointReference
-     * @see org.apache.axis2.transport.TransportListener#getEPRForService(String,String)
+     * @see org.apache.axis2.kernel.TransportListener#getEPRForService(String,String)
      */
     public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault {
         return getEPRsForService(serviceName, ip)[0];

modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/AxisRequestEntityImpl.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/AxisRequestEntityImpl.java b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/AxisRequestEntityImpl.java
index 664c326..0cdf7f6 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/AxisRequestEntityImpl.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/AxisRequestEntityImpl.java
@@ -20,7 +20,7 @@
 package org.apache.axis2.transport.http.impl.httpclient4;
 
 import org.apache.axis2.transport.http.AxisRequestEntity;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.message.BasicHeader;

modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
index 2a49934..69189a936 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
@@ -26,9 +26,9 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.transport.http.AbstractHTTPTransportSender;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.HTTPSender;
+import org.apache.axis2.transport.http.AbstractHTTPTransportSender;
 import org.apache.axis2.transport.http.HTTPTransportConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
index f8b8df9..0dd443e 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
@@ -23,7 +23,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.HTTPTransportConstants;
 import org.apache.axis2.transport.http.HttpTransportProperties;
 import org.apache.commons.logging.Log;

modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
index 63c46db..8e76995 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
@@ -22,8 +22,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.AxisRequestEntity;
-import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.http.HTTPSender;
 import org.apache.axis2.transport.http.Request;
 import org.apache.commons.logging.Log;

modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
index 28758cc..af2db8d 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
@@ -30,9 +30,9 @@
 import org.apache.axiom.mime.Header;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.AxisRequestEntity;
 import org.apache.axis2.transport.http.HTTPAuthenticator;
-import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.http.HTTPTransportConstants;
 import org.apache.axis2.transport.http.Request;
 import org.apache.commons.logging.Log;

modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
index 0b63145..ca69ccf 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
@@ -19,7 +19,6 @@
 
 package org.apache.axis2.transport.http.server;
 
-import org.apache.axis2.transport.OutTransportInfo;
 import org.apache.http.Header;
 import org.apache.http.HeaderIterator;
 import org.apache.http.HttpException;
@@ -30,6 +29,7 @@
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpProcessor;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 import java.io.IOException;
 import java.io.OutputStream;

modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
index e886189..9ddc031 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
@@ -30,8 +30,8 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.RequestResponseTransport;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.RequestResponseTransport;
 import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java
index 26b9e75..78ae336 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/HttpUtils.java
@@ -19,7 +19,7 @@
 
 package org.apache.axis2.transport.http.server;
 
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.http.Header;
 
 public class HttpUtils {

modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
index 6b8b28d..efd5956 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/RequestSessionCookie.java
@@ -20,7 +20,7 @@
 package org.apache.axis2.transport.http.server;
 
 import org.apache.axis2.Constants;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpException;

modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java b/modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
index 13ad2dc..350b8ac 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/server/ResponseSessionCookie.java
@@ -21,7 +21,7 @@
 
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.http.HttpException;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;

modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java

diff --git a/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java b/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
index 7752a11..f11662d 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/util/RESTUtil.java
@@ -35,8 +35,8 @@
 import org.apache.axis2.dispatchers.RequestURIOperationDispatcher;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.engine.Handler;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.HTTPTransportUtils;
 
 import javax.xml.stream.XMLStreamException;

modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java

diff --git a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
index 913410a..294b097 100644
--- a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
+++ b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPClient4TransportSenderTest.java
@@ -21,7 +21,8 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender;
 import org.apache.http.client.methods.HttpGet;
 

modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java

diff --git a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java
index 5b88f35..087b30e 100644
--- a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java
+++ b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPTransportSenderTest.java
@@ -45,8 +45,9 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.Handler.InvocationResponse;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.http.HTTPConstants;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.transport.http.mock.MockAxisHttpResponse;
 import org.apache.axis2.transport.http.mock.MockHttpServletResponse;
 import org.apache.axis2.transport.http.mock.MockHTTPResponse;

modules/transport/http/test/org/apache/axis2/transport/http/HTTPWorkerTest.java

diff --git a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPWorkerTest.java b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPWorkerTest.java
index 5259dcc..c95c27c 100644
--- a/modules/transport/http/test/org/apache/axis2/transport/http/HTTPWorkerTest.java
+++ b/modules/transport/http/test/org/apache/axis2/transport/http/HTTPWorkerTest.java
@@ -28,6 +28,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.server.AxisHttpRequest;
 import org.apache.axis2.transport.http.server.AxisHttpResponse;
 import org.apache.http.Header;

modules/transport/http/test/org/apache/axis2/transport/http/mock/MockAxisHttpResponse.java

diff --git a/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockAxisHttpResponse.java b/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockAxisHttpResponse.java
index 02c1540..dde8f71 100644
--- a/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockAxisHttpResponse.java
+++ b/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockAxisHttpResponse.java
@@ -25,7 +25,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 import org.apache.axis2.transport.http.server.AxisHttpResponse;
 import org.apache.http.RequestLine;
 import org.apache.http.message.BasicHttpRequest;
@@ -112,4 +112,4 @@
         return byteArrayOutputStream;
     }
 
-}
\ No newline at end of file
+}

modules/transport/http/test/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java

diff --git a/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java b/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java
index 95fabce..5a69904 100644
--- a/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java
+++ b/modules/transport/http/test/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java
@@ -33,7 +33,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 /**
  * The Class MockHttpServletResponse is a mock implementation of
@@ -212,4 +212,4 @@
     public Collection<String> getHeaderNames() {
         throw new UnsupportedOperationException();
     }
-}
\ No newline at end of file
+}

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java

diff --git a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
index 864c057..c0fa462 100644
--- a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
+++ b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSOutTransportInfo.java
@@ -15,7 +15,7 @@
 */
 package org.apache.axis2.transport.jms;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 import org.apache.axis2.transport.base.BaseUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java

diff --git a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
index 8b69e65..774e44d 100644
--- a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
+++ b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
@@ -25,10 +25,10 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.base.*;
-import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.transport.jms.iowrappers.BytesMessageOutputStream;
 import org.apache.commons.io.output.WriterOutputStream;
 

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java

diff --git a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
index 31a715d..88507a4 100644
--- a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
+++ b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java
@@ -29,7 +29,7 @@
 import org.apache.axis2.format.TextMessageBuilderAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.transport.base.BaseUtils;
 import org.apache.axis2.transport.jms.iowrappers.BytesMessageDataSource;
 import org.apache.axis2.transport.jms.iowrappers.BytesMessageInputStream;

modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java

diff --git a/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java b/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
index d9ec4ee..fec6498 100644
--- a/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
+++ b/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
@@ -26,8 +26,8 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.transport.TransportSender;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportSender;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java

diff --git a/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java b/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java
index 24b702e..8707e01 100644
--- a/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java
+++ b/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponseTransportOutDescription.java
@@ -25,7 +25,7 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.Phase;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportSender;
 
 import java.util.ArrayList;
 

modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java

diff --git a/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java b/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
index 3c73c15..07aae1d 100644
--- a/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
+++ b/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
@@ -30,7 +30,7 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.util.MessageContextBuilder;
 
 import java.io.InputStream;

modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java

diff --git a/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java b/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
index 03413e2..0103f00 100644
--- a/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
+++ b/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
@@ -26,8 +26,8 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.transport.TransportSender;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportSender;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

modules/transport/local/test-resources/org/apache/axis2/transport/local/axis2.xml

diff --git a/modules/transport/local/test-resources/org/apache/axis2/transport/local/axis2.xml b/modules/transport/local/test-resources/org/apache/axis2/transport/local/axis2.xml
index 2819f39..ff107b4 100644
--- a/modules/transport/local/test-resources/org/apache/axis2/transport/local/axis2.xml
+++ b/modules/transport/local/test-resources/org/apache/axis2/transport/local/axis2.xml
@@ -32,15 +32,15 @@
 
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <messageBuilders>
@@ -150,4 +150,4 @@
         <phase name="MessageOut"/>
         <phase name="Security"/>
     </phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>

modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java

diff --git a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java
index efcb089..e08a081 100644
--- a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java
+++ b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailOutTransportInfo.java
@@ -19,7 +19,7 @@
 
 package org.apache.axis2.transport.mail;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 import javax.mail.internet.InternetAddress;
 

modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailRequestResponseTransport.java

diff --git a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailRequestResponseTransport.java b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailRequestResponseTransport.java
index 7c19f4f..edc6cbc 100644
--- a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailRequestResponseTransport.java
+++ b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailRequestResponseTransport.java
@@ -15,7 +15,7 @@
  */
 package org.apache.axis2.transport.mail;
 
-import org.apache.axis2.transport.RequestResponseTransport;
+import org.apache.axis2.kernel.RequestResponseTransport;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.AxisFault;
 

modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java

diff --git a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
index bfa31d7..3306023 100644
--- a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
+++ b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
@@ -24,8 +24,8 @@
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.RequestResponseTransport;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.RequestResponseTransport;
 import org.apache.axis2.transport.base.AbstractPollingTransportListener;
 import org.apache.axis2.transport.base.BaseConstants;
 import org.apache.axis2.transport.base.ManagementSupport;

modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java

diff --git a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
index cb4f0aa..7236ad4 100644
--- a/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
+++ b/modules/transport/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
@@ -28,8 +28,8 @@
 import org.apache.axis2.description.*;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axiom.mime.ContentType;
 import org.apache.axiom.om.OMOutputFormat;
 

modules/transport/tcp/conf/axis2.xml

diff --git a/modules/transport/tcp/conf/axis2.xml b/modules/transport/tcp/conf/axis2.xml
index db7dbea..7120078 100644
--- a/modules/transport/tcp/conf/axis2.xml
+++ b/modules/transport/tcp/conf/axis2.xml
@@ -107,15 +107,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/transport/tcp/conf/client_axis2.xml

diff --git a/modules/transport/tcp/conf/client_axis2.xml b/modules/transport/tcp/conf/client_axis2.xml
index 7822d78..6c2fa82 100644
--- a/modules/transport/tcp/conf/client_axis2.xml
+++ b/modules/transport/tcp/conf/client_axis2.xml
@@ -107,15 +107,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                         class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                         class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                         class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                         class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPOutTransportInfo.java

diff --git a/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPOutTransportInfo.java b/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPOutTransportInfo.java
index 085a646..2083b63 100644
--- a/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPOutTransportInfo.java
+++ b/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPOutTransportInfo.java
@@ -19,7 +19,7 @@
 
 package org.apache.axis2.transport.tcp;
 
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 import java.io.OutputStream;
 import java.net.Socket;

modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java

diff --git a/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java b/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
index 93191ff..d4ece43 100644
--- a/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
+++ b/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java
@@ -24,9 +24,9 @@
 import org.apache.axis2.description.OutInAxisOperation;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.MessageFormatter;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.MessageFormatter;
 import org.apache.axis2.transport.base.AbstractTransportSender;
 import org.apache.axis2.transport.base.BaseUtils;
 import org.apache.axiom.soap.SOAPEnvelope;

modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPWorker.java

diff --git a/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPWorker.java b/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPWorker.java
index cd1ae9b..0f49250 100644
--- a/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPWorker.java
+++ b/modules/transport/tcp/src/org/apache/axis2/transport/tcp/TCPWorker.java
@@ -21,7 +21,7 @@
 
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.Constants;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.util.MessageContextBuilder;

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
index 245adbb..1fa8029 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/LogAspect.java
@@ -41,7 +41,7 @@
 public class LogAspect {
     private static final Log log = LogFactory.getLog(LogAspect.class);
     
-    @Around("call(void org.apache.axis2.transport.MessageFormatter.writeTo(" +
+    @Around("call(void org.apache.axis2.kernel.MessageFormatter.writeTo(" +
     		"       org.apache.axis2.context.MessageContext, org.apache.axiom.om.OMOutputFormat," +
     		"       java.io.OutputStream, boolean))" +
     		" && args(msgContext, format, out, preserve)")

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/SimpleTransportDescriptionFactory.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/SimpleTransportDescriptionFactory.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/SimpleTransportDescriptionFactory.java
index 6d4972f..dcc9304 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/SimpleTransportDescriptionFactory.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/SimpleTransportDescriptionFactory.java
@@ -21,8 +21,8 @@
 
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportListener;
+import org.apache.axis2.kernel.TransportSender;
 
 public class SimpleTransportDescriptionFactory implements TransportDescriptionFactory {
     private final String name;

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
index e5991c8..9d4d39e 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
@@ -31,7 +31,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.TransportSender;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.transport.base.BaseConstants;
 import org.apache.axis2.transport.base.ManagementSupport;
 import org.apache.axis2.transport.testkit.MessageExchangeValidator;

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
index 8501a0d..1e7ba86 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
@@ -25,8 +25,8 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.ListenerManager;
+import org.apache.axis2.kernel.TransportSender;
 import org.apache.axis2.transport.CustomAxisConfigurator;
-import org.apache.axis2.transport.TransportSender;
 import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
 import org.apache.axis2.transport.testkit.tests.Setup;
 import org.apache.axis2.transport.testkit.tests.TearDown;

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
index 3dc19cd..2b46824 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
@@ -31,7 +31,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.transport.base.BaseUtils;
 import org.apache.axis2.transport.base.event.TransportError;
 import org.apache.axis2.transport.base.event.TransportErrorListener;

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java
index 47c2b89..75bf874 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java
@@ -26,7 +26,7 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.transport.UtilsTransportServer;
 import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
 import org.apache.axis2.transport.testkit.tests.Setup;

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/package-info.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/package-info.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/package-info.java
index 2752f54..f36bf18 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/package-info.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/package-info.java
@@ -273,7 +273,7 @@
  *   <dt><tt>XX-builder.log</tt></dt>
  *   <dd><p>These files are produced when Axis2 test clients and endpoints are used.
  *       <tt>XX-formatter.log</tt> will contain the payload of an incoming message as seen by the
- *       {@link org.apache.axis2.transport.MessageFormatter}. <tt>XX-builder.log</tt> on the other
+ *       {@link org.apache.axis2.kernel.MessageFormatter}. <tt>XX-builder.log</tt> on the other
  *       hand will contain the payload of an outgoing message as produced by the
  *       {@link org.apache.axis2.builder.Builder}. Note that the number of log files depends on
  *       serveral factors, such as the MEP, whether the client or endpoint is Axis2 based or not and

modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java

diff --git a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
index a0a1bdc..2cd5b05 100644
--- a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
+++ b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
@@ -25,7 +25,7 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.SessionContext;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 
 public class LifecycleFixTransportListenerProxy implements TransportListener {
     private final TransportListener target;

modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

diff --git a/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java b/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
index 191534a..a6dfac5 100644
--- a/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
+++ b/modules/transport/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
@@ -32,9 +32,9 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.transport.MessageFormatter;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.kernel.MessageFormatter;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.TransportUtils;
 import org.apache.axis2.transport.base.AbstractTransportSender;
 import org.apache.axis2.transport.base.BaseUtils;
 import org.apache.axis2.util.MessageProcessorSelector;

modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPListener.java

diff --git a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPListener.java b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPListener.java
index bf84152..ef46a70 100644
--- a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPListener.java
+++ b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPListener.java
@@ -36,7 +36,7 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.ParameterIncludeImpl;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.kernel.TransportListener;
 import org.apache.axis2.transport.xmpp.util.XMPPConnectionFactory;
 import org.apache.axis2.transport.xmpp.util.XMPPConstants;
 import org.apache.axis2.transport.xmpp.util.XMPPPacketListener;

modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java

diff --git a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
index 55e612c..5126f6e 100644
--- a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
+++ b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/XMPPSender.java
@@ -34,9 +34,9 @@
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.axis2.transport.OutTransportInfo;
-import org.apache.axis2.transport.TransportSender;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.OutTransportInfo;
+import org.apache.axis2.kernel.TransportSender;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.xmpp.util.XMPPClientResponseManager;
 import org.apache.axis2.transport.xmpp.util.XMPPConnectionFactory;
 import org.apache.axis2.transport.xmpp.util.XMPPConstants;

modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml

diff --git a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
index 9ce14d1..b10fd53 100644
--- a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
+++ b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/sample/axis2.xml
@@ -161,15 +161,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->
@@ -548,4 +548,4 @@
         <phase name="MessageOut"/>
         <phase name="Security"/>
     </phaseOrder>
-</axisconfig>
\ No newline at end of file
+</axisconfig>

modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPOutTransportInfo.java

diff --git a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPOutTransportInfo.java b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPOutTransportInfo.java
index 6c82fb4..0b6ef75 100644
--- a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPOutTransportInfo.java
+++ b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPOutTransportInfo.java
@@ -21,7 +21,7 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
 
 /**
  * 

modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java

diff --git a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
index ef60727..2fb73c1 100644
--- a/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
+++ b/modules/transport/xmpp/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
@@ -43,8 +43,8 @@
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.kernel.TransportUtils;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.xmpp.XMPPSender;
 import org.apache.axis2.util.MessageContextBuilder;
 import org.apache.axis2.util.MultipleEntryHashMap;

modules/webapp/conf/axis2.xml

diff --git a/modules/webapp/conf/axis2.xml b/modules/webapp/conf/axis2.xml
index 9d873d9..1f07247 100644
--- a/modules/webapp/conf/axis2.xml
+++ b/modules/webapp/conf/axis2.xml
@@ -168,15 +168,15 @@
     <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.kernel.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+                          class="org.apache.axis2.kernel.http.MultipartFormDataFormatter"/>
         <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+                          class="org.apache.axis2.kernel.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+                          class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
     </messageFormatters>
 
     <!-- ================================================= -->

modules/webapp/src/main/webapp/WEB-INF/include/httpbase.jsp

diff --git a/modules/webapp/src/main/webapp/WEB-INF/include/httpbase.jsp b/modules/webapp/src/main/webapp/WEB-INF/include/httpbase.jsp
index 0aac806..11bc194 100644
--- a/modules/webapp/src/main/webapp/WEB-INF/include/httpbase.jsp
+++ b/modules/webapp/src/main/webapp/WEB-INF/include/httpbase.jsp
@@ -21,8 +21,8 @@
 <%@ page import="org.apache.axis2.Constants" %>
 <%@ page import="org.apache.axis2.context.ConfigurationContext" %>
 <%@ page import="org.apache.axis2.description.Parameter" %>
+<%@ page import="org.apache.axis2.kernel.TransportListener" %>
 <%@ page import="org.apache.axis2.transport.http.AxisServlet" %>
-<%@ page import="org.apache.axis2.transport.TransportListener" %>
 <%!
     private String frontendHostUrl;
     private String hostname;
@@ -69,4 +69,4 @@
         return curentUrl;
     }
 %>
-<base href="<%= calculateHttpBase(request)%>">
\ No newline at end of file
+<base href="<%= calculateHttpBase(request)%>">