axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kei...@apache.org
Subject svn commit: r480550 - in /webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter: AxisServiceBasedMultiLanguageEmitter.java CEmitter.java
Date Wed, 29 Nov 2006 12:18:17 GMT
Author: keithc
Date: Wed Nov 29 04:18:16 2006
New Revision: 480550

URL: http://svn.apache.org/viewvc?view=rev&rev=480550
Log:
changed the signature of addSOAPAction to use AxisBindingOperation

Modified:
    webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
    webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java

Modified: webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=480550&r1=480549&r2=480550
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
(original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Wed Nov 29 04:18:16 2006
@@ -1736,7 +1736,7 @@
             addAttribute(doc, "usdbimpl", "false", methodElement);
         }
 
-        addSOAPAction(doc, methodElement, axisOperation);
+        addSOAPAction(doc, methodElement, axisBindingOperation);
         addOutputAndFaultActions(doc, methodElement, axisOperation);
         addHeaderOperations(soapHeaderInputParameterList, axisOperation, true);
         addHeaderOperations(soapHeaderOutputParameterList, axisOperation, false);
@@ -1890,10 +1890,10 @@
      *
      * @param doc
      * @param rootElement
-     * @param axisOperation
+     * @param axisBindingOperation
      */
-    protected void addSOAPAction(Document doc, Element rootElement, AxisOperation axisOperation)
{
-        addAttribute(doc, "soapaction", axisOperation.getInputAction(), rootElement);
+    protected void addSOAPAction(Document doc, Element rootElement, AxisBindingOperation
axisBindingOperation) {
+        addAttribute(doc, "soapaction", (String)axisBindingOperation.getProperty(WSDL2Constants.ATTR_WSOAP_ACTION),
rootElement);
     }
 
     /**

Modified: webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java?view=diff&rev=480550&r1=480549&r2=480550
==============================================================================
--- webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
(original)
+++ webservices/axis2/branches/java/WSDL_2_0/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
Wed Nov 29 04:18:16 2006
@@ -24,6 +24,7 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.PolicyInclude;
 import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisBindingOperation;
 import org.apache.neethi.Policy;
 import org.apache.axiom.om.OMFactory;
 import org.w3c.dom.Document;
@@ -341,6 +342,9 @@
         while (operations.hasNext()) {
             AxisOperation axisOperation = (AxisOperation) operations.next();
 
+            // Get the correct AxisBindingOperation coresponding to the AxisOperation
+            AxisBindingOperation axisBindingOperation = (AxisBindingOperation) axisBinding.getChild(axisOperation.getName());
+
             // populate info holder with mep information. This will used in determining which
             // message receiver to use, etc.,
 
@@ -377,7 +381,7 @@
                 addAttribute(doc, "mepURI", axisOperation.getMessageExchangePattern(), methodElement);
 
 
-                addSOAPAction(doc, methodElement, axisOperation);
+                addSOAPAction(doc, methodElement, axisBindingOperation);
                 //add header ops for input
                 addHeaderOperations(soapHeaderInputParameterList, axisOperation, true);
                 //add header ops for output
@@ -424,7 +428,7 @@
                     addAttribute(doc, "mepURI", axisOperation.getMessageExchangePattern(),
methodElement);
 
 
-                    addSOAPAction(doc, methodElement, axisOperation);
+                    addSOAPAction(doc, methodElement, axisBindingOperation);
                     addHeaderOperations(soapHeaderInputParameterList, axisOperation, true);
                     addHeaderOperations(soapHeaderOutputParameterList, axisOperation, false);
 



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