svn commit: r1384257 - in /ofbiz/branches/release12.04: ./ framework/service/src/org/ofbiz/service/ModelService.java

[jleroux]

Author: jleroux
Date: Thu Sep 13 09:53:10 2012
New Revision: 1384257

URL: http://svn.apache.org/viewvc?rev=1384257&view=rev
Log:
"Applied fix from trunk for revision: 1384251" 
------------------------------------------------------------------------
r1384251 | jleroux | 2012-09-13 11:37:58 +0200 (jeu., 13 sept. 2012) | 1 line

Fix an issue with WSDL and nillable attribute (can be only in 1st level element)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    
ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ModelService.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1384251

Modified: 
ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ModelService.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ModelService.java?rev=1384257&r1=1384256&r2=1384257&view=diff
==============================================================================
--- 
ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ModelService.java
 (original)
+++ 
ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/ModelService.java
 Thu Sep 13 09:53:10 2012
@@ -1368,6 +1368,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");
@@ -1375,7 +1376,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");
@@ -1679,7 +1679,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");
@@ -1823,7 +1822,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");