[jboss-svn-commits] JBL Code SVN: r38433 - in labs/jbossesb/branches/JBESB_4_11_CP2/product/services: soapui-client/src/main/java/org/jboss/soa/esb/services/soapui and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2013-10-29 10:51:15 -0400 (Tue, 29 Oct 2013)
New Revision: 38433

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java
   labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
Log:
JBESB-3936
Parse imported bindings and services


Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java	2013-10-29 03:23:07 UTC (rev 38432)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/proxy/SOAPProxy.java	2013-10-29 14:51:15 UTC (rev 38433)
@@ -205,7 +205,7 @@
 		{
 			wsdl_loader.cleanup();
 		}
-		Collection<Binding> bindings = wsdl_def.getBindings().values();
+		Collection<Binding> bindings = wsdl_def.getAllBindings().values();
 		for ( Binding wsdl_bind : bindings )
 		{
 			PortType wsdl_portType = wsdl_bind.getPortType();
@@ -295,7 +295,7 @@
 				}
 			}
 		}
-		Collection<Service> services = wsdl_def.getServices().values();
+		Collection<Service> services = wsdl_def.getAllServices().values();
 		for ( Service wsdl_svc : services )
 		{
 			Collection<Port> ports = wsdl_svc.getPorts().values();

Modified: labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java	2013-10-29 03:23:07 UTC (rev 38432)
+++ labs/jbossesb/branches/JBESB_4_11_CP2/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java	2013-10-29 14:51:15 UTC (rev 38433)
@@ -1177,7 +1177,7 @@
         final String definitionLocation = definition.getDocumentBaseURI() ;
         if (processed.add(definitionLocation))
         {
-            final Map<?, Service> services = definition.getServices() ;
+            final Map<?, Service> services = definition.getAllServices() ;
             if (services != null)
             {
                 for(Service service: services.values())