axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r489655 [3/3] - in /webservices/axis2/branches/java/1_1/modules: adb-codegen/src/org/apache/axis2/schema/ kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/transport/http/
Date Fri, 22 Dec 2006 13:57:26 GMT
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=489655&r1=489654&r2=489655
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
Fri Dec 22 05:57:25 2006
@@ -387,26 +387,19 @@
 
         if (WSDL20_2004Constants.MEP_URI_IN_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OUT.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_IN_OUT;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_ONLY.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI) || WSDL20_2006Constants.MEP_URI_IN_OPTIONAL_OUT.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_IN.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_IN;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_ONLY.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI) || WSDL20_2006Constants.MEP_URI_OUT_OPTIONAL_IN.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_OUT_OPTIONAL_IN;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY;
-        } else
-        if (WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI))
{
+        } else if (WSDL20_2004Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI) || WSDL20_2006Constants.MEP_URI_ROBUST_OUT_ONLY.equals(mepURI))
{
             temp = WSDL20_2004Constants.MEP_CONSTANT_ROBUST_OUT_ONLY;
         }
 
@@ -525,7 +518,7 @@
     }
 
     /**
-     *
+     * 
      */
     public OperationClient createClient(ServiceContext sc, Options options) {
         throw new UnsupportedOperationException(Messages.getMessage("mepnotyetimplemented",
mepURI));
@@ -543,12 +536,22 @@
         faultMessages.add(faultMessage);
     }
 
+    public String getSoapAction() {
+        return soapAction;
+    }
+
     public void setSoapAction(String soapAction) {
         this.soapAction = soapAction;
     }
 
     public String getInputAction() {
-        return soapAction;
+        String result = this.soapAction;
+        if (result == null || "".equals(result)) {
+            if (wsamappingList != null && !wsamappingList.isEmpty()) {
+                result = wsamappingList.get(0).toString();
+            }
+        }
+        return result;
     }
 
     public String getOutputAction() {

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=489655&r1=489654&r2=489655
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
Fri Dec 22 05:57:25 2006
@@ -381,7 +381,7 @@
             axisOperation.setMessageReceiver(
                     loadDefaultMessageReceiver(axisOperation.getMessageExchangePattern(),
this));
         }
-        if (axisOperation.getInputAction() == null) {
+        if (axisOperation.getSoapAction() == null) {
             axisOperation.setSoapAction("urn:" + axisOperation.getName().getLocalPart());
         }
         addChild(axisOperation);
@@ -406,7 +406,7 @@
 
         mapActionToOperation(operationName, axisOperation);
 
-        String action = axisOperation.getInputAction();
+        String action = axisOperation.getSoapAction();
         if (action.length() > 0) {
             mapActionToOperation(action, axisOperation);
         }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?view=diff&rev=489655&r1=489654&r2=489655
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
Fri Dec 22 05:57:25 2006
@@ -298,7 +298,7 @@
                     soapActionString = messageContext.getWSAAction();
                     if (messageContext.getAxisOperation() != null && ((soapActionString
== null) || (soapActionString.length() == 0))) {
                         // last option is to get it from the axis operation
-                        soapActionString = messageContext.getAxisOperation().getInputAction();
+                        soapActionString = messageContext.getAxisOperation().getSoapAction();
                     }
                 }
 



---------------------------------------------------------------------
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