svn commit: r673571 - /servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java

[ffang]

Author: ffang
Date: Wed Jul  2 20:33:18 2008
New Revision: 673571

URL: http://svn.apache.org/viewvc?rev=673571&view=rev
Log:
[SM-1431]CXF (se proxy) routing issues with same servicenames

Modified:
    
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java

Modified: 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=673571&r1=673570&r2=673571&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
 Wed Jul  2 20:33:18 2008
@@ -343,9 +343,7 @@
 
                     }
                 }
-                // transform import xsd to inline xsd
-                ServiceWSDLBuilder swBuilder = new ServiceWSDLBuilder(getBus(),
-                        cxfService.getServiceInfos());
+                
                 ServiceInfo serInfo = new ServiceInfo();
 
                 Map<String, Element> schemaList = new HashMap<String, 
Element>();
@@ -353,6 +351,11 @@
                 schemaUtil.getSchemas(definition, serInfo);
 
                 serInfo = ei.getService();
+                List<ServiceInfo> serviceInfos = new ArrayList<ServiceInfo>();
+                serviceInfos.add(serInfo);
+                //transform import xsd to inline xsd
+                ServiceWSDLBuilder swBuilder = new ServiceWSDLBuilder(getBus(),
+                        serviceInfos);
                 for (String key : schemaList.keySet()) {
                     Element ele = schemaList.get(key);
                     for (SchemaInfo sInfo : serInfo.getSchemas()) {
@@ -372,6 +375,7 @@
                         }
                     }
                 }
+                
                 serInfo.setProperty(WSDLServiceBuilder.WSDL_DEFINITION, null);
                 description = WSDLFactory.newInstance().newWSDLWriter()
                         .getDocument(swBuilder.build());