You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2008/07/03 11:05:36 UTC

svn commit: r673628 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description: AxisOperationFactory.java AxisService2WSDL11.java java2wsdl/DefaultSchemaGenerator.java

Author: deepal
Date: Thu Jul  3 02:05:34 2008
New Revision: 673628

URL: http://svn.apache.org/viewvc?rev=673628&view=rev
Log:
if the operation is void then we should generate wsdl with in-only MEP

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java?rev=673628&r1=673627&r2=673628&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java Thu Jul  3 02:05:34 2008
@@ -50,7 +50,7 @@
                 break;
             }
             case WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY : {
-                abOpdesc = new InOutAxisOperation();
+                abOpdesc = new InOnlyAxisOperation();
                 abOpdesc.setMessageExchangePattern(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY);
                 break;
             }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=673628&r1=673627&r2=673628&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java Thu Jul  3 02:05:34 2008
@@ -270,7 +270,6 @@
 					|| WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
 					|| WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-					|| WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
 				AxisMessage outAxisMessage = axisOperation
 						.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -418,7 +417,6 @@
 					|| WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
 					|| WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-					|| WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
 				AxisMessage outAxisMessage = axisOperation
 						.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -853,7 +851,6 @@
 					|| WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
 					|| WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-					|| WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
 
 				AxisBindingMessage axisBindingOutMessage = (AxisBindingMessage) axisBindingOperation
@@ -997,7 +994,6 @@
 					|| WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
 					|| WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-					|| WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
 
 				AxisBindingMessage axisBindingOutMessage = (AxisBindingMessage) axisBindingOperation
@@ -1118,7 +1114,6 @@
 					|| WSDL2Constants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP)
 					|| WSDL2Constants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP)
-					|| WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(MEP)
 					|| WSDL2Constants.MEP_URI_IN_OUT.equals(MEP)) {
 
 				AxisBindingMessage axisBindingOutMessage = (AxisBindingMessage) axisBindingOperation

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=673628&r1=673627&r2=673628&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java Thu Jul  3 02:05:34 2008
@@ -278,14 +278,14 @@
             AxisOperation axisOperation = service.getOperation(new QName(methodName));
             if (axisOperation == null) {
                 axisOperation = Utils.getAxisOperationForJmethod(jMethod);
-                if (WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(
-                        axisOperation.getMessageExchangePattern())) {
-                    AxisMessage outMessage = axisOperation.getMessage(
-                            WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
-                    if (outMessage != null) {
-                        outMessage.setName(methodName + RESPONSE);
-                    }
-                }
+//                if (WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(
+//                        axisOperation.getMessageExchangePattern())) {
+//                    AxisMessage outMessage = axisOperation.getMessage(
+//                            WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+//                    if (outMessage != null) {
+//                        outMessage.setName(methodName + RESPONSE);
+//                    }
+//                }
                 addToService = true;
             }
             // Maintain a list of methods we actually work with