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

fixes to anyArgs (types used by <mgmtCmd>)

parent b2befc76
...@@ -302,11 +302,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -302,11 +302,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType> </xs:complexType>
<!-- Todo - this looks wrong. Are there supposed to be separate type and value elements ? --> <!-- TODO: - TS-0004 calls the member elements "name" and "type", but name and value seems more appropriate -->
<xs:complexType name="anyArgType"> <xs:complexType name="anyArgType">
<xs:sequence> <xs:sequence>
<xs:element name="name" type="xs:NCName" /> <xs:element name="name" type="xs:NCName" />
<xs:element name="type" type="xs:anyType" /> <xs:element name="value" type="xs:anyType" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
...@@ -379,12 +379,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -379,12 +379,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="anyArgsListType"> <!-- TODO: - TS-0004 also shows an anyArg option, but this isn't compatible with the cmdType, so has been omitted -->
<xs:sequence>
<xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="execReqArgsListType"> <xs:complexType name="execReqArgsListType">
<xs:choice> <xs:choice>
...@@ -395,7 +391,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -395,7 +391,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded" /> <xs:element name="softwareInstall" type="m2m:softwareInstallArgsType" maxOccurs="unbounded" />
<xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" maxOccurs="unbounded" /> <xs:element name="softwareUpdate" type="m2m:softwareUpdateArgsType" maxOccurs="unbounded" />
<xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" maxOccurs="unbounded" /> <xs:element name="softwareUninstall" type="m2m:softwareUninstallArgsType" maxOccurs="unbounded" />
<xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0" maxOccurs="unbounded" /> <!-- <xs:element name="anyArg" type="m2m:anyArgsListType" minOccurs="0" maxOccurs="unbounded" /> -->
</xs:choice> </xs:choice>
</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