You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2005/06/30 11:19:40 UTC
svn commit: r202511 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/deployment/
core/src/org/apache/axis/receivers/ core/src/org/apache/axis/transport/http/
samples/test/org/apache/axis/engine/
Author: hemapani
Date: Thu Jun 30 02:19:38 2005
New Revision: 202511
URL: http://svn.apache.org/viewcvs?rev=202511&view=rev
Log:
improve the transports
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentException.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOnlyMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPConstants.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CommonsHTTPEchoRawXMLTest.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java?rev=202511&r1=202510&r2=202511&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/InOutMEPClient.java Thu Jun 30 02:19:38 2005
@@ -234,16 +234,17 @@
boolean useSeparateListener)
throws AxisFault {
- if (useSeparateListener) {
- if ((senderTransport.equals(listenerTransport)
- && (Constants.TRANSPORT_HTTP.equals(senderTransport)
- || Constants.TRANSPORT_TCP.equals(senderTransport)))
- || (Constants.TRANSPORT_COMMONS_HTTP.equals(senderTransport)
- && Constants.TRANSPORT_HTTP.equals(listenerTransport))) {
- this.useSeparateListener = useSeparateListener;
- } else {
- throw new AxisFault("useSeparateListener = false is only supports by the htpp transport set as the sender and receiver");
+ if (!useSeparateListener) {
+ boolean isTransportsEqual = senderTransport.equals(listenerTransport);
+ boolean isATwoWaytransport = Constants.TRANSPORT_HTTP.equals(senderTransport)
+ || Constants.TRANSPORT_TCP.equals(senderTransport)
+ || Constants.TRANSPORT_COMMONS_HTTP.equals(senderTransport);
+ if(!isTransportsEqual || !isATwoWaytransport){
+ throw new AxisFault("useSeparateListener = false is only supports by the htpp/tcp and tcp commons transport set as the sender and receiver");
}
+ }else{
+ this.useSeparateListener = useSeparateListener;
+
}
AxisConfiguration axisConfig = serviceContext.getEngineContext().getAxisConfiguration();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentException.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentException.java?rev=202511&r1=202510&r2=202511&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentException.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentException.java Thu Jun 30 02:19:38 2005
@@ -23,8 +23,6 @@
super(cause);
}
-
-
public DeploymentException(String message) {
super(message);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOnlyMessageReceiver.java?rev=202511&r1=202510&r2=202511&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOnlyMessageReceiver.java Thu Jun 30 02:19:38 2005
@@ -86,7 +86,7 @@
if (methods[i].getName().equals(methodName)) {
this.method = methods[i];
break;
- }
+ }
}
Class[] parameters = method.getParameterTypes();
if ((parameters != null)
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPConstants.java?rev=202511&r1=202510&r2=202511&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPConstants.java Thu Jun 30 02:19:38 2005
@@ -386,6 +386,7 @@
public static final String HTTP_REQ_TYPE = "HTTP_REQ_TYPE";
public static final String HTTPOutTransportInfo = "HTTPOutTransportInfo";
+ public static final String MTOM_RECIVED = "MTOM_RECEIVED";
/**
* Default content encoding chatset
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CommonsHTTPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CommonsHTTPEchoRawXMLTest.java?rev=202511&r1=202510&r2=202511&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CommonsHTTPEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CommonsHTTPEchoRawXMLTest.java Thu Jun 30 02:19:38 2005
@@ -90,7 +90,7 @@
org.apache.axis.clientapi.Call call = new org.apache.axis.clientapi.Call(Constants.TESTING_PATH+"commons-http-enabledRepository");
call.setTo(targetEPR);
- call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP, Constants.TRANSPORT_HTTP, false);
+ call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP, Constants.TRANSPORT_COMMONS_HTTP, false);
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
@@ -127,7 +127,7 @@
org.apache.axis.clientapi.Call call = new org.apache.axis.clientapi.Call(Constants.TESTING_PATH+"commons-http-enabledRepository");
call.setTo(targetEPR);
- call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP, Constants.TRANSPORT_HTTP, false);
+ call.setTransportInfo(Constants.TRANSPORT_COMMONS_HTTP, Constants.TRANSPORT_COMMONS_HTTP, false);
OMElement result =
(OMElement) call.invokeBlocking(operationName.getLocalPart(), payload);