axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r547397 - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/rpc/receivers/ fastinfoset/test/org/apache/axis2/fastinfoset/ integration/test-resources/ integration/test-resources/ComplexDataTypes/ integration/test/org/apache/...
Date Thu, 14 Jun 2007 20:32:29 GMT
Author: deepal
Date: Thu Jun 14 13:32:27 2007
New Revision: 547397

URL: http://svn.apache.org/viewvc?view=rev&rev=547397
Log:
fixing build error
- Cleanup code in the client side
  (which will fix the AXIS2-2248)

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
    webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java
    webservices/axis2/trunk/java/modules/integration/test-resources/BaseDataTypes.wsdl
    webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/async/Callback.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Thu Jun 14 13:32:27 2007
@@ -92,7 +92,6 @@
                             "' in class " + ImplClass.getName());
                 }
             }
-
             Object resObject = null;
             if (inAxisMessage != null) {
                 if (inAxisMessage.getElementQName() == null) {
@@ -160,7 +159,7 @@
             }
             throw new AxisFault(msg, e);
         } catch(RuntimeException e) {
-            throw new AxisFault(e.getMessage(), e);
+            throw AxisFault.makeFault(e);
         } catch (Exception e) {
             String msg = "Exception occurred while trying to invoke service method " +
                     method.getName();

Modified: webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetTest.java Thu Jun 14 13:32:27 2007
@@ -69,7 +69,7 @@
 		serverCount++;
 		
 		service = AxisService.createService("org.apache.axis2.fastinfoset.SimpleAddService", 
-				server.getConfigurationContext().getAxisConfiguration(), RPCMessageReceiver.class);
+				server.getConfigurationContext().getAxisConfiguration());
 
 		server.getConfigurationContext().getAxisConfiguration().addService(
                 service);

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/BaseDataTypes.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/BaseDataTypes.wsdl?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/BaseDataTypes.wsdl (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/BaseDataTypes.wsdl Thu Jun 14 13:32:27 2007
@@ -1038,11 +1038,10 @@
             </wsdl:output>
         </wsdl:operation>
     </wsdl:binding>
-    <wsdl:binding name="BaseDataTypesHttpBinding"
-                  type="axis2:BaseDataTypesPortType">
+   <wsdl:binding name="BaseDataTypesHttpBinding" type="axis2:BaseDataTypesPortType">
         <http:binding verb="POST"/>
         <wsdl:operation name="retUInt">
-            <http:operation location="retUInt"/>
+            <http:operation location="BaseDataTypes/retUInt"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retUInt"/>
             </wsdl:input>
@@ -1051,7 +1050,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retSingle">
-            <http:operation location="retSingle"/>
+            <http:operation location="BaseDataTypes/retSingle"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retSingle"/>
             </wsdl:input>
@@ -1060,7 +1059,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retTimeSpan">
-            <http:operation location="retTimeSpan"/>
+            <http:operation location="BaseDataTypes/retTimeSpan"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retTimeSpan"/>
             </wsdl:input>
@@ -1069,7 +1068,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDateTime">
-            <http:operation location="retDateTime"/>
+            <http:operation location="BaseDataTypes/retDateTime"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDateTime"/>
             </wsdl:input>
@@ -1078,7 +1077,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retGuid">
-            <http:operation location="retGuid"/>
+            <http:operation location="BaseDataTypes/retGuid"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retGuid"/>
             </wsdl:input>
@@ -1087,7 +1086,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retByteArray">
-            <http:operation location="retByteArray"/>
+            <http:operation location="BaseDataTypes/retByteArray"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retByteArray"/>
             </wsdl:input>
@@ -1096,7 +1095,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retByte">
-            <http:operation location="retByte"/>
+            <http:operation location="BaseDataTypes/retByte"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retByte"/>
             </wsdl:input>
@@ -1105,7 +1104,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retSByte">
-            <http:operation location="retSByte"/>
+            <http:operation location="BaseDataTypes/retSByte"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retSByte"/>
             </wsdl:input>
@@ -1114,7 +1113,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retShort">
-            <http:operation location="retShort"/>
+            <http:operation location="BaseDataTypes/retShort"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retShort"/>
             </wsdl:input>
@@ -1123,7 +1122,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retUri">
-            <http:operation location="retUri"/>
+            <http:operation location="BaseDataTypes/retUri"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retUri"/>
             </wsdl:input>
@@ -1132,7 +1131,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retQName">
-            <http:operation location="retQName"/>
+            <http:operation location="BaseDataTypes/retQName"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retQName"/>
             </wsdl:input>
@@ -1141,7 +1140,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retFloat">
-            <http:operation location="retFloat"/>
+            <http:operation location="BaseDataTypes/retFloat"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retFloat"/>
             </wsdl:input>
@@ -1150,7 +1149,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retObject">
-            <http:operation location="retObject"/>
+            <http:operation location="BaseDataTypes/retObject"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retObject"/>
             </wsdl:input>
@@ -1159,7 +1158,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retBool">
-            <http:operation location="retBool"/>
+            <http:operation location="BaseDataTypes/retBool"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retBool"/>
             </wsdl:input>
@@ -1168,7 +1167,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDouble">
-            <http:operation location="retDouble"/>
+            <http:operation location="BaseDataTypes/retDouble"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDouble"/>
             </wsdl:input>
@@ -1177,7 +1176,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDecimal">
-            <http:operation location="retDecimal"/>
+            <http:operation location="BaseDataTypes/retDecimal"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDecimal"/>
             </wsdl:input>
@@ -1186,7 +1185,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retLong">
-            <http:operation location="retLong"/>
+            <http:operation location="BaseDataTypes/retLong"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retLong"/>
             </wsdl:input>
@@ -1195,7 +1194,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retInt">
-            <http:operation location="retInt"/>
+            <http:operation location="BaseDataTypes/retInt"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retInt"/>
             </wsdl:input>
@@ -1204,7 +1203,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retChar">
-            <http:operation location="retChar"/>
+            <http:operation location="BaseDataTypes/retChar"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retChar"/>
             </wsdl:input>
@@ -1213,7 +1212,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retString">
-            <http:operation location="retString"/>
+            <http:operation location="BaseDataTypes/retString"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retString"/>
             </wsdl:input>
@@ -1222,7 +1221,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retUShort">
-            <http:operation location="retUShort"/>
+            <http:operation location="BaseDataTypes/retUShort"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retUShort"/>
             </wsdl:input>
@@ -1231,7 +1230,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retULong">
-            <http:operation location="retULong"/>
+            <http:operation location="BaseDataTypes/retULong"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retULong"/>
             </wsdl:input>

Modified: webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/ComplexDataTypes/ComplexDataTypes.wsdl Thu Jun 14 13:32:27 2007
@@ -1946,11 +1946,10 @@
             </wsdl:output>
         </wsdl:operation>
     </wsdl:binding>
-    <wsdl:binding name="ComplexDataTypesHttpBinding"
-                  type="axis2:ComplexDataTypesPortType">
+    <wsdl:binding name="ComplexDataTypesHttpBinding" type="axis2:ComplexDataTypesPortType">
         <http:binding verb="POST"/>
         <wsdl:operation name="retStructSNSAS">
-            <http:operation location="retStructSNSAS"/>
+            <http:operation location="ComplexDataTypes/retStructSNSAS"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retStructSNSAS"/>
             </wsdl:input>
@@ -1959,7 +1958,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retSingle">
-            <http:operation location="retSingle"/>
+            <http:operation location="ComplexDataTypes/retSingle"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retSingle"/>
             </wsdl:input>
@@ -1968,7 +1967,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArrayString2D">
-            <http:operation location="retArrayString2D"/>
+            <http:operation location="ComplexDataTypes/retArrayString2D"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArrayString2D"/>
             </wsdl:input>
@@ -1977,7 +1976,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArrayAnyType1D">
-            <http:operation location="retArrayAnyType1D"/>
+            <http:operation location="ComplexDataTypes/retArrayAnyType1D"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArrayAnyType1D"/>
             </wsdl:input>
@@ -1986,7 +1985,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retInts">
-            <http:operation location="retInts"/>
+            <http:operation location="ComplexDataTypes/retInts"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retInts"/>
             </wsdl:input>
@@ -1995,7 +1994,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDateTime">
-            <http:operation location="retDateTime"/>
+            <http:operation location="ComplexDataTypes/retDateTime"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDateTime"/>
             </wsdl:input>
@@ -2004,7 +2003,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retStructSNSA">
-            <http:operation location="retStructSNSA"/>
+            <http:operation location="ComplexDataTypes/retStructSNSA"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retStructSNSA"/>
             </wsdl:input>
@@ -2013,7 +2012,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retGuid">
-            <http:operation location="retGuid"/>
+            <http:operation location="ComplexDataTypes/retGuid"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retGuid"/>
             </wsdl:input>
@@ -2022,7 +2021,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retByteArray">
-            <http:operation location="retByteArray"/>
+            <http:operation location="ComplexDataTypes/retByteArray"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retByteArray"/>
             </wsdl:input>
@@ -2031,7 +2030,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDerivedClass2">
-            <http:operation location="retDerivedClass2"/>
+            <http:operation location="ComplexDataTypes/retDerivedClass2"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDerivedClass2"/>
             </wsdl:input>
@@ -2040,7 +2039,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retUri">
-            <http:operation location="retUri"/>
+            <http:operation location="ComplexDataTypes/retUri"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retUri"/>
             </wsdl:input>
@@ -2049,7 +2048,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retQName">
-            <http:operation location="retQName"/>
+            <http:operation location="ComplexDataTypes/retQName"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retQName"/>
             </wsdl:input>
@@ -2058,7 +2057,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArray1DSN">
-            <http:operation location="retArray1DSN"/>
+            <http:operation location="ComplexDataTypes/retArray1DSN"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArray1DSN"/>
             </wsdl:input>
@@ -2067,7 +2066,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retStrings">
-            <http:operation location="retStrings"/>
+            <http:operation location="ComplexDataTypes/retStrings"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retStrings"/>
             </wsdl:input>
@@ -2076,7 +2075,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retEnumInt">
-            <http:operation location="retEnumInt"/>
+            <http:operation location="ComplexDataTypes/retEnumInt"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retEnumInt"/>
             </wsdl:input>
@@ -2085,7 +2084,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retLong">
-            <http:operation location="retLong"/>
+            <http:operation location="ComplexDataTypes/retLong"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retLong"/>
             </wsdl:input>
@@ -2094,7 +2093,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retUShort">
-            <http:operation location="retUShort"/>
+            <http:operation location="ComplexDataTypes/retUShort"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retUShort"/>
             </wsdl:input>
@@ -2103,7 +2102,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArrayString1D">
-            <http:operation location="retArrayString1D"/>
+            <http:operation location="ComplexDataTypes/retArrayString1D"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArrayString1D"/>
             </wsdl:input>
@@ -2112,7 +2111,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArrayInt1D">
-            <http:operation location="retArrayInt1D"/>
+            <http:operation location="ComplexDataTypes/retArrayInt1D"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArrayInt1D"/>
             </wsdl:input>
@@ -2121,7 +2120,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArrayDateTime1D">
-            <http:operation location="retArrayDateTime1D"/>
+            <http:operation location="ComplexDataTypes/retArrayDateTime1D"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArrayDateTime1D"/>
             </wsdl:input>
@@ -2130,7 +2129,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retUInt">
-            <http:operation location="retUInt"/>
+            <http:operation location="ComplexDataTypes/retUInt"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retUInt"/>
             </wsdl:input>
@@ -2139,7 +2138,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retArrayDecimal1D">
-            <http:operation location="retArrayDecimal1D"/>
+            <http:operation location="ComplexDataTypes/retArrayDecimal1D"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retArrayDecimal1D"/>
             </wsdl:input>
@@ -2148,7 +2147,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retByte">
-            <http:operation location="retByte"/>
+            <http:operation location="ComplexDataTypes/retByte"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retByte"/>
             </wsdl:input>
@@ -2157,7 +2156,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retSByte">
-            <http:operation location="retSByte"/>
+            <http:operation location="ComplexDataTypes/retSByte"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retSByte"/>
             </wsdl:input>
@@ -2166,7 +2165,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retShort">
-            <http:operation location="retShort"/>
+            <http:operation location="ComplexDataTypes/retShort"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retShort"/>
             </wsdl:input>
@@ -2175,7 +2174,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retStructSN">
-            <http:operation location="retStructSN"/>
+            <http:operation location="ComplexDataTypes/retStructSN"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retStructSN"/>
             </wsdl:input>
@@ -2184,7 +2183,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retObject">
-            <http:operation location="retObject"/>
+            <http:operation location="ComplexDataTypes/retObject"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retObject"/>
             </wsdl:input>
@@ -2193,7 +2192,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retFloat">
-            <http:operation location="retFloat"/>
+            <http:operation location="ComplexDataTypes/retFloat"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retFloat"/>
             </wsdl:input>
@@ -2202,7 +2201,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDouble">
-            <http:operation location="retDouble"/>
+            <http:operation location="ComplexDataTypes/retDouble"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDouble"/>
             </wsdl:input>
@@ -2211,7 +2210,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retBool">
-            <http:operation location="retBool"/>
+            <http:operation location="ComplexDataTypes/retBool"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retBool"/>
             </wsdl:input>
@@ -2220,7 +2219,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDerivedClass">
-            <http:operation location="retDerivedClass"/>
+            <http:operation location="ComplexDataTypes/retDerivedClass"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDerivedClass"/>
             </wsdl:input>
@@ -2229,7 +2228,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retDecimal">
-            <http:operation location="retDecimal"/>
+            <http:operation location="ComplexDataTypes/retDecimal"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retDecimal"/>
             </wsdl:input>
@@ -2238,7 +2237,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retEnumString">
-            <http:operation location="retEnumString"/>
+            <http:operation location="ComplexDataTypes/retEnumString"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retEnumString"/>
             </wsdl:input>
@@ -2247,7 +2246,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retStructS1">
-            <http:operation location="retStructS1"/>
+            <http:operation location="ComplexDataTypes/retStructS1"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retStructS1"/>
             </wsdl:input>
@@ -2256,7 +2255,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retInt">
-            <http:operation location="retInt"/>
+            <http:operation location="ComplexDataTypes/retInt"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retInt"/>
             </wsdl:input>
@@ -2265,7 +2264,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retChar">
-            <http:operation location="retChar"/>
+            <http:operation location="ComplexDataTypes/retChar"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retChar"/>
             </wsdl:input>
@@ -2274,7 +2273,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retString">
-            <http:operation location="retString"/>
+            <http:operation location="ComplexDataTypes/retString"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retString"/>
             </wsdl:input>
@@ -2283,7 +2282,7 @@
             </wsdl:output>
         </wsdl:operation>
         <wsdl:operation name="retULong">
-            <http:operation location="retULong"/>
+            <http:operation location="ComplexDataTypes/retULong"/>
             <wsdl:input>
                 <mime:content type="text/xml" part="retULong"/>
             </wsdl:input>

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java Thu Jun 14 13:32:27 2007
@@ -42,8 +42,7 @@
     protected void setUp() throws Exception {
         service = AxisService.createService(Echo.class.getName(),
                                             UtilServer
-                                                    .getConfigurationContext().getAxisConfiguration(),
-                                            RPCMessageReceiver.class);
+                                                    .getConfigurationContext().getAxisConfiguration());
         service.setName(serviceName.getLocalPart());
         UtilServer.deployService(service);
     }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java Thu Jun 14 13:32:27 2007
