You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2007/02/14 12:01:16 UTC

svn commit: r507485 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description: AxisService.java WSDL11ToAxisServiceBuilder.java

Author: davidillsley
Date: Wed Feb 14 03:01:16 2007
New Revision: 507485

URL: http://svn.apache.org/viewvc?view=rev&rev=507485
Log:
Fix up action ws-a mapping from WSDL11ToAxisServiceBuilder
and add more trace to enable problem diagnosis

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java

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=507485&r1=507484&r2=507485
==============================================================================
--- 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 Wed Feb 14 03:01:16 2007
@@ -609,6 +609,9 @@
             }
             return;
         }
+        if(log.isDebugEnabled()){
+            log.debug("mapActionToOperation: Mapping Action to Operation: action="+action+" operation="+axisOperation);
+        }
         operationsAliasesMap.put(action, axisOperation);
     }
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=507485&r1=507484&r2=507485
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Wed Feb 14 03:01:16 2007
@@ -2,7 +2,12 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
 
 import javax.wsdl.Binding;
 import javax.wsdl.BindingFault;
@@ -49,9 +54,9 @@
 import org.apache.axis2.util.PolicyUtil;
 import org.apache.axis2.util.XMLUtils;
 import org.apache.axis2.wsdl.SOAPHeaderMessage;
+import org.apache.axis2.wsdl.SoapAddress;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.wsdl.WSDLUtil;
-import org.apache.axis2.wsdl.SoapAddress;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.neethi.Constants;
@@ -419,10 +424,20 @@
                     inputActions = new ArrayList();
                     axisOperation.setWsamappingList(inputActions);
                 }
-
-                inputActions.add(WSDL11ActionHelper
-                        .getActionFromInputElement(wsdl4jDefinition,
-                        wsdl4jPortType, wsdl4jOperation, wsdl4jInput));
+                String inputActionFromHelper = WSDL11ActionHelper.getActionFromInputElement(wsdl4jDefinition,
+                        wsdl4jPortType, wsdl4jOperation, wsdl4jInput);
+                if(log.isDebugEnabled()){
+                    log.debug("populateOperation: Adding input action to operation. action="+inputActionFromHelper+" operation="+axisOperation);
+                }
+                inputActions.add(inputActionFromHelper);
+                AxisService as = (AxisService)axisOperation.getParent();
+                if(as!=null){
+                	as.mapActionToOperation(inputActionFromHelper, axisOperation);
+                }else{
+                	if(log.isDebugEnabled()){
+                        log.debug("populateOperation: No AxisService to add action mapping to.");
+                    }
+                }
             }
 
         }
@@ -444,9 +459,12 @@
             }
 
             if (axisOperation.getOutputAction() == null) {
-                axisOperation.setOutputAction(WSDL11ActionHelper
-                        .getActionFromOutputElement(wsdl4jDefinition,
-                        wsdl4jPortType, wsdl4jOperation, wsdl4jOutput));
+            	String outputActionFromWSDL = WSDL11ActionHelper.getActionFromOutputElement(wsdl4jDefinition,
+                        wsdl4jPortType, wsdl4jOperation, wsdl4jOutput);
+                if(log.isDebugEnabled()){
+                    log.debug("populateOperation: Adding output action to operation. action="+outputActionFromWSDL+" operation="+axisOperation);
+                }
+                axisOperation.setOutputAction(outputActionFromWSDL);
             }
         }
 



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