You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ro...@apache.org on 2022/06/03 00:49:27 UTC
[axis-axis2-java-core] branch master updated: 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
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 3827d665e7 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
3827d665e7 is described below
commit 3827d665e787e8cd4ce633a6e54aaa10c5f8f6e2
Author: Robert Lazarski <ro...@gmail.com>
AuthorDate: Thu Jun 2 20:48:38 2022 -0400
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
---
.../axis2/transport/java/JavaTransportSender.java | 2 +-
.../AxisServiceBasedMultiLanguageEmitter.java | 6 ++---
.../java/InterfaceImplementationTemplate.xsl | 2 +-
.../fastinfoset/FastInfosetMessageFormatter.java | 10 ++++----
.../FastInfosetPOXMessageFormatter.java | 10 ++++----
modules/fastinfoset/test-resources/axis2.xml | 6 ++---
.../test-resources/jaxrs/pojo-enabled-axis2.xml | 10 ++++----
.../org/apache/axis2/async/AsyncService2Test.java | 2 +-
.../axis2/builder/UnknownContentBuilderTest.java | 2 +-
.../axis2/engine/EchoRawRuntimeProxyTest.java | 2 +-
.../org/apache/axis2/engine/EchoRawXMLTest.java | 2 +-
.../axis2/faults/FaultSerializationTest.java | 2 +-
.../xmlhttp/DispatchXMessageDataSourceTests.java | 4 ++--
.../message/source/XMessageSourceProvider.java | 2 +-
modules/jaxws-integration/test-resources/axis2.xml | 6 ++---
.../test-resources/axis2_addressing.xml | 10 ++++----
.../datasource/jaxb/JAXBAttachmentMarshaller.java | 2 +-
.../org/apache/axis2/jaxws/BindingProvider.java | 2 +-
.../axis2/jaxws/client/dispatch/BaseDispatch.java | 2 +-
.../jaxws/client/proxy/JAXWSProxyHandler.java | 2 +-
.../axis2/jaxws/context/utils/ContextUtils.java | 2 +-
.../apache/axis2/jaxws/core/MessageContext.java | 2 +-
.../controller/impl/AxisInvocationController.java | 2 +-
.../jaxws/handler/TransportHeadersAdapter.java | 2 +-
.../jaxws/marshaller/impl/alt/Attachment.java | 2 +-
.../jaxws/message/impl/MessageFactoryImpl.java | 2 +-
.../axis2/jaxws/message/util/MessageUtils.java | 2 +-
.../axis2/jaxws/server/JAXWSMessageReceiver.java | 2 +-
.../jaxws/server/dispatcher/JavaDispatcher.java | 2 +-
.../axis2/jaxws/utility/DataSourceFormatter.java | 6 ++---
modules/jaxws/test-resources/axis2.xml | 6 ++---
.../client/dispatch/DispatchSharedSessionTest.java | 2 +-
.../jaxws/client/proxy/ProxySharedSessionTest.java | 2 +-
.../axis2/json/AbstractJSONMessageFormatter.java | 4 ++--
.../apache/axis2/json/AbstractJSONOMBuilder.java | 2 +-
.../org/apache/axis2/json/gson/JsonFormatter.java | 2 +-
.../org/apache/axis2/json/moshi/JsonFormatter.java | 2 +-
modules/json/test/org/apache/axis2/json/Echo.java | 2 +-
.../org/apache/axis2/json/JSONOMBuilderTest.java | 4 ++--
modules/kernel/conf/axis2.xml | 10 ++++----
modules/kernel/src/org/apache/axis2/Constants.java | 4 ++--
.../src/org/apache/axis2/builder/Builder.java | 2 +-
.../src/org/apache/axis2/builder/BuilderUtil.java | 2 +-
.../axis2/builder/MultipartFormDataBuilder.java | 2 +-
.../axis2/builder/XFormURLEncodedBuilder.java | 4 ++--
.../unknowncontent/UnknownContentOMDataSource.java | 2 +-
.../src/org/apache/axis2/client/Options.java | 28 +++++++++++-----------
.../kernel/src/org/apache/axis2/client/Stub.java | 2 +-
.../axis2/context/ConfigurationContextFactory.java | 2 +-
.../axis2/context/externalize/ActivateUtils.java | 2 +-
.../externalize/MessageExternalizeUtils.java | 2 +-
.../apache/axis2/deployment/AxisConfigBuilder.java | 6 ++---
.../axis2/deployment/DescriptionBuilder.java | 2 +-
.../axis2/deployment/WarBasedAxisConfigurator.java | 2 +-
.../org/apache/axis2/deployment/axis2_default.xml | 10 ++++----
.../org/apache/axis2/description/AxisEndpoint.java | 2 +-
.../org/apache/axis2/description/AxisService.java | 2 +-
.../axis2/description/OutInAxisOperation.java | 4 ++--
.../description/RobustOutOnlyAxisOperation.java | 4 ++--
.../axis2/description/TransportInDescription.java | 2 +-
.../axis2/description/TransportOutDescription.java | 2 +-
.../description/WSDL11ToAxisServiceBuilder.java | 2 +-
.../description/WSDL20ToAxisServiceBuilder.java | 2 +-
.../dispatchers/HTTPLocationBasedDispatcher.java | 2 +-
.../org/apache/axis2/engine/AxisConfiguration.java | 2 +-
.../src/org/apache/axis2/engine/AxisEngine.java | 2 +-
.../src/org/apache/axis2/engine/DispatchPhase.java | 6 ++---
.../org/apache/axis2/engine/ListenerManager.java | 6 ++---
.../{transport => kernel}/MessageFormatter.java | 4 ++--
.../{transport => kernel}/OutTransportInfo.java | 2 +-
.../RequestResponseTransport.java | 2 +-
.../{transport => kernel}/SimpleAxis2Server.java | 2 +-
.../{transport => kernel}/TransportListener.java | 2 +-
.../{transport => kernel}/TransportSender.java | 2 +-
.../{transport => kernel}/TransportUtils.java | 4 ++--
.../http/ApplicationXMLFormatter.java | 6 ++---
.../{transport => kernel}/http/HTTPConstants.java | 2 +-
.../http/MultipartFormDataFormatter.java | 6 ++---
.../http/SOAPMessageFormatter.java | 6 ++---
.../http/XFormURLEncodedFormatter.java | 6 ++---
.../http/util/ComplexPart.java | 2 +-
.../http/util/QueryStringParser.java | 2 +-
.../http/util/URIEncoderDecoder.java | 4 ++--
.../http/util/URLTemplatingUtil.java | 2 +-
.../apache/axis2/util/MessageContextBuilder.java | 2 +-
.../axis2/util/MessageProcessorSelector.java | 12 +++++-----
.../org/apache/axis2/util/ObjectStateUtils.java | 2 +-
.../kernel/src/org/apache/axis2/util/Utils.java | 4 ++--
.../src/org/apache/axis2/util/WSDL20Util.java | 2 +-
.../deployment/CustomDeployerRepo/axis2.xml | 6 ++---
.../kernel/test-resources/deployment/axis2_a.xml | 6 ++---
.../test-resources/deployment/exculeRepo/axis2.xml | 6 ++---
.../deployment/messageFormatterTest/axis2.xml | 2 +-
.../deployment/moduleDisEngegeRepo/axis2.xml | 6 ++---
.../repositories/moduleLoadTest/axis2.xml | 6 ++---
.../deployment/soaproleconfiguration/axis2.xml | 6 ++---
.../axis2/deployment/DummyTransportListener.java | 2 +-
.../deployment/MessageFormatterDeploymentTest.java | 2 +-
.../http/MultipartFormDataFormatterTest.java | 2 +-
.../transport/http/SOAPMessageFormatterTest.java | 2 +-
.../http/XFormURLEncodedFormatterTest.java | 2 +-
.../transport/http/util/QueryStringParserTest.java | 2 +-
.../transport/http/util/URLTemplatingUtilTest.java | 2 +-
.../description/builder/JAXWSRIWSDLGenerator.java | 4 ++--
.../org/apache/axis2/osgi/deployment/axis2.xml | 10 ++++----
.../OSGiConfigurationContextFactory.java | 6 ++---
.../src/org/apache/axis2/osgi/tx/HttpListener.java | 2 +-
.../org/apache/axis2/saaj/AttachmentPartImpl.java | 2 +-
.../org/apache/axis2/saaj/SOAPConnectionImpl.java | 2 +-
.../src/org/apache/axis2/saaj/SOAPMessageImpl.java | 2 +-
.../src/org/apache/axis2/saaj/SOAPPartImpl.java | 2 +-
.../org/apache/axis2/saaj/SOAPMessageTest.java | 2 +-
.../java_first_jaxws/src/webapp/WEB-INF/axis2.xml | 10 ++++----
.../jaxws-samples/src/webapp/WEB-INF/axis2.xml | 10 ++++----
modules/samples/json/resources/axis2.xml | 10 ++++----
.../httpsService/src/main/webapp/WEB-INF/axis2.xml | 10 ++++----
.../jmsService/src/main/resources/axis2.xml | 10 ++++----
modules/samples/userguide/conf/axis2.xml | 8 +++----
.../springbootdemo/resources-axis2/conf/axis2.xml | 10 ++++----
.../webservices/secure/LoginService.java | 2 +-
.../samples/yahoojsonsearch/resources/axis2.xml | 4 ++--
.../yahooservices/JSONSearch/JSONSearchModel.java | 2 +-
.../yahooservices/RESTSearch/RESTSearchModel.java | 2 +-
.../SpringServletContextObjectSupplier.java | 2 +-
.../axis2/maven2/server/util/Axis2Server.java | 2 +-
.../org/apache/axis2/format/BinaryFormatter.java | 2 +-
.../apache/axis2/format/MessageFormatterEx.java | 2 +-
.../axis2/format/MessageFormatterExAdapter.java | 2 +-
.../apache/axis2/format/PlainTextFormatter.java | 2 +-
.../transport/base/AbstractTransportListener.java | 2 +-
.../transport/base/AbstractTransportSender.java | 4 ++--
.../org/apache/axis2/transport/base/BaseUtils.java | 4 ++--
.../axis2/transport/base/ProtocolEndpoint.java | 2 +-
.../transport/base/TransportMBeanSupport.java | 4 ++--
.../apache/axis2/transport/base/TransportView.java | 4 ++--
.../base/datagram/DatagramOutTransportInfo.java | 2 +-
.../transport/base/datagram/ProcessPacketTask.java | 2 +-
.../http/AbstractHTTPTransportSender.java | 7 +++---
.../axis2/transport/http/AxisRequestEntity.java | 2 +-
.../apache/axis2/transport/http/AxisServlet.java | 15 +++++++-----
.../axis2/transport/http/AxisServletListener.java | 3 ++-
.../apache/axis2/transport/http/HTTPSender.java | 3 ++-
.../axis2/transport/http/HTTPTransportSender.java | 2 +-
.../axis2/transport/http/HTTPTransportUtils.java | 5 ++--
.../apache/axis2/transport/http/HTTPWorker.java | 5 ++--
.../http/ServletBasedOutTransportInfo.java | 2 +-
.../axis2/transport/http/SimpleHTTPServer.java | 10 +++++---
.../impl/httpclient4/AxisRequestEntityImpl.java | 2 +-
.../httpclient4/HTTPClient4TransportSender.java | 4 ++--
.../impl/httpclient4/HTTPProxyConfigurator.java | 2 +-
.../http/impl/httpclient4/HTTPSenderImpl.java | 2 +-
.../http/impl/httpclient4/RequestImpl.java | 2 +-
.../http/server/AxisHttpResponseImpl.java | 2 +-
.../transport/http/server/AxisHttpService.java | 4 ++--
.../axis2/transport/http/server/HttpUtils.java | 2 +-
.../http/server/RequestSessionCookie.java | 2 +-
.../http/server/ResponseSessionCookie.java | 2 +-
.../apache/axis2/transport/http/util/RESTUtil.java | 4 ++--
.../http/HTTPClient4TransportSenderTest.java | 3 ++-
.../transport/http/HTTPTransportSenderTest.java | 5 ++--
.../axis2/transport/http/HTTPWorkerTest.java | 1 +
.../transport/http/mock/MockAxisHttpResponse.java | 4 ++--
.../http/mock/MockHttpServletResponse.java | 4 ++--
.../axis2/transport/jms/JMSOutTransportInfo.java | 2 +-
.../org/apache/axis2/transport/jms/JMSSender.java | 6 ++---
.../org/apache/axis2/transport/jms/JMSUtils.java | 2 +-
.../axis2/transport/local/LocalResponder.java | 4 ++--
.../LocalResponseTransportOutDescription.java | 2 +-
.../transport/local/LocalTransportReceiver.java | 2 +-
.../transport/local/LocalTransportSender.java | 4 ++--
.../org/apache/axis2/transport/local/axis2.xml | 12 +++++-----
.../axis2/transport/mail/MailOutTransportInfo.java | 2 +-
.../mail/MailRequestResponseTransport.java | 2 +-
.../transport/mail/MailTransportListener.java | 4 ++--
.../axis2/transport/mail/MailTransportSender.java | 4 ++--
modules/transport/tcp/conf/axis2.xml | 10 ++++----
modules/transport/tcp/conf/client_axis2.xml | 10 ++++----
.../axis2/transport/tcp/TCPOutTransportInfo.java | 2 +-
.../axis2/transport/tcp/TCPTransportSender.java | 6 ++---
.../org/apache/axis2/transport/tcp/TCPWorker.java | 2 +-
.../axis2/transport/testkit/axis2/LogAspect.java | 2 +-
.../axis2/SimpleTransportDescriptionFactory.java | 4 ++--
.../testkit/axis2/client/AxisTestClient.java | 2 +-
.../axis2/client/AxisTestClientContext.java | 2 +-
.../testkit/axis2/endpoint/AxisTestEndpoint.java | 2 +-
.../axis2/endpoint/AxisTestEndpointContext.java | 2 +-
.../axis2/transport/testkit/package-info.java | 2 +-
.../util/LifecycleFixTransportListenerProxy.java | 2 +-
.../org/apache/axis2/transport/udp/UDPSender.java | 6 ++---
.../apache/axis2/transport/xmpp/XMPPListener.java | 2 +-
.../apache/axis2/transport/xmpp/XMPPSender.java | 6 ++---
.../apache/axis2/transport/xmpp/sample/axis2.xml | 12 +++++-----
.../transport/xmpp/util/XMPPOutTransportInfo.java | 2 +-
.../transport/xmpp/util/XMPPPacketListener.java | 4 ++--
modules/webapp/conf/axis2.xml | 10 ++++----
.../src/main/webapp/WEB-INF/include/httpbase.jsp | 4 ++--
196 files changed, 392 insertions(+), 377 deletions(-)
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 7b1565b9c5..507cdfe0b8 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.engine.ObjectSupplier;
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;
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 c169d35dc9..36bddd06eb 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 @@ public class AxisServiceBasedMultiLanguageEmitter implements Emitter {
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 @@ public class AxisServiceBasedMultiLanguageEmitter implements Emitter {
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"));
}
}
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 4967f60aec..7bf7d9733d 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
diff --git a/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java b/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetMessageFormatter.java
index 1f1cc3502e..f2d1ecbf0a 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.axiom.om.OMOutputFormat;
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 @@ public class FastInfosetMessageFormatter implements MessageFormatter {
/**
* 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 @@ public class FastInfosetMessageFormatter implements MessageFormatter {
/**
* 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 @@ public class FastInfosetMessageFormatter implements MessageFormatter {
* 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 @@ public class FastInfosetMessageFormatter implements MessageFormatter {
/**
* 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 {
diff --git a/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java b/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXMessageFormatter.java
index b4f2a20bb9..69a14c09ce 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.axiom.om.OMOutputFormat;
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 @@ public class FastInfosetPOXMessageFormatter implements MessageFormatter {
/**
* 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 @@ public class FastInfosetPOXMessageFormatter implements MessageFormatter {
/**
* 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 @@ public class FastInfosetPOXMessageFormatter implements MessageFormatter {
* 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 @@ public class FastInfosetPOXMessageFormatter implements MessageFormatter {
/**
* 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 {
diff --git a/modules/fastinfoset/test-resources/axis2.xml b/modules/fastinfoset/test-resources/axis2.xml
index 21bc381c34..499c6fa273 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"
diff --git a/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml b/modules/integration/test-resources/jaxrs/pojo-enabled-axis2.xml
index 41f77334be..be7f06b99e 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>
<!-- ================================================= -->
diff --git a/modules/integration/test/org/apache/axis2/async/AsyncService2Test.java b/modules/integration/test/org/apache/axis2/async/AsyncService2Test.java
index 47150ed6c6..bb6162159a 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.Echo;
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;
diff --git a/modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java b/modules/integration/test/org/apache/axis2/builder/UnknownContentBuilderTest.java
index 25533beb9f..9be4c34724 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.ConfigurationContext;
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{
diff --git a/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java b/modules/integration/test/org/apache/axis2/engine/EchoRawRuntimeProxyTest.java
index 44753b138a..6edef35966 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.description.AxisService;
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;
diff --git a/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java b/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
index 9e1c8a0188..22cad8275d 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.engine.util.TestConstants;
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;
diff --git a/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java b/modules/integration/test/org/apache/axis2/faults/FaultSerializationTest.java
index 2265769199..35887b3526 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.AxisFault;
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;
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 c996e211bf..ce2ecea924 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 @@ public class DispatchXMessageDataSourceTests {
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,
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 f1b6ad2a87..28cefe1c35 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.WebServiceContext;
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
diff --git a/modules/jaxws-integration/test-resources/axis2.xml b/modules/jaxws-integration/test-resources/axis2.xml
index 0879d7c4ad..4b920b306e 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>
<!-- ================================================= -->
diff --git a/modules/jaxws-integration/test-resources/axis2_addressing.xml b/modules/jaxws-integration/test-resources/axis2_addressing.xml
index d41ce1dd01..3f3e00a3f5 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>
<!-- ================================================= -->
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 ac3673ebe7..9cc8e08976 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.axiom.util.UIDGenerator;
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;
diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java b/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
index 9473b858c9..cdf9cdeef7 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.description.ServiceDescription;
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;
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 183049d046..03e5d63000 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.Binding;
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;
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 7378d65312..1041a4f138 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.Constants;
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;
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 57076da4e3..3ccc288a95 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.description.ServiceDescriptionWSDL;
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;
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 79922f26f5..9224c4966d 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.handler.MEPContext;
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;
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 b7cd527346..a4a4a1cda7 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.message.util.MessageUtils;
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;
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 9d118ced6f..a264d99998 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 @@ package org.apache.axis2.jaxws.handler;
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;
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 707c4e7c76..e73e9ba73d 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.ExceptionFactory;
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;
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 a49f3df600..23ae11f758 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.OMBlock;
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;
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 608bb09b3e..21683950ff 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.Protocol;
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;
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 b1a797cd90..4d2f7b7cbe 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.i18n.Messages;
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;
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 620df9cc17..93a16cfce0 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.InvocationListener;
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;
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 1acb522eaf..3efa326766 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.axiom.om.impl.OMMultipartWriter;
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;
diff --git a/modules/jaxws/test-resources/axis2.xml b/modules/jaxws/test-resources/axis2.xml
index 30f0843797..55c16972ac 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>
<!-- ================================================= -->
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 3eb9a65145..f04bb2a9eb 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.addressing.SubmissionEndpointReferenceBuilder;
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 {
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 cd8830b354..9f1bf1cbdf 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.InterceptableClientTestCase;
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
diff --git a/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java b/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
index ec08832aaa..768f8dcfef 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.AxisFault;
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;
diff --git a/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java b/modules/json/src/org/apache/axis2/json/AbstractJSONOMBuilder.java
index 7551bd5a97..af3af8531a 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.Constants;
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;
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 6c42c44161..b58cb6a642 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.AxisFault;
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;
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 1936873238..475d20f93b 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.AxisFault;
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;
diff --git a/modules/json/test/org/apache/axis2/json/Echo.java b/modules/json/test/org/apache/axis2/json/Echo.java
index 6beb61f29c..36315d419f 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.axiom.om.OMElement;
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 {
diff --git a/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java b/modules/json/test/org/apache/axis2/json/JSONOMBuilderTest.java
index 0e46994003..a70a72b9df 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.axiom.soap.SOAPEnvelope;
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;
diff --git a/modules/kernel/conf/axis2.xml b/modules/kernel/conf/axis2.xml
index 80b692346d..d57b3ad164 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>
<!-- ================================================= -->
diff --git a/modules/kernel/src/org/apache/axis2/Constants.java b/modules/kernel/src/org/apache/axis2/Constants.java
index 7d950dc3ac..c02c50925d 100644
--- a/modules/kernel/src/org/apache/axis2/Constants.java
+++ b/modules/kernel/src/org/apache/axis2/Constants.java
@@ -22,7 +22,7 @@ package org.apache.axis2;
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 @@ public class Constants extends org.apache.axis2.namespace.Constants {
/**
* 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";
diff --git a/modules/kernel/src/org/apache/axis2/builder/Builder.java b/modules/kernel/src/org/apache/axis2/builder/Builder.java
index 20e0a30d2a..205ebea587 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 @@ import java.io.InputStream;
/**
* 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)}
diff --git a/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java b/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
index 99be383893..09f34eaad1 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.AxisOperation;
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;
diff --git a/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java b/modules/kernel/src/org/apache/axis2/builder/MultipartFormDataBuilder.java
index 37b29f7607..99d7389abb 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.axiom.om.OMElement;
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;
diff --git a/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java b/modules/kernel/src/org/apache/axis2/builder/XFormURLEncodedBuilder.java
index 10aec9b8a3..7b4667331b 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.AxisEndpoint;
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 @@ public class XFormURLEncodedBuilder implements Builder {
throw new AxisFault(Messages.getMessage("invalidSOAPversion"));
}
}
-}
\ No newline at end of file
+}
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 8b307f7e6c..075a4aa8f3 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.OMFactory;
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 {
diff --git a/modules/kernel/src/org/apache/axis2/client/Options.java b/modules/kernel/src/org/apache/axis2/client/Options.java
index dbd93e97dc..8aed71a65c 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.TransportInDescription;
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 @@ public class Options implements Externalizable, SafeSerializable {
* <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 @@ public class Options implements Externalizable, SafeSerializable {
* </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 @@ public class Options implements Externalizable, SafeSerializable {
* <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 @@ public class Options implements Externalizable, SafeSerializable {
* 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>
diff --git a/modules/kernel/src/org/apache/axis2/client/Stub.java b/modules/kernel/src/org/apache/axis2/client/Stub.java
index 9f379f115e..adb5ffc9bb 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.OutInAxisOperation;
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;
diff --git a/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java b/modules/kernel/src/org/apache/axis2/context/ConfigurationContextFactory.java
index 04626e1896..9a5f443851 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.AxisConfigurator;
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;
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 997bbb56c6..fdfc5b5b1e 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.TransportInDescription;
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;
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 78c9066c54..4e8dc8c46d 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.AxisFault;
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;
diff --git a/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java b/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
index c7d6148907..367ad3ac03 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.MessageReceiver;
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;
diff --git a/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java b/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
index 7234b70b9a..f5bb35ee6c 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.description.WSDL2Constants;
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;
diff --git a/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java b/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
index 7133f58e21..a580497055 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.AxisServiceGroup;
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;
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 2c37fa88aa..8f6bcbf08f 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>
<!-- ================================================= -->
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java b/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
index 566270653a..3e20a03417 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.axiom.om.OMNamespace;
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;
diff --git a/modules/kernel/src/org/apache/axis2/description/AxisService.java b/modules/kernel/src/org/apache/axis2/description/AxisService.java
index 0fa8fc63a8..a89454ec3e 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.ObjectSupplier;
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;
diff --git a/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java b/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
index b36442f6d6..d3120f7d86 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.OperationContext;
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;
diff --git a/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java b/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
index 56d3e9f783..42fb5d57c1 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.client.Options;
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;
diff --git a/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java b/modules/kernel/src/org/apache/axis2/description/TransportInDescription.java
index 8e2b98956e..725a11ad55 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.axiom.om.OMElement;
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.
diff --git a/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java b/modules/kernel/src/org/apache/axis2/description/TransportOutDescription.java
index 5e0bb50153..de41e6f59b 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.axiom.om.OMElement;
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;
diff --git a/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java b/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
index 7554452f06..9ba96d1563 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.EndpointReference;
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;
diff --git a/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java b/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
index 5f8b520ce7..39ff6396cd 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.SOAP11Constants;
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;
diff --git a/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java b/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
index 66cbd29bce..5a58882f50 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.AxisService;
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;
diff --git a/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java b/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
index 03cc8c49a5..ae9b4df6c8 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.description.java2wsdl.Java2WSDLConstants;
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;
diff --git a/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java b/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java
index 766976a8e5..284811fb8a 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.TransportOutDescription;
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;
diff --git a/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java b/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java
index 148470c973..24a96b0c16 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.AxisServiceGroup;
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;
diff --git a/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java b/modules/kernel/src/org/apache/axis2/engine/ListenerManager.java
index 6d1326356e..eee2c4fbcb 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.AxisService;
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 @@ public class ListenerManager {
*
* <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
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 d02823e701..5271b3239e 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 @@ import java.net.URL;
* <p/>
* <messageFormatters>
* <messageFormatter contentType="application/soap+xml"
- * class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ * class="org.apache.axis2.kernel.http.SOAPMessageFormatter"/>
* </messageFormatters>
* </p>
*/
diff --git a/modules/kernel/src/org/apache/axis2/transport/OutTransportInfo.java b/modules/kernel/src/org/apache/axis2/kernel/OutTransportInfo.java
similarity index 96%
rename from modules/kernel/src/org/apache/axis2/transport/OutTransportInfo.java
rename to modules/kernel/src/org/apache/axis2/kernel/OutTransportInfo.java
index 7bd8ec979c..49cf7d4dff 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);
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 1ff54e3b43..0268536c74 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;
diff --git a/modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java b/modules/kernel/src/org/apache/axis2/kernel/SimpleAxis2Server.java
similarity index 99%
rename from modules/kernel/src/org/apache/axis2/transport/SimpleAxis2Server.java
rename to modules/kernel/src/org/apache/axis2/kernel/SimpleAxis2Server.java
index 03c5500ab1..2c57cadedb 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;
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 48105e2703..5cb97561df 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;
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 32ba68e5a6..4a478259e8 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;
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 f147a25722..ab9c80d5f5 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.context.OperationContext;
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;
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 97%
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 5b70e274d6..0d21773d93 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.axiom.soap.SOAPFaultDetail;
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;
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 3a97a78792..b6cc840d31 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;
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 5834fac40f..4c8cab3359 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.OMOutputFormat;
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;
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 8e47543080..82a675683b 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.axiom.util.UIDGenerator;
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;
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 9a7f425a22..3a36c79cf8 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.AxisFault;
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;
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 95%
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 2bdffc6a3a..a4eaa1b942 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;
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 73182b2400..26f44fb3af 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;
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 96%
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 7719eb0a73..7ddc118e69 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 @@ public class URIEncoderDecoder {
return result.toString();
}
-}
\ No newline at end of file
+}
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 96%
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 00015396f2..de6f5befbe 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;
diff --git a/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java b/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
index 8256e7615f..514045dfbe 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.MessageContext;
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;
diff --git a/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java b/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java
index 0f831e8412..f13720b6f7 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.builder.Builder;
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 @@ public class MessageProcessorSelector {
return cType;
}
-}
\ No newline at end of file
+}
diff --git a/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java b/modules/kernel/src/org/apache/axis2/util/ObjectStateUtils.java
index 981c663d99..ae7aa8baf9 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.AxisOperation;
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;
diff --git a/modules/kernel/src/org/apache/axis2/util/Utils.java b/modules/kernel/src/org/apache/axis2/util/Utils.java
index 6898c2dcd5..962a17d3a6 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.Handler;
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;
diff --git a/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java b/modules/kernel/src/org/apache/axis2/util/WSDL20Util.java
index ff47b683c3..57acfadde8 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.AxisFault;
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;
diff --git a/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml b/modules/kernel/test-resources/deployment/CustomDeployerRepo/axis2.xml
index 28fbd83b4b..7bed1c5e1b 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>
<!-- ================================================= -->
diff --git a/modules/kernel/test-resources/deployment/axis2_a.xml b/modules/kernel/test-resources/deployment/axis2_a.xml
index d8d43dc747..6dab46acf2 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>
<!-- ================================================= -->
diff --git a/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml b/modules/kernel/test-resources/deployment/exculeRepo/axis2.xml
index 2e4114a970..d7b3b8dd11 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>
<!-- ================================================= -->
diff --git a/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml b/modules/kernel/test-resources/deployment/messageFormatterTest/axis2.xml
index 99a41fc596..b6967ed647 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 -->
diff --git a/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml b/modules/kernel/test-resources/deployment/moduleDisEngegeRepo/axis2.xml
index 2e4114a970..d7b3b8dd11 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>
<!-- ================================================= -->
diff --git a/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml b/modules/kernel/test-resources/deployment/repositories/moduleLoadTest/axis2.xml
index 4e02e38f4e..2643af8651 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>
<!-- ================================================= -->
diff --git a/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml b/modules/kernel/test-resources/deployment/soaproleconfiguration/axis2.xml
index 270535ba4d..00e96cc3c8 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>
<!-- ================================================= -->
diff --git a/modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java b/modules/kernel/test/org/apache/axis2/deployment/DummyTransportListener.java
index 34298df728..1ea192c92c 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.ConfigurationContext;
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 {
diff --git a/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java b/modules/kernel/test/org/apache/axis2/deployment/MessageFormatterDeploymentTest.java
index 6a54cfe154..184ebe0e57 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 @@ public class MessageFormatterDeploymentTest extends AbstractTestCase {
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 {
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 88fffcaebc..43cb5f86a1 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;
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 77a6bc6ebc..c40c5bbe33 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;
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 fb45df8c8d..1f78126a72 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;
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 4366e40ae5..7f4a4a95cf 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;
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 a44fb2584c..cd8b26382c 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;
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 11b5a86a6c..c6f263ad85 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.JAXWSCatalogManager;
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 @@ public class JAXWSRIWSDLGenerator implements SchemaSupplier, WSDLSupplier {
return exists;
}
-}
\ No newline at end of file
+}
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 8fb19bc967..b7fe8b72d2 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>
<!-- ================================================= -->
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 28a3ef60a8..5f2b3534f1 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 static org.apache.axis2.osgi.deployment.OSGiAxis2Constants.*;
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.*;
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 d71f14d2be..f67f6d8655 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;
diff --git a/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java b/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
index 1a61c4018d..4f6d9c1001 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.OMAbstractFactory;
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;
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
index 9f6e49edc4..fe5609c7f8 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.engine.Phase;
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;
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
index b15d38c46a..6d252a300d 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.SOAPFactory;
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;
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java b/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
index 5225613a64..ec78009192 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.SOAPFactory;
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;
diff --git a/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java b/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
index cd020d75b8..24576a129d 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 junit.framework.Assert;
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;
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 fceda4de90..fd4f586175 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>
<!-- ================================================= -->
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 2a06d01395..d9e837298a 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>
<!-- ================================================= -->
diff --git a/modules/samples/json/resources/axis2.xml b/modules/samples/json/resources/axis2.xml
index 67003c2e2a..edf0707b06 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" />
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 923c0d5243..7fb2f707e8 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>
<!-- ================================================= -->
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 937fad1f51..35e6280a6b 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>
<!-- ================================================= -->
diff --git a/modules/samples/userguide/conf/axis2.xml b/modules/samples/userguide/conf/axis2.xml
index 15d7beb0c3..87d214dc29 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>
<!-- ================================================= -->
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 dd06722868..de8fe7dc5b 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>
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 7bddf4469f..12447c6c27 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 userguide.springboot.hibernate.dao.SpringSecurityDAOImpl;
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;
diff --git a/modules/samples/yahoojsonsearch/resources/axis2.xml b/modules/samples/yahoojsonsearch/resources/axis2.xml
index 591efb3194..2d0279aad4 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>
<!-- ================================================= -->
diff --git a/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java b/modules/samples/yahoojsonsearch/src/sample/yahooservices/JSONSearch/JSONSearchModel.java
index 22c6fc743c..b3338310d7 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.OMAbstractFactory;
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;
diff --git a/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java b/modules/samples/yahoorestsearch/src/sample/yahooservices/RESTSearch/RESTSearchModel.java
index a37dd3fc8a..36507e095c 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 @@ public class RESTSearchModel {
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));
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 8152dd384f..7ff234000a 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.ServiceObjectSupplier;
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;
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 223d7f12d5..00ad6ff171 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 @@ package org.apache.axis2.maven2.server.util;
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;
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 0deb04e320..d21b7755af 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.OMOutputFormat;
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 {
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 aee5acbc8b..0653bb05ab 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 javax.activation.DataSource;
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.
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 5d36042477..1a95307c7d 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.blob.MemoryBlobOutputStream;
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
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 8efc728342..cb955b8a98 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;
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 3e75fb6668..d18117ccdc 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.threads.WorkerPoolFactory;
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;
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 5e8963ff94..16e6108dad 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.wsdl.WSDLConstants;
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;
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 b272aa2ac1..c8f79700cf 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.description.AxisService;
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;
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 cb8dfeea46..f2d15a4ae4 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 @@ public abstract class ProtocolEndpoint {
* @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;
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 703afc99ca..4fd1a79c8d 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.MBeanServer;
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;
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 3eae31aba8..7bd02c6654 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;
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 dbac4e4e2d..8f6e5d637d 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;
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 a969222732..fe1432af9e 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 java.io.InputStream;
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;
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 bdd1a30c17..86f11bcffa 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.context.NamedValue;
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;
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 3c12f71fdb..dc8324d6a6 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.blob.MemoryBlob;
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;
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 c33db3521f..7780481eae 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.AxisConfiguration;
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 @@ public class AxisServlet extends HttpServlet {
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);
}
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 4874079c03..452ce5aae0 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.MessageContext;
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;
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 04c74439ac..48d2e1a5c6 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.NamedValue;
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;
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 0f6641ec0f..f63e492ae0 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 {
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 27a6a6e772..c6e8fca516 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.description.TransportInDescription;
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;
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 399650e418..b67ec089ca 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.context.MessageContext;
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;
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 eb9195fccf..68095d62fb 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;
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 7ea6d3c6bc..fd8e532baf 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.context.SessionContext;
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 class SimpleHTTPServer implements TransportListener {
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 @@ public class SimpleHTTPServer implements TransportListener {
* @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 @@ public class SimpleHTTPServer implements TransportListener {
* @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];
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 664c32636b..0cdf7f6a8f 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;
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 2a49934e64..69189a936e 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.AxisFault;
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;
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 f8b8df9bf3..0dd443ee40 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.axiom.om.OMElement;
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;
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 63c46dba60..8e76995752 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 @@ package org.apache.axis2.transport.http.impl.httpclient4;
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;
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 28758cc34a..af2db8d7d4 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 java.util.Map;
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;
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 0b631458eb..ca69ccfc13 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.params.HttpParams;
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;
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 e886189c01..9ddc031683 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.context.MessageContext;
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;
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 26b9e754c0..78ae33639e 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 {
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 6b8b28d69d..efd5956a74 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;
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 13ad2dcc1a..350b8ac86b 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 @@ package org.apache.axis2.transport.http.server;
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;
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 7752a115d6..f11662d565 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.RequestURIBasedDispatcher;
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;
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 913410ad4c..294b097a66 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 @@ package org.apache.axis2.transport.http;
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;
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 5b88f35335..087b30e1eb 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.context.NamedValue;
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;
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 5259dcca6b..c95c27cd7d 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.ConfigurationContext;
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;
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 02c15408b5..dde8f71ccb 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.Date;
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 @@ public class MockAxisHttpResponse extends BasicHttpRequest implements AxisHttpRe
return byteArrayOutputStream;
}
-}
\ No newline at end of file
+}
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 95fabce7b3..5a69904108 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.ServletOutputStream;
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 class MockHttpServletResponse implements HttpServletResponse, OutTranspor
public Collection<String> getHeaderNames() {
throw new UnsupportedOperationException();
}
-}
\ No newline at end of file
+}
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 864c057158..c0fa462015 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;
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 8b69e6558c..774e44dc4f 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.Constants;
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;
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 31a715d95c..88507a4eff 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.TextMessageBuilder;
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;
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 d9ec4ee0ea..fec649830e 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.ConfigurationContext;
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;
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 24b702e6f5..8707e01065 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.Flow;
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;
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 3c73c15a94..07aae1d2f1 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.context.MessageContext;
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;
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 03413e2066..0103f00a8f 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.ConfigurationContext;
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;
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 2819f39ec1..ff107b402f 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>
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 efcb089616..e08a0817e5 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;
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 7c19f4faee..edc6cbc987 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;
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 bfa31d7f24..3306023d6e 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.Constants;
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;
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 cb4f0aa2fd..7236ad4789 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.context.MessageContext;
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;
diff --git a/modules/transport/tcp/conf/axis2.xml b/modules/transport/tcp/conf/axis2.xml
index db7dbeaf08..71200788ce 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>
<!-- ================================================= -->
diff --git a/modules/transport/tcp/conf/client_axis2.xml b/modules/transport/tcp/conf/client_axis2.xml
index 7822d78c87..6c2fa82327 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>
<!-- ================================================= -->
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 085a646516..2083b63607 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;
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 93191ffc5d..d4ece43efb 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.AxisFault;
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;
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 cd1ae9b64d..0f49250991 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 @@ package org.apache.axis2.transport.tcp;
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;
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 245adbb622..1fa8029dcd 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 @@ import org.aspectj.lang.annotation.Aspect;
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)")
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 6d4972f62a..dcc9304589 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 @@ package org.apache.axis2.transport.testkit.axis2;
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;
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 e5991c8084..9d4d39efdb 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.OperationClient;
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;
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 8501a0df3f..1e7ba86e7e 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.TransportInDescription;
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;
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 3dc19cdbf5..2b46824d13 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.AxisOperation;
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;
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 47c2b89d74..75bf874072 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.AxisService;
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;
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 2752f54d5a..f36bf1852d 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
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 a0a1bdc8f7..2cd5b05a0f 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.ConfigurationContext;
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;
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 191534a76e..a6dfac57d0 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.context.MessageContext;
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;
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 bf84152930..ef46a70b25 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.context.SessionContext;
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;
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 55e612c7a9..5126f6eeb1 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.Parameter;
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;
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 9ce14d1b43..b10fd533e5 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>
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 6c82fb4dfd..0b6ef75586 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 @@ package org.apache.axis2.transport.xmpp.util;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.transport.OutTransportInfo;
+import org.apache.axis2.kernel.OutTransportInfo;
/**
*
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 ef607271c8..2fb73c154c 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.AxisService;
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;
diff --git a/modules/webapp/conf/axis2.xml b/modules/webapp/conf/axis2.xml
index 9d873d906b..1f07247b9f 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>
<!-- ================================================= -->
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 0aac806b2c..11bc19499f 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)%>">