@@ -247,17 +247,28 @@
         }
     }
 
-    protected void prepareMessageContext(ConfigurationContext cc, MessageContext mc)
+    /**
+     * prepareMessageContext gets a fresh new MessageContext ready to be sent.
+     * It sets up the necessary properties, transport information, etc.
+     *
+     * @param configurationContext the active ConfigurationContext
+     * @param mc the MessageContext to be configured
+     * @throws AxisFault if there is a problem
+     */
+    protected void prepareMessageContext(ConfigurationContext configurationContext,
+                                         MessageContext mc)
             throws AxisFault {
         // set options on the message context
         if (mc.getSoapAction() == null || "".equals(mc.getSoapAction())) {
             mc.setSoapAction(options.getAction());
         }
-        mc.setOptions(options);
+
+        mc.setOptions(new Options(options));
         mc.setAxisMessage(axisOp.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE));
 
         // do Target Resolution
-        TargetResolver targetResolver = cc.getAxisConfiguration().getTargetResolverChain();
+        TargetResolver targetResolver =
+                configurationContext.getAxisConfiguration().getTargetResolverChain();
         if (targetResolver != null) {
             targetResolver.resolveTarget(mc);
         }
@@ -267,7 +278,7 @@
         if (senderTransport == null) {
             EndpointReference toEPR = (options.getTo() != null) ? options
                     .getTo() : mc.getTo();
-            senderTransport = ClientUtils.inferOutTransport(cc
+            senderTransport = ClientUtils.inferOutTransport(configurationContext
                     .getAxisConfiguration(), toEPR, mc);
         }
         mc.setTransportOut(senderTransport);

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/async/Callback.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/async/Callback.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/async/Callback.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/async/Callback.java Thu Jun 14 13:32:27 2007
@@ -70,7 +70,8 @@
      *
      * @param complete
      */
-    public synchronized void setComplete(boolean complete) {
+    public final synchronized void setComplete(boolean complete) {
         this.complete = complete;
+        notify();
     }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Thu Jun 14 13:32:27 2007
@@ -120,6 +120,7 @@
                                 messageReciverMap.put(
                                         WSDL2Constants.MEP_URI_IN_ONLY,
                                         messageReceiver);
+                                messageReciverMap.put(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY,messageReceiver);
                                 Class inoutMessageReceiver = Loader.loadClass(
                                         "org.apache.axis2.rpc.receivers.RPCMessageReceiver");
                                 MessageReceiver inOutmessageReceiver =

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java Thu Jun 14 13:32:27 2007
@@ -1497,19 +1497,42 @@
     /**
      * To create an AxisService using given service impl class name
      * first generate schema corresponding to the given java class , next for each methods AxisOperation
-     * will be created.
+     * will be created. If the method is in-out it will uses RPCMessageReceiver else
+     * RPCInOnlyMessageReceiver
      * <p/>
      * Note : Inorder to work this properly RPCMessageReceiver should be available in the class path
      * otherewise operation can not continue
      *
-     * @param implClass
-     * @param axisConfig
-     * @return return created AxisSrevice
+     * @param implClass Service implementation class
+     * @param axisConfig Current AxisConfiguration
+     * @return return created AxisSrevice the creted service , it can either be null or valid service
      */
     public static AxisService createService(String implClass,
-                                            AxisConfiguration axisConfig,
-                                            Class messageReceiverClass) throws AxisFault {
-        return createService(implClass, axisConfig, messageReceiverClass, null, null);
+                                            AxisConfiguration axisConfig) throws AxisFault {
+
+        try {
+            HashMap messageReciverMap = new HashMap();
+            Class inOnlyMessageReceiver = Loader.loadClass(
+                    "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver");
+            MessageReceiver messageReceiver =
+                    (MessageReceiver) inOnlyMessageReceiver.newInstance();
+            messageReciverMap.put(
+                    WSDL2Constants.MEP_URI_IN_ONLY,
+                    messageReceiver);
+            messageReciverMap.put(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY,messageReceiver);
+            Class inoutMessageReceiver = Loader.loadClass(
+                    "org.apache.axis2.rpc.receivers.RPCMessageReceiver");
+            MessageReceiver inOutmessageReceiver =
+                    (MessageReceiver) inoutMessageReceiver.newInstance();
+            messageReciverMap.put(
+                    WSDL2Constants.MEP_URI_IN_OUT,
+                    inOutmessageReceiver);
+
+            return createService(implClass,axisConfig,messageReciverMap,null,null);
+        } catch (Exception e) {
+            log.error(e);
+        }
+        return null;
     }
 
     /**
@@ -1675,123 +1698,6 @@
                              schemaNamespace,
                              axisConfiguration.getServiceClassLoader());
 
-
-    }
-
-    /**
-     * To create a service for a given Java class with user defined schema and target
-     * namespaces. This method should be used iff, the operations in the service class is homogeneous.
-     *
-     * @param implClass            : full name of the class
-     * @param axisConfig           : current AxisConfgiuration
-     * @param messageReceiverClass : Message receiver that you want to use
-     * @param targetNameSpace      : Service namespace
-     * @param schemaNameSpace      : Schema namespace
-     * @throws AxisFault
-     */
-
-    public static AxisService createService(String implClass,
-                                            AxisConfiguration axisConfig,
-                                            Class messageReceiverClass,
-                                            String targetNameSpace,
-                                            String schemaNameSpace) throws AxisFault {
-        Parameter parameter = new Parameter(Constants.SERVICE_CLASS, implClass);
-        OMElement paraElement = Utils.getParameter(Constants.SERVICE_CLASS, implClass, false);
-        parameter.setParameterElement(paraElement);
-        AxisService axisService = new AxisService();
-        axisService.setUseDefaultChains(false);
-        axisService.addParameter(parameter);
-
-        if (schemaNameSpace == null) {
-            schemaNameSpace = axisService.getSchematargetNamespace();
-        }
-
-        int index = implClass.lastIndexOf(".");
-        String serviceName;
-        if (index > 0) {
-            serviceName = implClass.substring(index + 1, implClass.length());
-        } else {
-            serviceName = implClass;
-        }
-
-        axisService.setName(serviceName);
-        axisService.setClassLoader(axisConfig.getServiceClassLoader());
-
-        ClassLoader serviceClassLoader = axisService.getClassLoader();
-        SchemaGenerator schemaGenerator;
-        ArrayList excludeOpeartion = new ArrayList();
-
-
-        NamespaceMap map = new NamespaceMap();
-        map.put(Java2WSDLConstants.AXIS2_NAMESPACE_PREFIX,
-                Java2WSDLConstants.AXIS2_XSD);
-        map.put(Java2WSDLConstants.DEFAULT_SCHEMA_NAMESPACE_PREFIX,
-                Java2WSDLConstants.URI_2001_SCHEMA_XSD);
-        axisService.setNameSpacesMap(map);
-
-
-        try {
-            schemaGenerator = new DefaultSchemaGenerator(serviceClassLoader,
-                                                  implClass, schemaNameSpace,
-                                                  axisService.getSchemaTargetNamespacePrefix());
-            schemaGenerator.setElementFormDefault(Java2WSDLConstants.FORM_DEFAULT_UNQUALIFIED);
-            axisService.setElementFormDefault(false);
-            Utils.addExcludeMethods(excludeOpeartion);
-            schemaGenerator.setExcludeMethods(excludeOpeartion);
-            axisService.addSchema(schemaGenerator.generateSchema());
-            axisService.setSchemaTargetNamespace(schemaGenerator.getSchemaTargetNameSpace());
-            axisService.setTypeTable(schemaGenerator.getTypeTable());
-            if (targetNameSpace == null) {
-                targetNameSpace = schemaGenerator.getSchemaTargetNameSpace();
-            }
-            if (targetNameSpace != null && !"".equals(targetNameSpace)) {
-                axisService.setTargetNamespace(targetNameSpace);
-            }
-        } catch (Exception e) {
-            throw AxisFault.makeFault(e);
-        }
-
-        JMethod[] method = schemaGenerator.getMethods();
-        TypeTable table = schemaGenerator.getTypeTable();
-
-        PhasesInfo pinfo = axisConfig.getPhasesInfo();
-
-        for (int i = 0; i < method.length; i++) {
-            JMethod jmethod = method[i];
-            AxisOperation operation = Utils.getAxisOperationforJmethod(jmethod, table);
-
-            // loading message receivers
-            try {
-                MessageReceiver messageReceiver =
-                        (MessageReceiver) messageReceiverClass.newInstance();
-                operation.setMessageReceiver(messageReceiver);
-            } catch (IllegalAccessException e) {
-                throw new AxisFault(
-                        "IllegalAccessException occurred during message receiver loading"
-                                + e.getMessage());
-            } catch (InstantiationException e) {
-                throw new AxisFault(
-                        "InstantiationException occurred during message receiver loading"
-                                + e.getMessage());
-            }
-            pinfo.setOperationPhases(operation);
-            axisService.addOperation(operation);
-        }
-        return axisService;
-
-    }
-
-    public static AxisService createService(String implClass,
-                                            AxisConfiguration axisConfig) throws AxisFault {
-        Class clazz;
-        try {
-            clazz = Loader.loadClass("org.apache.axis2.rpc.receivers.RPCMessageReceiver");
-        } catch (ClassNotFoundException e) {
-            throw new AxisFault("ClassNotFoundException occured during message receiver loading"
-                    + e.getMessage());
-        }
-
-        return createService(implClass, axisConfig, clazz);
 
     }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Thu Jun 14 13:32:27 2007
@@ -191,7 +191,7 @@
         }
 
         if (useAsync || options.isUseSeparateListener()) {
-            sendAsync(useAsync, mc, cc);
+            sendAsync(useAsync, mc);
         } else {
             if (block) {
                 // Send the SOAP Message and receive a response
@@ -204,17 +204,17 @@
         }
     }
 
-    private void sendAsync(boolean useAsync, MessageContext mc, ConfigurationContext cc)
+    private void sendAsync(boolean useAsync, MessageContext mc)
             throws AxisFault {
         if (log.isDebugEnabled()) {
             log.debug("useAsync=" + useAsync + ", seperateListener=" +
                     options.isUseSeparateListener());
         }
         /**
-             * We are following the async path. If the user hasn't set a callback object then we must
+         * We are following the async path. If the user hasn't set a callback object then we must
          * block until the whole MEP is complete, as they have no other way to get their reply message.
          */
-        CallbackReceiver callbackReceiver = null;
+        CallbackReceiver callbackReceiver;
         if (axisOp.getMessageReceiver() != null &&
                 axisOp.getMessageReceiver() instanceof CallbackReceiver) {
             callbackReceiver = (CallbackReceiver) axisOp.getMessageReceiver();
@@ -238,7 +238,7 @@
         }
 
         /**
-             * If USE_CUSTOM_LISTENER is set to 'true' the replyTo value will not be replaced and Axis2 will not
+         * If USE_CUSTOM_LISTENER is set to 'true' the replyTo value will not be replaced and Axis2 will not
          * start its internal listner. Some other enntity (e.g. a module) should take care of obtaining the
          * response message.
          */
@@ -252,7 +252,7 @@
             EndpointReference replyToFromTransport =
                     mc.getConfigurationContext().getListenerManager().
                             getEPRforService(sc.getAxisService().getName(),
-                                             axisOp.getName().getLocalPart(), mc
+                                    axisOp.getName().getLocalPart(), mc
                                     .getTransportIn().getName());
 
             if (mc.getReplyTo() == null) {
@@ -264,88 +264,87 @@
 
         //if we don't do this , this guy will wait till it gets HTTP 202 in the HTTP case
         mc.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.TRUE);
-        AxisEngine engine = new AxisEngine(cc);
         mc.getConfigurationContext().registerOperationContext(mc.getMessageID(), oc);
-        engine.send(mc);
-
+        AxisEngine.send(mc);
         if (internalCallback != null) {
             long timeout = options.getTimeOutInMilliSeconds();
-            long waitTime = timeout;
-            long startTime = System.currentTimeMillis();
-
             synchronized (internalCallback) {
-                while (! internalCallback.isComplete() && waitTime >= 0) {
+                if (!internalCallback.isComplete() && timeout >= 0) {
                     try {
                         internalCallback.wait(timeout);
                     } catch (InterruptedException e) {
                         // We were interrupted for some reason, keep waiting
                         // or throw new AxisFault( "Callback was interrupted by someone?" );
                     }
-                    // The wait finished, compute remaining time
-                    // - wait can end prematurely, see Object.wait( int timeout )
-                    waitTime = timeout - (System.currentTimeMillis() - startTime);
+                    if (!internalCallback.isComplete()) {
+                       timeOut();
+                        return;
+                    }
                 }
             }
             // process the result of the invocation
-            if (internalCallback.envelope != null) {
-                // The call ended normally, so there is nothing to do
-            }  else {
-                if (internalCallback.error instanceof AxisFault) {
-                    createFaultMesasgeConext(mc);
-                } else if (internalCallback.error != null) {
-                    createFaultMesasgeConext(mc);
-                } else if (! internalCallback.isComplete()) {
-                    throw new AxisFault(Messages.getMessage("responseTimeOut"));
-                } else {
-                    throw new AxisFault(Messages.getMessage("callBackCompletedWithError"));
+            if (internalCallback.envelope == null) {
+                if (internalCallback.error == null) {
+                    log.error("Callback had neither error nor response");
+                }
+                if (options.isExceptionToBeThrownOnSOAPFault()) {
+                    throw AxisFault.makeFault(internalCallback.error);
                 }
             }
         }
     }
 
-    private void createFaultMesasgeConext(MessageContext mc) throws AxisFault {
-        MessageContext faultMessageContext =
-                mc.getConfigurationContext().createMessageContext();
-
-        // This is a hack - Needs to change
-//        responseMessageContext.setOptions(options);
-
-        faultMessageContext.setServerSide(false);
-        faultMessageContext.setMessageID(mc.getMessageID());
-        addMessageContext(faultMessageContext);
-        faultMessageContext.setServiceContext(mc.getServiceContext());
-        faultMessageContext.setAxisMessage(
-                            axisOp.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE));
-        faultMessageContext.setDoingREST(mc.isDoingREST());
-
-        faultMessageContext.setProperty(MessageContext.TRANSPORT_IN, mc
-                .getProperty(MessageContext.TRANSPORT_IN));
-        faultMessageContext.setTransportIn(mc.getTransportIn());
-        faultMessageContext.setTransportOut(mc.getTransportOut());
+    /**
+     * If there is no response after  the specified timeout interval
+     * sendAync method will call this method.
+     * @throws AxisFault AxisFault saying time out
+     */
+    protected void timeOut() throws AxisFault{
+         throw new AxisFault( Messages.getMessage("responseTimeOut"));
+    }
 
+    /**
+     * When Operation client get the response back after sending the
+     * message will call this method to handle the response.
+     * @throws AxisFault if something went wrong
+     */
+    protected void handleResponse(MessageContext responseMessageContext) throws AxisFault{
         // Options object reused above so soapAction needs to be removed so
         // that soapAction+wsa:Action on response don't conflict
-        faultMessageContext.setSoapAction(null);
+        responseMessageContext.setSoapAction(null);
 
-        if (faultMessageContext.getEnvelope() == null) {
-            SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(faultMessageContext);
+        if (responseMessageContext.getEnvelope() == null) {
+            // If request is REST we assume the responseMessageContext is REST, so
+            // set the variable
+            /*
+             * old code here was using the outbound message context to set the inbound SOAP namespace,
+             * as such and passing it to TransportUtils.createSOAPMessage
+             *
+             * msgctx.getEnvelope().getNamespace().getNamespaceURI()
+             *
+             * However, the SOAP1.2 spec, appendix A indicates that if a SOAP1.2 message is sent to a SOAP1.1
+             * endpoint, we will get a SOAP1.1 (fault) message response.  We need another way to set
+             * the inbound SOAP version.  Best way to do this is to trust the content type and let
+             * createSOAPMessage take care of figuring out what the SOAP namespace is.
+             */
+            SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(responseMessageContext);
             if (resenvelope != null) {
-                faultMessageContext.setEnvelope(resenvelope);
+                responseMessageContext.setEnvelope(resenvelope);
             } else {
                 throw new AxisFault(Messages
                         .getMessage("blockingInvocationExpectsResponse"));
             }
         }
-        SOAPEnvelope resenvelope = faultMessageContext.getEnvelope();
+        SOAPEnvelope resenvelope = responseMessageContext.getEnvelope();
         if (resenvelope != null) {
-            AxisEngine.receive(faultMessageContext);
-            if (faultMessageContext.getReplyTo() != null) {
-                sc.setTargetEPR(faultMessageContext.getReplyTo());
+            AxisEngine.receive(responseMessageContext);
+            if (responseMessageContext.getReplyTo() != null) {
+                sc.setTargetEPR(responseMessageContext.getReplyTo());
             }
-            if (resenvelope.getBody().hasFault()||faultMessageContext.isProcessingFault()) {
+            if (resenvelope.getBody().hasFault()||responseMessageContext.isProcessingFault()) {
                 if (options.isExceptionToBeThrownOnSOAPFault()) {
                     // does the SOAPFault has a detail element for Excpetion
-                    throw Utils.getInboundFaultFromMessageContext(faultMessageContext);
+                    throw Utils.getInboundFaultFromMessageContext(responseMessageContext);
                 }
             }
         }
@@ -378,61 +377,13 @@
         //sending the message
         engine.send(msgctx);
 
-//        // By now we should have a new MessageContext in the IN message
-//        OperationContext operation = msgctx.getOperationContext();
-//        MessageContext response = operation.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
-//        if (response == null) {
-//            // Nothing!
-//            throw new AxisFault("No response message!");
-//        }
-//        engine.receive(response);
-
         responseMessageContext.setDoingREST(msgctx.isDoingREST());
 
         responseMessageContext.setProperty(MessageContext.TRANSPORT_IN, msgctx
                 .getProperty(MessageContext.TRANSPORT_IN));
         responseMessageContext.setTransportIn(msgctx.getTransportIn());
         responseMessageContext.setTransportOut(msgctx.getTransportOut());
-
-        // Options object reused above so soapAction needs to be removed so
-        // that soapAction+wsa:Action on response don't conflict
-        responseMessageContext.setSoapAction(null);
-
-        if (responseMessageContext.getEnvelope() == null) {
-            // If request is REST we assume the responseMessageContext is REST, so
-            // set the variable
-            /*
-             * old code here was using the outbound message context to set the inbound SOAP namespace,
-             * as such and passing it to TransportUtils.createSOAPMessage
-             *
-             * msgctx.getEnvelope().getNamespace().getNamespaceURI()
-             *
-             * However, the SOAP1.2 spec, appendix A indicates that if a SOAP1.2 message is sent to a SOAP1.1
-             * endpoint, we will get a SOAP1.1 (fault) message response.  We need another way to set
-             * the inbound SOAP version.  Best way to do this is to trust the content type and let
-             * createSOAPMessage take care of figuring out what the SOAP namespace is.
-             */
-            SOAPEnvelope resenvelope = TransportUtils.createSOAPMessage(responseMessageContext);
-            if (resenvelope != null) {
-                responseMessageContext.setEnvelope(resenvelope);
-            } else {
-                throw new AxisFault(Messages
-                        .getMessage("blockingInvocationExpectsResponse"));
-            }
-        }
-        SOAPEnvelope resenvelope = responseMessageContext.getEnvelope();
-        if (resenvelope != null) {
-            AxisEngine.receive(responseMessageContext);
-            if (responseMessageContext.getReplyTo() != null) {
-                sc.setTargetEPR(responseMessageContext.getReplyTo());
-            }
-            if (resenvelope.getBody().hasFault()||responseMessageContext.isProcessingFault()) {
-                if (options.isExceptionToBeThrownOnSOAPFault()) {
-                    // does the SOAPFault has a detail element for Excpetion
-                    throw Utils.getInboundFaultFromMessageContext(responseMessageContext);
-                }
-            }
-        }
+        handleResponse(responseMessageContext);
         return responseMessageContext;
     }
 
@@ -503,25 +454,11 @@
             }
         }
 
-        public void setComplete(boolean complete) {
-            if (log.isDebugEnabled()) {
-                log.debug("Entry: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
-            }
-            super.setComplete(complete);
-            synchronized (this) {
-                notify();
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("Exit: OutInAxisOperationClient$SyncCallBack::setComplete, " + complete);
-            }
-        }
-
         public void onError(Exception e) {
             if (log.isDebugEnabled()) {
                 log.debug("Entry: OutInAxisOperationClient$SyncCallBack::onError, " + e);
             }
             error = e;
-            setComplete(true);
             if (log.isDebugEnabled()) {
                 log.debug("Exit: OutInAxisOperationClient$SyncCallBack::onError");
             }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Thu Jun 14 13:32:27 2007
@@ -26,7 +26,6 @@
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.transport.TransportUtils;
 import org.apache.axis2.util.Utils;
-import org.apache.axis2.wsdl.WSDLConstants;
 
 import javax.xml.namespace.QName;
 import java.io.InputStream;
@@ -57,36 +56,18 @@
             super(axisOp, sc, options);
         }
 
-        protected MessageContext send(MessageContext msgctx) throws AxisFault {
-            AxisEngine engine = new AxisEngine(msgctx.getConfigurationContext());
 
-            // create the responseMessageContext
-            MessageContext responseMessageContext =
-                    msgctx.getConfigurationContext().createMessageContext();
-
-            // This is a hack - Needs to change
-            responseMessageContext.setOptions(options);
-
-
-            responseMessageContext.setServerSide(false);
-            responseMessageContext.setMessageID(msgctx.getMessageID());
-            addMessageContext(responseMessageContext);
-            responseMessageContext.setServiceContext(msgctx.getServiceContext());
-            responseMessageContext.setAxisMessage(
-                    msgctx.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE));
-
-            //sending the message
-            engine.send(msgctx);
-            responseMessageContext.setDoingREST(msgctx.isDoingREST());
-
-            responseMessageContext.setProperty(MessageContext.TRANSPORT_IN, msgctx
-                    .getProperty(MessageContext.TRANSPORT_IN));
-            responseMessageContext.setTransportIn(msgctx.getTransportIn());
-            responseMessageContext.setTransportOut(msgctx.getTransportOut());
-            responseMessageContext.setProperty(MessageContext.TRANSPORT_HEADERS,
-                                               msgctx.getProperty(
-                                                       MessageContext.TRANSPORT_HEADERS));
+        protected void timeOut() throws AxisFault {
+           //Nothing to worry
+        }
+
 
+        /**
+         * If there is a fault then need to handle that
+         * @param responseMessageContext responseMessageContext
+         * @throws AxisFault
+         */
+        protected void handleResponse(MessageContext responseMessageContext) throws AxisFault {
             SOAPEnvelope envelope = responseMessageContext.getEnvelope();
             if (envelope == null) {
                 // If request is REST we assume the responseMessageContext is REST, so
@@ -107,7 +88,6 @@
                     throw Utils.getInboundFaultFromMessageContext(responseMessageContext);
                 }
             }
-            return null;
         }
     }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Thu Jun 14 13:32:27 2007
@@ -224,9 +224,7 @@
                             msgContext,
                             handleGZip(msgContext, in), 
                             contentType));
-
-            AxisEngine engine = new AxisEngine(msgContext.getConfigurationContext());
-            return engine.receive(msgContext);
+            return AxisEngine.receive(msgContext);
         } catch (SOAPProcessingException e) {
             throw AxisFault.makeFault(e);
         } catch (AxisFault e) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java?view=diff&rev=547397&r1=547396&r2=547397
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java Thu Jun 14 13:32:27 2007
@@ -18,6 +18,7 @@
 
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
+import org.apache.axiom.om.OMException;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.RelatesTo;
 import org.apache.axis2.client.async.AsyncResult;
@@ -62,23 +63,23 @@
             throw new AxisFault("The Callback realtes to MessageID " + messageID + " is not found");
         }
         
-        try {
             // check weather the result is a fault.
+        try {
             SOAPEnvelope envelope = result.getResponseEnvelope();
-            SOAPFault fault = envelope.getBody().getFault();
-            OperationContext opContext =messageCtx.getOperationContext();
-            if(opContext!=null&&!opContext.isComplete()){
+            OperationContext opContext = messageCtx.getOperationContext();
+            if (opContext != null && !opContext.isComplete()) {
                 opContext.addMessageContext(messageCtx);
             }
-            if (fault == null) {
-                // if there is not fault call the onComplete method
-                callback.onComplete(result);
-            } else {
-                // else call the on error method with the fault
-                AxisFault axisFault = Utils.getInboundFaultFromMessageContext(messageCtx);
+            if (envelope.getBody().hasFault()) {
+                AxisFault axisFault =
+                        Utils.getInboundFaultFromMessageContext(messageCtx);
                 callback.onError(axisFault);
+            } else {
+                callback.onComplete(result);
             }
-        } finally {
+        } catch (Exception e) {
+            callback.onError(e);
+        }  finally {
             callback.setComplete(true);
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message