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 da...@apache.org on 2007/12/18 10:54:57 UTC
svn commit: r605160 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java
Author: davidillsley
Date: Tue Dec 18 01:54:56 2007
New Revision: 605160
URL: http://svn.apache.org/viewvc?rev=605160&view=rev
Log:
Fix problem when working with JAX-WS clients with the action generated from annotations.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java?rev=605160&r1=605159&r2=605160&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/wsdl/WSDL11DefaultActionPatternHelper.java Tue Dec 18 01:54:56 2007
@@ -130,7 +130,7 @@
String portTypeName,
String operationName,
String inputName) {
- if (messageExchangePattern == null && inputName == null) {
+ if (messageExchangePattern == null && inputName == null) {
throw new IllegalArgumentException(
"One of messageExchangePattern or inputName must the non-null to generate an action.");
}
@@ -144,10 +144,15 @@
delimiter = COLON;
}
+ // N.B. Unlike core Axis2 processing WSDL, JAX-WS accotation processing passes in the
+ // out-in MEP when constructing the client, hence we need to take account of it here
+ // in addition to the expected in-out
if (inputName == null) {
inputName = operationName;
if (messageExchangePattern.indexOf("in-out") >= 0) {
inputName += REQUEST;
+ } else if (messageExchangePattern.indexOf("out-in") >= 0) {
+ inputName += REQUEST;
}
}
@@ -270,6 +275,9 @@
delimiter = COLON;
}
+ // N.B. Unlike core Axis2 processing WSDL, JAX-WS annotation processing passes in the
+ // out-in MEP when constructing the client, hence we need to take account of it here
+ // in addition to the expected in-out
if (outputName == null) {
outputName = operationName;
if (messageExchangePattern.indexOf("in-out") >= 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org