svn commit: r897820 - /ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java

[bibryam]

Author: bibryam
Date: Mon Jan 11 09:44:28 2010
New Revision: 897820

URL: http://svn.apache.org/viewvc?rev=897820&view=rev
Log:
Applied patch from jira issue OFBIZ-3394 - Axis2 SOAP implementation does not have types defined for col-* elements.

The patch adds complex type for col-Collection element in the generated wsdl.
 
Thanks to Chatree Srichart and Chris Snow.

Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=897820&r1=897819&r2=897820&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Mon Jan 11 09:44:28 2010
@@ -1484,30 +1484,37 @@
         /* col-ArrayList Element */
         Element colArrayListElement = document.createElement("xsd:element");
         colArrayListElement.setAttribute("name", "col-ArrayList");
+        colArrayListElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colArrayListElement);
         /* col-LinkedList Element */
         Element colLinkedListElement = document.createElement("xsd:element");
         colLinkedListElement.setAttribute("name", "col-LinkedList");
+        colLinkedListElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colLinkedListElement);
         /* col-Stack Element */
         Element colStackElement = document.createElement("xsd:element");
         colStackElement.setAttribute("name", "col-Stack");
+        colStackElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colStackElement);
         /* col-Vector Element */
         Element colVectorElement = document.createElement("xsd:element");
         colVectorElement.setAttribute("name", "col-Vector");
+        colVectorElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colVectorElement);
         /* col-TreeSet Element */
         Element colTreeSetElement = document.createElement("xsd:element");
         colTreeSetElement.setAttribute("name", "col-TreeSet");
+        colTreeSetElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colTreeSetElement);
         /* col-HashSet Element */
         Element colHashSetElement = document.createElement("xsd:element");
         colHashSetElement.setAttribute("name", "col-HashSet");
+        colHashSetElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colHashSetElement);
         /* col-Collection Element */
         Element colCollectionElement = document.createElement("xsd:element");
         colCollectionElement.setAttribute("name", "col-Collection");
+        colCollectionElement.setAttribute("type", "tns:col-Collection");
         schema.appendChild(colCollectionElement);
         
         /*-----------------------------------*/
@@ -1768,6 +1775,138 @@
         mapValueComplexType0.appendChild(mapValueComplexType25);
         schema.appendChild(mapValueComplexType);
         
