Added minOccurs/maxOccurs to xsd. Added test xml

SDT/schema4.0/etc/domain.rnc

@@ -109,6 +109,8 @@ SubDevicesRef =
     element SubDevice {
       attribute id { xsd:Name },
       attribute semanticURI { xsd:anyURI }?,
+      attribute minOccurs { text }?,
+      attribute maxOccurs { text }?,
       DocDef,
       PropertiesDef?,
       ModuleClassesDef?
@@ -120,6 +122,8 @@ ModuleClassesDef =
       attribute name { xsd:Name },
       attribute optional { xsd:boolean }?,
       attribute semanticURI { xsd:anyURI }?,
+      attribute minOccurs { text }?,
+      attribute maxOccurs { text }?,
       DocDef,
       ExtendDef?,
       PropertiesDef?,

SDT/schema4.0/src/domain.rng

@@ -314,6 +314,16 @@
 							<data type="anyURI"/>
 						</attribute>
 					</optional>
+					<optional>
+						<attribute name="minOccurs">
+							<text/>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="maxOccurs">
+							<text/>
+						</attribute>
+					</optional>
 					<ref name="DocDef"/>
 					<optional>
 						<ref name="PropertiesDef"/>
@@ -344,6 +354,16 @@
 							<data type="anyURI"/>
 						</attribute>
 					</optional>
+					<optional>
+						<attribute name="minOccurs">
+							<text/>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="maxOccurs">
+							<text/>
+						</attribute>
+					</optional>
 					<ref name="DocDef"/>
 					<optional>
 						<ref name="ExtendDef" />

SDT/schema4.0/src/domain.xsd

@@ -247,6 +247,8 @@
           </xs:sequence>
           <xs:attribute name="id" use="required" type="xs:Name"/>
           <xs:attribute name="semanticURI" type="xs:anyURI"/>
+          <xs:attribute name="minOccurs"/>
+          <xs:attribute name="maxOccurs"/>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>
@@ -272,6 +274,8 @@
           <xs:attribute name="name" use="required" type="xs:Name"/>
           <xs:attribute name="optional" type="xs:boolean"/>
           <xs:attribute name="semanticURI" type="xs:anyURI"/>
+          <xs:attribute name="minOccurs"/>
+          <xs:attribute name="maxOccurs"/>
         </xs:extension>
       </xs:complexContent>
     </xs:complexType>

SDT/schema4.0/test/min-max-occurs-test.xml

+<?xml version="1.0" encoding="iso-8859-1"?>
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="min-mac-occurs-test" >
+	<DeviceClasses>
+		<DeviceClass id="Test">
+			<Doc>This is a test device.</Doc>
+			<SubDevices>
+				<SubDevice id="aSubDevice" minOccurs="1" maxOccurs="unbound">
+					<ModuleClasses>
+						<ModuleClass name="aSubDeviceModuleClass" minOccurs="0" maxOccurs="10">
+						</ModuleClass>
+					</ModuleClasses>
+				</SubDevice>
+			</SubDevices>
+		</DeviceClass>
+	</DeviceClasses>
+</Domain>