Generic service invocation API - xml schemas bugs fixed #PL-3952

modules/portal/src/com/haulmont/cuba/portal/restapi/restapi-commit-v2.xsd

@@ -4,10 +4,10 @@
         targetNamespace="http://schemas.haulmont.com/cuba/5.4/restapi-commit-v2.xsd"
         xmlns="http://schemas.haulmont.com/cuba/5.4/restapi-commit-v2.xsd"
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified"
-            elementFormDefault="qualified">
+        attributeFormDefault="unqualified"
+        elementFormDefault="qualified">
 
-    <xs:include schemaLocation="restapi-instance-v2.xsd"/>
+    <xs:include schemaLocation="http://schemas.haulmont.com/cuba/5.4/restapi-instance-v2.xsd"/>
 
     <xs:annotation>
         <xs:documentation><![CDATA[

modules/portal/src/com/haulmont/cuba/portal/restapi/restapi-instance-v2.xsd

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://schemas.haulmont.com/cuba/5.4/restapi-instance-v2.xsd"
-           xmlns="http://schemas.haulmont.com/cuba/5.4/restapi-instance-v2.xsd"
-	attributeFormDefault="unqualified" elementFormDefault="qualified">
+	       attributeFormDefault="unqualified"
+           elementFormDefault="qualified">
 
 	<xs:complexType name="instanceType">
 		<xs:sequence>
@@ -11,12 +10,16 @@
             <xs:element name="reference" type="referenceType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="collection" type="collectionType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
-		<xs:attribute name="id" type="xs:ID"/>
+		<xs:attribute name="id" type="xs:string"/>
 	</xs:complexType>
 
     <xs:complexType name="fieldType">
-        <xs:attribute name="name" type="xs:string" use="required"/>
-        <xs:attribute name="null" type="xs:boolean"/>
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string" use="required"/>
+                <xs:attribute name="null" type="xs:boolean"/>
+            </xs:extension>
+        </xs:simpleContent>
     </xs:complexType>
 
     <xs:complexType name="referenceType">
@@ -41,5 +44,4 @@
         </xs:sequence>
     </xs:complexType>
 
-    <xs:element name="instances" type="instancesType"/>
 </xs:schema>

modules/portal/src/com/haulmont/cuba/portal/restapi/restapi-service-v2.xsd

@@ -33,7 +33,7 @@
     </xs:element>
 
     <xs:complexType name="paramType" mixed="true">
-        <xs:choice>
+        <xs:choice minOccurs="0">
             <xs:element name="instance" type="instanceType" maxOccurs="1"/>
             <xs:element name="instances" type="instancesType"/>
         </xs:choice>
@@ -42,7 +42,7 @@
 
     <xs:element name="result">
         <xs:complexType mixed="true">
-            <xs:choice>
+            <xs:choice minOccurs="0">
                 <xs:element name="instance" type="instanceType"/>
                 <xs:element name="instances" type="instancesType"/>
             </xs:choice>