Author: jleroux
Date: Thu Sep 13 09:37:58 2012
New Revision: 1384251
URL:
http://svn.apache.org/viewvc?rev=1384251&view=revLog:
Fix an issue with WSDL and nillable attribute (can be only in 1st level element)
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=1384251&r1=1384250&r2=1384251&view=diff==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Thu Sep 13 09:37:58 2012
@@ -1374,6 +1374,7 @@ public class ModelService extends Abstra
/* null Element */
Element stdNullElement = document.createElement("xsd:element");
stdNullElement.setAttribute("name", "null");
+ stdNullElement.setAttribute("nillable", "true");
Element stdNullElement0 = document.createElement("xsd:complexType");
stdNullElement.appendChild(stdNullElement0);
Element stdNullElement1 = document.createElement("xsd:attribute");
@@ -1381,7 +1382,6 @@ public class ModelService extends Abstra
stdNullElement1.setAttribute("name", "value");
stdNullElement1.setAttribute("type", "xsd:string");
stdNullElement1.setAttribute("use", "required");
- stdNullElement1.setAttribute("nillable", "true");
schema.appendChild(stdNullElement);
/* std-String Element */
Element stdStringElement = document.createElement("xsd:element");
@@ -1685,7 +1685,6 @@ public class ModelService extends Abstra
mapValueComplexTypeNull.setAttribute("ref", "tns:null");
mapValueComplexTypeNull.setAttribute("minOccurs", "1");
mapValueComplexTypeNull.setAttribute("maxOccurs", "1");
- mapValueComplexTypeNull.setAttribute("nillable", "true");
mapValueComplexType0.appendChild(mapValueComplexTypeNull);
Element mapValueComplexType1 = document.createElement("xsd:element");
mapValueComplexType1.setAttribute("ref", "tns:std-String");
@@ -1829,7 +1828,6 @@ public class ModelService extends Abstra
colCollectionComplexTypeNull.setAttribute("ref", "tns:null");
colCollectionComplexTypeNull.setAttribute("minOccurs", "0");
colCollectionComplexTypeNull.setAttribute("maxOccurs", "unbounded");
- colCollectionComplexTypeNull.setAttribute("nillable", "true");
colCollectionComplexType0.appendChild(colCollectionComplexTypeNull);
Element colCollectionComplexType1 = document.createElement("xsd:element");
colCollectionComplexType1.setAttribute("ref", "tns:std-String");