Commit cc395d93 authored by Peter Niblett's avatar Peter Niblett
Browse files

Change country code type

parent 0be63766
...@@ -137,36 +137,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -137,36 +137,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="accessControlOperation">
<xs:annotation>
<xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Create -->
<xs:enumeration value="1" />
<!-- Retrieve -->
<xs:enumeration value="2" />
<!-- Update -->
<xs:enumeration value="3" />
<!-- Delete -->
<xs:enumeration value="4" />
<!-- Notify -->
<xs:enumeration value="5" />
<!-- Discover -->
<xs:enumeration value="6" />
</xs:restriction>
</xs:simpleType>
<!-- TODO: update this --> <!-- TODO: check if a CR to TS-0004 or TS-0003 is needed -->
<xs:simpleType name="countryCode"> <xs:simpleType name="countryCode">
<xs:annotation> <xs:annotation>
<xs:documentation>2-character country code </xs:documentation> <xs:documentation>2-character country code as defined by ISO-3166</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:integer"> <xs:restriction base="xs:string">
<!-- India --> <xs:pattern value="[A-Z]{2}"></xs:pattern>
<xs:enumeration value="91" />
<!-- United States of America -->
<xs:enumeration value="01" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
......
...@@ -163,38 +163,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -163,38 +163,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<!-- <xs:simpleType name="accessControlOperation"> --> <xs:simpleType name="accessControlOperation">
<!-- <xs:annotation> --> <xs:annotation>
<!-- <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation> --> <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
<!-- </xs:annotation> --> </xs:annotation>
<!-- <xs:restriction base="xs:integer"> --> <xs:restriction base="xs:integer">
<!-- Create --> <!-- Create -->
<!-- <xs:enumeration value="1" /> --> <xs:enumeration value="1" />
<!-- Retrieve --> <!-- Retrieve -->
<!-- <xs:enumeration value="2" /> --> <xs:enumeration value="2" />
<!-- Update --> <!-- Update -->
<!-- <xs:enumeration value="3" /> --> <xs:enumeration value="3" />
<!-- Delete --> <!-- Delete -->
<!-- <xs:enumeration value="4" /> --> <xs:enumeration value="4" />
<!-- Notify --> <!-- Notify -->
<!-- <xs:enumeration value="5" /> --> <xs:enumeration value="5" />
<!-- Discover --> <!-- Discover -->
<!-- <xs:enumeration value="6" /> --> <xs:enumeration value="6" />
<!-- </xs:restriction> --> </xs:restriction>
<!-- </xs:simpleType> --> </xs:simpleType>
<!-- <xs:simpleType name="countryCode"> -->
<!-- <xs:annotation> -->
<!-- <xs:documentation>2-character country code </xs:documentation> -->
<!-- </xs:annotation> -->
<!-- <xs:restriction base="xs:integer"> -->
<!-- India -->
<!-- <xs:enumeration value="91" /> -->
<!-- United States of America -->
<!-- <xs:enumeration value="01" /> -->
<!-- </xs:restriction> -->
<!-- </xs:simpleType> -->
<xs:simpleType name="responseType"> <xs:simpleType name="responseType">
<xs:annotation> <xs:annotation>
...@@ -730,7 +717,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -730,7 +717,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<!-- TODO: Agree representation of SRole-ID and add to TS-0004 --> <!-- TODO: Agree representation of SRole-ID and add to TS-0004. Possibly consider removing all values -->
<xs:simpleType name="SRole-ID"> <xs:simpleType name="SRole-ID">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<!-- Software Management --> <!-- Software Management -->
......
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