Author: veithen
Date: Sun Sep 28 01:10:11 2008
New Revision: 699777
URL: http://svn.apache.org/viewvc?rev=699777&view=rev
Log:
Transport test kit: we have our own axis2.xml now -> no need to change the
configuration programatically.
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java?rev=699777&r1=699776&r2=699777&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java
Sun Sep 28 01:10:11 2008
@@ -35,8 +35,6 @@
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.format.BinaryBuilder;
-import org.apache.axis2.format.PlainTextBuilder;
import org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
import org.apache.axis2.wsdl.WSDLConstants;
@@ -52,15 +50,7 @@
public UtilsTransportServer() throws AxisFault {
cfgCtx = ConfigurationContextFactory.
createConfigurationContext(new CustomAxisConfigurator());
- AxisConfiguration axisConfiguration = cfgCtx.getAxisConfiguration();
- // remove http transport
- axisConfiguration.getTransportsIn().remove("http");
-
- // add default builders known by Synapse but not by Axis2
- axisConfiguration.addMessageBuilder("text/plain", new
PlainTextBuilder());
- axisConfiguration.addMessageBuilder("application/octet-stream", new
BinaryBuilder());
-
// create listener manager
listnMgr = new ListenerManager();
listnMgr.init(cfgCtx);
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java?rev=699777&r1=699776&r2=699777&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
Sun Sep 28 01:10:11 2008
@@ -23,8 +23,6 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.format.BinaryFormatter;
-import org.apache.axis2.format.PlainTextFormatter;
import org.apache.axis2.transport.CustomAxisConfigurator;
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
@@ -44,9 +42,6 @@
trpOutDesc = tdf.createTransportOutDescription();
axisCfg.addTransportOut(trpOutDesc);
trpOutDesc.getSender().init(cfgCtx, trpOutDesc);
-
- axisCfg.addMessageFormatter("text/plain", new PlainTextFormatter());
- axisCfg.addMessageFormatter("application/octet-stream", new
BinaryFormatter());
}
@SuppressWarnings("unused")
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml?rev=699777&r1=699776&r2=699777&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml
Sun Sep 28 01:10:11 2008
@@ -105,7 +105,11 @@
<messageFormatter contentType="text/xml"
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
<messageFormatter contentType="application/soap+xml"
-
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ <messageFormatter contentType="text/plain"
+ class="org.apache.axis2.format.PlainTextFormatter"/>
+ <messageFormatter contentType="application/octet-stream"
+ class="org.apache.axis2.format.BinaryFormatter"/>
</messageFormatters>
<!-- ================================================= -->
@@ -117,7 +121,11 @@
<messageBuilder contentType="application/xml"
class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
<messageBuilder contentType="application/x-www-form-urlencoded"
-
class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+
class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+ <messageBuilder contentType="text/plain"
+ class="org.apache.axis2.format.PlainTextBuilder"/>
+ <messageBuilder contentType="application/octet-stream"
+ class="org.apache.axis2.format.BinaryBuilder"/>
<!--Left commented because it adds the depandancy of servlet-api to
other modules.
Please uncomment to Receive messages in multipart/form-data format-->
<!--<messageBuilder contentType="multipart/form-data"-->
