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 am...@apache.org on 2007/02/12 14:59:14 UTC

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

Author: amilas
Date: Mon Feb 12 05:59:13 2007
New Revision: 506445

URL: http://svn.apache.org/viewvc?view=rev&rev=506445
Log:
fixed some bugs with process imports

Modified:
    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/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=506445&r1=506444&r2=506445
==============================================================================
--- 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 Mon Feb 12 05:59:13 2007
@@ -298,12 +298,15 @@
         // process the port type for this binding
         // although we support multiports they must be belongs to same port type and should have the
         // same soap style
-        populatePortType(binding.getPortType());
+        populatePortType(wsdl4jDefinition.getPortType(binding.getPortType().getQName()));
+
+        Binding currentBinding;
 
         for (Iterator iterator = wsdl4jPorts.values().iterator(); iterator.hasNext();) {
             port = (Port) iterator.next();
             // we process the port only if it has the same port type as the selected binding
-            if (port.getBinding().getPortType().getQName().equals(binding.getPortType().getQName())){
+            currentBinding = wsdl4jDefinition.getBinding(port.getBinding().getQName());
+            if (currentBinding.getPortType().getQName().equals(binding.getPortType().getQName())){
                 axisEndpoint = new AxisEndpoint();
                 axisEndpoint.setName(port.getName());
 
@@ -341,7 +344,7 @@
                 axisEndpoint, BINDING);
 
         AxisBinding axisBinding = new AxisBinding();
-        Binding wsdl4jBinding = wsdl4jPort.getBinding();
+        Binding wsdl4jBinding = wsdl4jDefinition.getBinding(wsdl4jPort.getBinding().getQName());
 
         axisBinding.setName(wsdl4jBinding.getQName());
         axisEndpoint.setBinding(axisBinding);
@@ -483,11 +486,13 @@
         AxisBindingOperation axisBindingOperation;
         BindingOperation wsdl4jBindingOperation;
 
+        PortType portType = wsdl4jDefinition.getPortType(wsdl4jBinding.getPortType().getQName());
+
         for (Iterator iterator = wsdl4jBidingOperations.iterator(); iterator.hasNext();) {
 
             axisBindingOperation = new AxisBindingOperation();
             wsdl4jBindingOperation = (BindingOperation) iterator.next();
-            wsdl4jOperation = wsdl4jBindingOperation.getOperation();
+            wsdl4jOperation = findOperation(portType, wsdl4jBindingOperation);
 
             axisBindingOperation.setName(new QName("", wsdl4jBindingOperation.getName()));
 
@@ -631,7 +636,7 @@
         // setupComplete
     }
 
-    
+
     /**
      * Populate a map of targetNamespace vs DOM schema element This is used to
      * grab the correct schema element when adding a new element



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