+        /* col-Collection Complex Type */
+        Element colCollectionComplexType = document.createElement("xsd:complexType");
+        colCollectionComplexType.setAttribute("name", "col-Collection");
+        Element colCollectionComplexType0 = document.createElement("xsd:choice");
+        colCollectionComplexType.appendChild(colCollectionComplexType0);
+        Element colCollectionComplexType1 = document.createElement("xsd:element");
+        colCollectionComplexType1.setAttribute("ref", "tns:std-String");
+        colCollectionComplexType1.setAttribute("minOccurs", "0");
+        colCollectionComplexType1.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType1);
+        Element colCollectionComplexType2 = document.createElement("xsd:element");
+        colCollectionComplexType2.setAttribute("ref", "tns:std-Integer");
+        colCollectionComplexType2.setAttribute("minOccurs", "0");
+        colCollectionComplexType2.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType2);
+        Element colCollectionComplexType3 = document.createElement("xsd:element");
+        colCollectionComplexType3.setAttribute("ref", "tns:std-Long");
+        colCollectionComplexType3.setAttribute("minOccurs", "0");
+        colCollectionComplexType3.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType3);
+        Element colCollectionComplexType4 = document.createElement("xsd:element");
+        colCollectionComplexType4.setAttribute("ref", "tns:std-Float");
+        colCollectionComplexType4.setAttribute("minOccurs", "0");
+        colCollectionComplexType4.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType4);
+        Element colCollectionComplexType5 = document.createElement("xsd:element");
+        colCollectionComplexType5.setAttribute("ref", "tns:std-Double");
+        colCollectionComplexType5.setAttribute("minOccurs", "0");
+        colCollectionComplexType5.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType5);
+        Element colCollectionComplexType6 = document.createElement("xsd:element");
+        colCollectionComplexType6.setAttribute("ref", "tns:std-Boolean");
+        colCollectionComplexType6.setAttribute("minOccurs", "0");
+        colCollectionComplexType6.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType6);
+        Element colCollectionComplexType7 = document.createElement("xsd:element");
+        colCollectionComplexType7.setAttribute("ref", "tns:std-Locale");
+        colCollectionComplexType7.setAttribute("minOccurs", "0");
+        colCollectionComplexType7.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType7);
+        Element colCollectionComplexType8 = document.createElement("xsd:element");
+        colCollectionComplexType8.setAttribute("ref", "tns:sql-Timestamp");
+        colCollectionComplexType8.setAttribute("minOccurs", "0");
+        colCollectionComplexType8.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType8);
+        Element colCollectionComplexType9 = document.createElement("xsd:element");
+        colCollectionComplexType9.setAttribute("ref", "tns:sql-Date");
+        colCollectionComplexType9.setAttribute("minOccurs", "0");
+        colCollectionComplexType9.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType9);
+        Element colCollectionComplexType10 = document.createElement("xsd:element");
+        colCollectionComplexType10.setAttribute("ref", "tns:sql-Time");
+        colCollectionComplexType10.setAttribute("minOccurs", "0");
+        colCollectionComplexType10.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType10);
+        Element colCollectionComplexType11 = document.createElement("xsd:element");
+        colCollectionComplexType11.setAttribute("ref", "tns:col-ArrayList");
+        colCollectionComplexType11.setAttribute("minOccurs", "0");
+        colCollectionComplexType11.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType11);
+        Element colCollectionComplexType12 = document.createElement("xsd:element");
+        colCollectionComplexType12.setAttribute("ref", "tns:col-LinkedList");
+        colCollectionComplexType12.setAttribute("minOccurs", "0");
+        colCollectionComplexType12.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType12);
+        Element colCollectionComplexType13 = document.createElement("xsd:element");
+        colCollectionComplexType13.setAttribute("ref", "tns:col-Stack");
+        colCollectionComplexType13.setAttribute("minOccurs", "0");
+        colCollectionComplexType13.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType13);
+        Element colCollectionComplexType14 = document.createElement("xsd:element");
+        colCollectionComplexType14.setAttribute("ref", "tns:col-Vector");
+        colCollectionComplexType14.setAttribute("minOccurs", "0");
+        colCollectionComplexType14.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType14);
+        Element colCollectionComplexType15 = document.createElement("xsd:element");
+        colCollectionComplexType15.setAttribute("ref", "tns:col-TreeSet");
+        colCollectionComplexType15.setAttribute("minOccurs", "0");
+        colCollectionComplexType15.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType15);
+        Element colCollectionComplexType16 = document.createElement("xsd:element");
+        colCollectionComplexType16.setAttribute("ref", "tns:col-HashSet");
+        colCollectionComplexType16.setAttribute("minOccurs", "0");
+        colCollectionComplexType16.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType16);
+        Element colCollectionComplexType17 = document.createElement("xsd:element");
+        colCollectionComplexType17.setAttribute("ref", "tns:col-Collection");
+        colCollectionComplexType17.setAttribute("minOccurs", "0");
+        colCollectionComplexType17.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType17);
+        Element colCollectionComplexType18 = document.createElement("xsd:element");
+        colCollectionComplexType18.setAttribute("ref", "tns:map-HashMap");
+        colCollectionComplexType18.setAttribute("minOccurs", "0");
+        colCollectionComplexType18.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType18);
+        Element colCollectionComplexType19 = document.createElement("xsd:element");
+        colCollectionComplexType19.setAttribute("ref", "tns:map-Properties");
+        colCollectionComplexType19.setAttribute("minOccurs", "0");
+        colCollectionComplexType19.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType19);
+        Element colCollectionComplexType20 = document.createElement("xsd:element");
+        colCollectionComplexType20.setAttribute("ref", "tns:map-Hashtable");
+        colCollectionComplexType20.setAttribute("minOccurs", "0");
+        colCollectionComplexType20.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType20);
+        Element colCollectionComplexType21 = document.createElement("xsd:element");
+        colCollectionComplexType21.setAttribute("ref", "tns:map-WeakHashMap");
+        colCollectionComplexType21.setAttribute("minOccurs", "0");
+        colCollectionComplexType21.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType21);
+        Element colCollectionComplexType22 = document.createElement("xsd:element");
+        colCollectionComplexType22.setAttribute("ref", "tns:map-TreeMap");
+        colCollectionComplexType22.setAttribute("minOccurs", "0");
+        colCollectionComplexType22.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType22);
+        Element colCollectionComplexType23 = document.createElement("xsd:element");
+        colCollectionComplexType23.setAttribute("ref", "tns:map-Map");
+        colCollectionComplexType23.setAttribute("minOccurs", "0");
+        colCollectionComplexType23.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType23);
+        Element colCollectionComplexType24 = document.createElement("xsd:element");
+        colCollectionComplexType24.setAttribute("ref", "tns:eepk-");
+        colCollectionComplexType24.setAttribute("minOccurs", "0");
+        colCollectionComplexType24.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType24);
+        Element colCollectionComplexType25 = document.createElement("xsd:element");
+        colCollectionComplexType25.setAttribute("ref", "tns:eeval-");
+        colCollectionComplexType25.setAttribute("minOccurs", "0");
+        colCollectionComplexType25.setAttribute("maxOccurs", "unbounded");
+        colCollectionComplexType0.appendChild(colCollectionComplexType25);
+        schema.appendChild(colCollectionComplexType);
+        
         types.setDocumentationElement(schema);
         return types;
     }