Commit 21375c41 authored by Peter Niblett's avatar Peter Niblett

Moved eventCat into common types

parent fabec7ab
...@@ -33,6 +33,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -33,6 +33,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="xs:dateTime" /> <xs:restriction base="xs:dateTime" />
</xs:simpleType> </xs:simpleType>
<!-- TODO: it's not clear that we need both this an eventCatType -->
<xs:complexType name="eventCat">
<xs:sequence>
<xs:element name="eventCatType" type="m2m:eventCatType" />
<xs:element name="eventCatNo" type="xs:nonNegativeInteger" />
</xs:sequence>
</xs:complexType>
<xs:simpleType name="extendedCrontab"> <xs:simpleType name="extendedCrontab">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
......
...@@ -40,9 +40,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -40,9 +40,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="eventNotificationCriteria" type="m2m:eventNotificationCriteria" minOccurs="0" /> <xs:element name="eventNotificationCriteria" type="m2m:eventNotificationCriteria" minOccurs="0" />
<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="notificationURI" type="m2m:AnyURIList" /> <xs:element name="notificationURI" type="m2m:AnyURIList" />
<xs:element name="groupName" type="xs:anyURI" minOccurs="0" /> <xs:element name="groupID" type="xs:anyURI" minOccurs="0" />
<xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0" /> <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0" />
<xs:element name="batchNotify" type="m2m:batchNotify" minOccurs="0" /> <xs:element name="batchNotify" minOccurs="0">
<xs:complexType>
<xs:sequence>
<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="duration" type="xs:duration" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="rateLimit" type="m2m:rateLimit" minOccurs="0" /> <xs:element name="rateLimit" type="m2m:rateLimit" minOccurs="0" />
<xs:element name="preSubscriptionNotify" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="preSubscriptionNotify" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="pendingNotification" type="m2m:pendingNotification" minOccurs="0" /> <xs:element name="pendingNotification" type="m2m:pendingNotification" minOccurs="0" />
...@@ -64,7 +71,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -64,7 +71,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<!-- TODO: If this used by anything other than <subscription> it might be better placed in the CommonTypes XSD file -->
<xs:complexType name="eventNotificationCriteria"> <xs:complexType name="eventNotificationCriteria">
<xs:sequence> <xs:sequence>
<xs:element name="createdBefore" type="xs:dateTime" minOccurs="0" /> <xs:element name="createdBefore" type="xs:dateTime" minOccurs="0" />
...@@ -82,14 +88,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -82,14 +88,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<!-- TODO: Member names here are different from those given in TS-0004 -->
<xs:complexType name="batchNotify">
<xs:sequence>
<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="duration" type="xs:duration" minOccurs="0" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="rateLimit"> <xs:complexType name="rateLimit">
<xs:sequence> <xs:sequence>
...@@ -98,11 +98,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -98,11 +98,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="eventCat">
<xs:sequence>
<xs:element name="eventCatType" type="m2m:eventCatType" />
<xs:element name="eventCatNo" type="xs:nonNegativeInteger" />
</xs:sequence>
</xs:complexType>
</xs:schema> </xs:schema>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment