You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/09/13 11:59:19 UTC
svn commit: r1384260 - in /ofbiz/branches/release11.04: ./
framework/service/src/org/ofbiz/service/ModelService.java
Author: jleroux
Date: Thu Sep 13 09:59:19 2012
New Revision: 1384260
URL: http://svn.apache.org/viewvc?rev=1384260&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/release11.04/ (props changed)
ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ModelService.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1384251
Modified: ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ModelService.java?rev=1384260&r1=1384259&r2=1384260&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/ModelService.java Thu Sep 13 09:59:19 2012
@@ -1361,6 +1361,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");
@@ -1368,7 +1369,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");
@@ -1672,7 +1672,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");
@@ -1816,7 +1815,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");