<data> element in event is now optional

SDT/schema3.0/etc/domain.rnc

@@ -35,15 +35,6 @@ Domain =
       }*
     }?
   }
-DeviceInfos =
-  element DeviceInfos {
-    element DeviceInfo {
-      attribute name { text },
-      attribute optional { xsd:boolean }?,
-      DocDef,
-      DataTypeDef
-    }*
-  }
 Characteristics =
   element Characteristics {
     element Characteristic {
@@ -155,6 +146,6 @@ Events =
       attribute name { text },
       attribute optional { xsd:boolean }?,
       DocDef,
-      Data
+      Data?
     }*
   }

SDT/schema3.0/src/domain.rng

@@ -357,7 +357,9 @@
 						</attribute>
 					</optional>
 					<ref name="DocDef"/>
-					<ref name="Data" />
+					<optional>
+						<ref name="Data" />
+					</optional>
 				</element>
 			</zeroOrMore>
 		</element>

SDT/schema3.0/src/domain.xsd

@@ -66,24 +66,6 @@
       <xs:attribute name="id" use="required" type="xs:Name"/>
     </xs:complexType>
   </xs:element>
-  <xs:element name="DeviceInfos">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="DeviceInfo"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="DeviceInfo">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:group ref="DocDef"/>
-        <xs:element ref="DataTypeDef"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required"/>
-      <xs:attribute name="optional" type="xs:boolean"/>
-      <xs:attributeGroup ref="DataTypeDef"/>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="Characteristics">
     <xs:complexType>
       <xs:sequence>
@@ -283,7 +265,7 @@
     <xs:complexType>
       <xs:sequence>
         <xs:group ref="DocDef"/>
-        <xs:element ref="Data"/>
+        <xs:element minOccurs="0" ref="Data"/>
       </xs:sequence>
       <xs:attribute name="name" use="required"/>
       <xs:attribute name="optional" type="xs:boolean"/>