Commit 24f2b70c authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

Rel-2 changes agreed at PRO#30

See PRO-2017-0182 for a detailed description of the changes
parent 16e64984
...@@ -64,6 +64,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -64,6 +64,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element> </xs:element>
<xs:element name="pointOfAccess" type="m2m:poaList" /> <xs:element name="pointOfAccess" type="m2m:poaList" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
......
...@@ -261,6 +261,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -261,6 +261,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- ACCEPTED --> <!-- ACCEPTED -->
<xs:enumeration value="1000" /> <xs:enumeration value="1000" />
<!-- ACCEPTED for nonBlockingRequestSynch -->
<xs:enumeration value="1001" />
<!-- ACCEPTED for nonBlockingRequestAsynch -->
<xs:enumeration value="1002" />
<!-- OK --> <!-- OK -->
<xs:enumeration value="2000" /> <xs:enumeration value="2000" />
<!-- CREATED --> <!-- CREATED -->
...@@ -309,7 +313,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -309,7 +313,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4115" /> <xs:enumeration value="4115" />
<!-- ESPRIM_IMPERSONATION_ERROR --> <!-- ESPRIM_IMPERSONATION_ERROR -->
<xs:enumeration value="4116" /> <xs:enumeration value="4116" />
<!-- INTERNAL_SERVER_ERROR --> <!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
<xs:enumeration value="4117" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" /> <xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED --> <!-- NOT_IMPLEMENTED -->
<xs:enumeration value="5001" /> <xs:enumeration value="5001" />
...@@ -365,6 +371,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -365,6 +371,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6029" /> <xs:enumeration value="6029" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="requestStatus"> <xs:simpleType name="requestStatus">
<xs:annotation> <xs:annotation>
......
...@@ -53,8 +53,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -53,8 +53,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" /> <xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" /> <xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" /> <xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
...@@ -151,8 +151,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -151,8 +151,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType> </xs:complexType>
<xs:complexType name="listOfChildResourceRef"> <xs:complexType name="listOfChildResourceRef">
<xs:sequence> <xs:sequence>
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="resourceRef" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
......
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