Commit 26d1ae80 authored by Wolfgang Granzow's avatar Wolfgang Granzow

Revert "Revert "Further TP#17 corrections""

This reverts commit fd49de32.
parent fd49de32
...@@ -93,7 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -93,7 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:accessControlPolicy" /> <xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:accessControlPolicyAnnc" /> <xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:subscription" /> <xs:element ref="m2m:subscription" />
<xs:element ref="m2m:pollingChannel" /> <xs:element ref="m2m:scheduleAnnc" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
......
...@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="acpType"> <xs:simpleType name="acpType">
<list itemType="xs:anyURI" /> <list itemType="m2m:ID" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="labels"> <xs:simpleType name="labels">
......
...@@ -275,7 +275,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -275,7 +275,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6011" /> <xs:enumeration value="6011" />
<!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED --> <!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED -->
<xs:enumeration value="6020" /> <xs:enumeration value="6020" />
<!-- MGMT_SESSION_ESTABLISHMENT _TIMEOUT --> <!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT -->
<xs:enumeration value="6021" /> <xs:enumeration value="6021" />
<!-- INVALID_CMDTYPE --> <!-- INVALID_CMDTYPE -->
<xs:enumeration value="6022" /> <xs:enumeration value="6022" />
...@@ -285,7 +285,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -285,7 +285,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6024" /> <xs:enumeration value="6024" />
<!-- MGMT_ CONVERSION_ERROR --> <!-- MGMT_ CONVERSION_ERROR -->
<xs:enumeration value="6025" /> <xs:enumeration value="6025" />
<!-- MGMT_ CANCELATION_FAILED --> <!-- MGMT_ CANCELLATION_FAILED -->
<xs:enumeration value="6026" /> <xs:enumeration value="6026" />
<!-- ALREADY_COMPLETE --> <!-- ALREADY_COMPLETE -->
<xs:enumeration value="6028" /> <xs:enumeration value="6028" />
......
...@@ -45,7 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -45,7 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/> <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Name" --> <!-- parameter "Name" -->
<xs:element name="name" type="xs:NCName" minOccurs="0"/> <xs:element name="name" type="xs:NCName" minOccurs="0"/>
<!-- parameter "primitiveContent" --> <!-- parameter "Content" -->
<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "Originating Timestamp" --> <!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/> <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
......
...@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/> <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
<!-- parameter "Request Identifier" --> <!-- parameter "Request Identifier" -->
<xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
<!-- parameter "primitiveContent" --> <!-- parameter "Content" -->
<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "To" --> <!-- parameter "To" -->
<xs:element name="to" type="m2m:ID" minOccurs="0"/> <xs:element name="to" type="m2m:ID" minOccurs="0"/>
......
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