svn commit: r674938 - in /tuscany/branches/sca-java-1.3/modules: ./ binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/ databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/

[rfeng]

Author: rfeng
Date: Tue Jul  8 13:23:35 2008
New Revision: 674938

URL: http://svn.apache.org/viewvc?rev=674938&view=rev
Log:
Merge the changes from trunk for TUSCANY-2465

Modified:
    tuscany/branches/sca-java-1.3/modules/   (props changed)
    
tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
    
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java

Propchange: tuscany/branches/sca-java-1.3/modules/
------------------------------------------------------------------------------
    svn:mergeinfo = /tuscany/java/sca/modules:673298,674894-674933

Modified: 
tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java?rev=674938&r1=674937&r2=674938&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
 (original)
+++ 
tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
 Tue Jul  8 13:23:35 2008
@@ -152,7 +152,7 @@
         throw new WSDLGenerationException(problem.toString(), null, problem);
     }
     
-    private void addDataType(Map<String, List<DataType>> map, DataType type) {
+    private void addDataType(Map<XMLTypeHelper, List<DataType>> map, DataType 
type, Map<String, XMLTypeHelper> helpers) {
         if (type == null) {
             return;
         }
@@ -164,33 +164,34 @@
             DataType dt = (DataType)type.getLogical();
             db = dt.getDataBinding();
         }
-        List<DataType> types = map.get(db);
+        XMLTypeHelper helper = helpers.get(db);
+        List<DataType> types = map.get(helper);
         if (types == null) {
             types = new ArrayList<DataType>();
-            map.put(db, types);
+            map.put(helper, types);
         }
         types.add(type);
     }
     
-    private Map<String, List<DataType>> getDataTypes(Interface intf, boolean 
useWrapper) {
-        Map<String, List<DataType>> dataTypes = new HashMap<String, 
List<DataType>>();
+    private Map<XMLTypeHelper, List<DataType>> getDataTypes(Interface intf, 
boolean useWrapper, Map<String, XMLTypeHelper> helpers) {
+        Map<XMLTypeHelper, List<DataType>> dataTypes = new 
HashMap<XMLTypeHelper, List<DataType>>();
         for (Operation op : intf.getOperations()) {
             WrapperInfo wrapper = op.getWrapper();
             if (useWrapper && wrapper != null) {
                 DataType dt1 = wrapper.getInputWrapperType();
-                addDataType(dataTypes, dt1);
+                addDataType(dataTypes, dt1, helpers);
                 DataType dt2 = wrapper.getOutputWrapperType();
-                addDataType(dataTypes, dt2);
+                addDataType(dataTypes, dt2, helpers);
             } else {
                 for (DataType dt1 : op.getInputType().getLogical()) {
-                    addDataType(dataTypes, dt1);
+                    addDataType(dataTypes, dt1, helpers);
                 }
                 DataType dt2 = op.getOutputType();
-                addDataType(dataTypes, dt2);
+                addDataType(dataTypes, dt2, helpers);
             }
             for (DataType<DataType> dt3 : op.getFaultTypes()) {
                 DataType dt4 = dt3.getLogical();
-                addDataType(dataTypes, dt4);
+                addDataType(dataTypes, dt4, helpers);
             }
         }
         return dataTypes;
@@ -244,8 +245,8 @@
         // call each helper in turn to populate the wsdl.types element
         XmlSchemaCollection schemaCollection = new XmlSchemaCollection(); 
 
-        for (Map.Entry<String, List<DataType>> en: getDataTypes(interfaze, 
false).entrySet()) {
-            XMLTypeHelper helper = helpers.get(en.getKey());
+        for (Map.Entry<XMLTypeHelper, List<DataType>> en: 
getDataTypes(interfaze, false, helpers).entrySet()) {
+            XMLTypeHelper helper = en.getKey();
             if (helper == null) {
                 continue;
             }

Modified: 
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java?rev=674938&r1=674937&r2=674938&view=diff
==============================================================================
--- 
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
 (original)
+++ 
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
 Tue Jul  8 13:23:35 2008
@@ -125,8 +125,8 @@
 
     @Override
     public XMLTypeHelper getXMLTypeHelper() {
-        return new JAXBTypeHelper();
-        // return xmlTypeHelper;
+        // return new JAXBTypeHelper();
+        return xmlTypeHelper;
     }
 
 }