Commit eb304558 authored by canterburym's avatar canterburym
Browse files

Merge branch 'post_publication_tweaks' into 'meeting/LI58e'

Post-publication updates

See merge request !59
parents 9f1f509f 91534e4f
Pipeline #10254 passed with stage
in 37 seconds
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/03221/X1/2017/10"
xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID"
targetNamespace="http://uri.etsi.org/03221/X1/2017/10"
elementFormDefault="qualified"
version="1.8.1">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.10.1">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
<!-- Message containers -->
<xs:element name="X1Request" type="RequestContainer"/>
<xs:element name="X1Response" type="ResponseContainer"/>
......@@ -188,8 +181,8 @@
<xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"/>
<xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"/>
<xs:element name="gpsiNai" type="etsi103280:GPSINAI"/>
<xs:element name="eui64" type="etsi103280:EUI64"/>
<xs:element name="hashedIdentifier" type="hashedID:HashedIdentifier"/>
<xs:element name="eui64" type="etsi103280:EUI64"/>
<xs:element name="hashedIdentifier" type="hashedID:HashedIdentifier"/>
<xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"/>
</xs:choice>
</xs:complexType>
......@@ -674,7 +667,7 @@
<xs:sequence>
<xs:element name="ListOfXIDs" type="ListOfXids"/>
<xs:element name="ListOfDIDs" type="ListOfDids"/>
<xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"></xs:element>
<xs:element name="ListOfGenericObjectIDs" type="ListOfGenericObjectIDs" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......@@ -807,33 +800,28 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:simpleType name="GenericObjectID">
<xs:restriction base="etsi103280:UUID"></xs:restriction>
<xs:restriction base="etsi103280:UUID"/>
</xs:simpleType>
<xs:simpleType name="GenericObjectType">
<xs:restriction base="xs:string">
<xs:pattern value="Q{[^{}]*}.+"></xs:pattern>
<xs:pattern value="Q\{[^{}]*\}.+"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="GenericObject" abstract="true">
<xs:sequence>
<xs:element name="objectId" type="GenericObjectID"></xs:element>
</xs:sequence>
<xs:element name="objectId" type="GenericObjectID"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="CreateObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="createObject" type="GenericObject"></xs:element>
<xs:element name="createObject" type="GenericObject"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="CreateObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
......@@ -843,17 +831,15 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ModifyObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="modifyObject" type="GenericObject"></xs:element>
<xs:element name="modifyObject" type="GenericObject"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ModifyObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
......@@ -863,54 +849,47 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GetObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="objectId" type="GenericObjectID"></xs:element>
<xs:element name="objectId" type="GenericObjectID"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GetObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
<xs:sequence>
<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"></xs:element>
<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="GenericObjectResponseDetails">
<xs:sequence>
<xs:element name="object" type="GenericObject"/>
<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>
<xs:element name="object" type="GenericObject"/>
<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ListOfGenericObjectResponseDetails">
<xs:sequence>
<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="GenericObjectStatus">
<xs:sequence></xs:sequence>
<xs:sequence/>
</xs:complexType>
<xs:complexType name="DeleteObjectRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="objectId" type="GenericObjectID"></xs:element>
<xs:element name="objectId" type="GenericObjectID"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DeleteObjectResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
......@@ -920,31 +899,27 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ListObjectsOfTypeRequest">
<xs:complexContent>
<xs:extension base="X1RequestMessage">
<xs:sequence>
<xs:element name="objectType" type="GenericObjectType"></xs:element>
<xs:element name="objectType" type="GenericObjectType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ListObjectsOfTypeResponse">
<xs:complexContent>
<xs:extension base="X1ResponseMessage">
<xs:sequence>
<xs:element name="listOfObjects" type="ListOfGenericObjectIDs"></xs:element>
<xs:element name="listOfObjects" type="ListOfGenericObjectIDs"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="ListOfGenericObjectIDs">
<xs:sequence>
<xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"></xs:element>
<xs:element name="objectId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="http://uri.etsi.org/03221/X1/2017/10/HashedID"
xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"
elementFormDefault="qualified" version="1.9.1">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
<!-- Message containers -->
<xs:complexType name="HashContext">
<xs:complexContent>
<xs:extension base="x1:GenericObject">
<xs:sequence>
<xs:element name="hashAlgorithm" type="HashAlgorithm"></xs:element>
<xs:element name="salt" type="Salt"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:simpleType name="HashAlgorithm">
<xs:restriction base="xs:string">
<xs:enumeration value="sha-256"/>
<xs:enumeration value="sha-512"/>
<xs:enumeration value="sha3-512"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="Salt">
<xs:restriction base="xs:hexBinary">
<xs:minLength value="8"></xs:minLength>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="HashedIdentifier">
<xs:sequence>
<xs:element name="hashContextID" type="x1:GenericObjectID"></xs:element>
<xs:element name="targetIdentityType" type="etsi103280:ShortString"></xs:element>
<xs:element name="hashDigest" type="xs:hexBinary"></xs:element>
</xs:sequence>
</xs:complexType>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10/HashedID" elementFormDefault="qualified" version="1.10.1">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
<!-- Message containers -->
<xs:complexType name="HashContext">
<xs:complexContent>
<xs:extension base="x1:GenericObject">
<xs:sequence>
<xs:element name="hashAlgorithm" type="HashAlgorithm"/>
<xs:element name="salt" type="Salt"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:simpleType name="HashAlgorithm">
<xs:restriction base="xs:string">
<xs:enumeration value="sha-256"/>
<xs:enumeration value="sha-512"/>
<xs:enumeration value="sha3-512"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="Salt">
<xs:restriction base="xs:hexBinary">
<xs:minLength value="8"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="HashedIdentifier">
<xs:sequence>
<xs:element name="hashContextID" type="x1:GenericObjectID"/>
<xs:element name="targetIdentityType" type="etsi103280:ShortString"/>
<xs:element name="hashDigest" type="xs:hexBinary"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
......@@ -6,7 +6,7 @@
<admfIdentifier>admfID</admfIdentifier>
<neIdentifier>neID</neIdentifier>
<messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
<version>v1.9.1</version>
<version>v1.10.1</version>
<x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
<createObject xsi:type="example:FooObject">
<objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
......
......@@ -4,7 +4,7 @@
<ns1:admfIdentifier>admfID</ns1:admfIdentifier>
<ns1:neIdentifier>neID</ns1:neIdentifier>
<ns1:messageTimestamp>2017-10-06T18:46:21.496743Z</ns1:messageTimestamp>
<ns1:version>v1.9.1</ns1:version>
<ns1:version>v1.10.1</ns1:version>
<ns1:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>
<ns1:neStatusDetails>
<ns1:neStatus>OK</ns1:neStatus>
......
......@@ -4,7 +4,7 @@
<admfIdentifier>admfID</admfIdentifier>
<neIdentifier>neID</neIdentifier>
<messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
<version>v1.6.1</version>
<version>v1.10.1</version>
<x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
<genericObjectResponseDetails>
<object xsi:type="exampleGenericObject:FooObject">
......
......@@ -4,7 +4,7 @@
<admfIdentifier>admfID</admfIdentifier>
<neIdentifier>neID</neIdentifier>
<messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
<version>v1.6.1</version>
<version>v1.10.1</version>
<x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
<objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>
</x1RequestMessage>
......
......@@ -4,7 +4,7 @@
<ns1:admfIdentifier>admfID</ns1:admfIdentifier>
<ns1:neIdentifier>neID</ns1:neIdentifier>
<ns1:messageTimestamp>2017-10-06T18:46:21.508330Z</ns1:messageTimestamp>
<ns1:version>v1.6.1</ns1:version>
<ns1:version>v1.10.1</ns1:version>
<ns1:x1TransactionId>09529160-2e44-49c6-bf54-204ca5edcfab</ns1:x1TransactionId>
<ns1:ListOfXIDs>
<ns1:xId>29f28e1c-f230-486a-a860-f5a784ab9172</ns1:xId>
......
......@@ -4,7 +4,7 @@
<admfIdentifier>admfID</admfIdentifier>
<neIdentifier>neID</neIdentifier>
<messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>
<version>v1.6.1</version>
<version>v1.10.1</version>
<x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>
<objectType>Q{http://uri.etsi.org/03221/X1/2017/10}Foo</objectType>
</x1RequestMessage>
......
......@@ -91,4 +91,4 @@ GPSINAI ::= NAI
NAI ::= UTF8String
END
\ No newline at end of file
END
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.6.1" elementFormDefault="qualified">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.7.1" elementFormDefault="qualified">
<xs:simpleType name="ShortString">
<xs:restriction base="xs:string">
<xs:maxLength value="255"/>
......@@ -241,9 +241,9 @@
<xs:pattern value=".+@.+"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="EUI64">
<xs:simpleType name="EUI64">
<xs:restriction base="xs:token">
<xs:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
\ No newline at end of file
</xs:schema>
......@@ -3,7 +3,7 @@
xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
xmlns="http://uri.etsi.org/03707/2020/02"
targetNamespace="http://uri.etsi.org/03707/2020/02"
version="1.3.1"
version="1.4.1"
elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
......
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