Commit 67fa97bd authored by Peter Niblett's avatar Peter Niblett
Browse files

various fixes to group

parent dd56dd09
...@@ -36,21 +36,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,21 +36,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes for announceable Resources --> <!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:announceableResource"> <xs:extension base="m2m:announceableResource">
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:sequence> <xs:sequence>
<xs:element name="creator" type="xs:anyURI" minOccurs="0" />
<xs:element name="memberType" type="m2m:memberType" /> <xs:element name="memberType" type="m2m:memberType" />
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" /> <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" /> <xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="membersList" type="m2m:listOfURIs" /> <xs:element name="memberIDs" type="m2m:listOfURIs" />
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="memberTypeValidated" type="xs:boolean" /> <xs:element name="memberTypeValidated" type="xs:boolean" />
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
<xs:element name="groupName" type="xs:string" minOccurs="0" /> <xs:element name="groupName" type="xs:string" minOccurs="0" />
<!-- TODO: update TS-0004 to change the name from Creator to creator. Also it's at the start of the list in TS-0001 -->
<xs:element name="creator" type="xs:anyURI" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<!-- TODO: should this be fanOutURI? --> <xs:element name="fanOutPoint" type="xs:anyURI" />
<xs:element name="fanOut" type="xs:anyURI" />
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
...@@ -72,15 +70,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -72,15 +70,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="memberType" type="m2m:memberType" minOccurs="0" /> <xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="membersList" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" /> <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" />
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
<xs:element name="groupName" type="xs:string" minOccurs="0" /> <xs:element name="groupName" type="xs:string" minOccurs="0" />
<!-- TODO: update TS-0004 to change the name from Creator to creator. Also it's at the start of the list in TS-0001 -->
<xs:element name="creator" type="xs:anyURI" minOccurs="0" /> <!-- Child Resources -->
<!-- No Child Resources --> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
</xs:choice>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
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