Commit eb304558 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'post_publication_tweaks' into 'meeting/LI58e' 

Post-publication updates

See merge request li/trial!59
parents 9f1f509f 91534e4f

103221-1/TS_103_221_01.xsd

+21 −46
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 

<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">

           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:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

	<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 -->

	<!-- Message containers -->
@@ -674,7 +667,7 @@ 
				<xs:sequence>

				<xs:sequence>

					<xs:element name="ListOfXIDs" type="ListOfXids"/>

					<xs:element name="ListOfXIDs" type="ListOfXids"/>

					<xs:element name="ListOfDIDs" type="ListOfDids"/>

					<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:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>
@@ -807,33 +800,28 @@ 
			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:simpleType name="GenericObjectID">

	<xs:simpleType name="GenericObjectID">

		<xs:restriction base="etsi103280:UUID"></xs:restriction>

		<xs:restriction base="etsi103280:UUID"/>

	</xs:simpleType>

	</xs:simpleType>

	

	<xs:simpleType name="GenericObjectType">

	<xs:simpleType name="GenericObjectType">

		<xs:restriction base="xs:string">

		<xs:restriction base="xs:string">

			<xs:pattern value="Q{[^{}]*}.+"></xs:pattern>

			<xs:pattern value="Q\{[^{}]*\}.+"/>

		</xs:restriction>

		</xs:restriction>

	</xs:simpleType>

	</xs:simpleType>

	

	<xs:complexType name="GenericObject" abstract="true">

	<xs:complexType name="GenericObject" abstract="true">

		<xs:sequence>

		<xs:sequence>

			<xs:element name="objectId" type="GenericObjectID"></xs:element>

			<xs:element name="objectId" type="GenericObjectID"/>

		</xs:sequence>

		</xs:sequence>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="CreateObjectRequest">

	<xs:complexType name="CreateObjectRequest">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1RequestMessage">

			<xs:extension base="X1RequestMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="createObject" type="GenericObject"></xs:element>

					<xs:element name="createObject" type="GenericObject"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="CreateObjectResponse">

	<xs:complexType name="CreateObjectResponse">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1ResponseMessage">

			<xs:extension base="X1ResponseMessage">
@@ -843,17 +831,15 @@ 
			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="ModifyObjectRequest">

	<xs:complexType name="ModifyObjectRequest">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1RequestMessage">

			<xs:extension base="X1RequestMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="modifyObject" type="GenericObject"></xs:element>

					<xs:element name="modifyObject" type="GenericObject"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="ModifyObjectResponse">

	<xs:complexType name="ModifyObjectResponse">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1ResponseMessage">

			<xs:extension base="X1ResponseMessage">
@@ -863,54 +849,47 @@ 
			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>

	

	<xs:complexType name="GetObjectRequest">

	<xs:complexType name="GetObjectRequest">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1RequestMessage">

			<xs:extension base="X1RequestMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="objectId" type="GenericObjectID"></xs:element>

					<xs:element name="objectId" type="GenericObjectID"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="GetObjectResponse">

	<xs:complexType name="GetObjectResponse">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1ResponseMessage">

			<xs:extension base="X1ResponseMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"></xs:element>

					<xs:element name="genericObjectResponseDetails" type="GenericObjectResponseDetails"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="GenericObjectResponseDetails">

	<xs:complexType name="GenericObjectResponseDetails">

		<xs:sequence>

		<xs:sequence>

			<xs:element name="object" type="GenericObject"/>

			<xs:element name="object" type="GenericObject"/>

			<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>

			<xs:element name="status" type="GenericObjectStatus" minOccurs="0"/>

		</xs:sequence>

		</xs:sequence>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="ListOfGenericObjectResponseDetails">

	<xs:complexType name="ListOfGenericObjectResponseDetails">

		<xs:sequence>

		<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:sequence>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="GenericObjectStatus">

	<xs:complexType name="GenericObjectStatus">

		<xs:sequence></xs:sequence>

		<xs:sequence/>

	</xs:complexType>

	</xs:complexType>

	

	<xs:complexType name="DeleteObjectRequest">

	<xs:complexType name="DeleteObjectRequest">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1RequestMessage">

			<xs:extension base="X1RequestMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="objectId" type="GenericObjectID"></xs:element>

					<xs:element name="objectId" type="GenericObjectID"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="DeleteObjectResponse">

	<xs:complexType name="DeleteObjectResponse">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1ResponseMessage">

			<xs:extension base="X1ResponseMessage">
@@ -920,31 +899,27 @@ 
			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="ListObjectsOfTypeRequest">

	<xs:complexType name="ListObjectsOfTypeRequest">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1RequestMessage">

			<xs:extension base="X1RequestMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="objectType" type="GenericObjectType"></xs:element>

					<xs:element name="objectType" type="GenericObjectType"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="ListObjectsOfTypeResponse">

	<xs:complexType name="ListObjectsOfTypeResponse">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="X1ResponseMessage">

			<xs:extension base="X1ResponseMessage">

				<xs:sequence>

				<xs:sequence>

					<xs:element name="listOfObjects" type="ListOfGenericObjectIDs"></xs:element>

					<xs:element name="listOfObjects" type="ListOfGenericObjectIDs"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:complexType name="ListOfGenericObjectIDs">

	<xs:complexType name="ListOfGenericObjectIDs">

		<xs:sequence>

		<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:sequence>

	</xs:complexType>

	</xs:complexType>

	

</xs:schema>
 
</xs:schema>

103221-1/TS_103_221_01_HashedID.xsd

+33 −43
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 

<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">

           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/03280/common/2017/07"/>

	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

	<!-- Message containers -->

	<!-- Message containers -->



	<xs:complexType name="HashContext">

	<xs:complexType name="HashContext">

		<xs:complexContent>

		<xs:complexContent>

			<xs:extension base="x1:GenericObject">

			<xs:extension base="x1:GenericObject">

				<xs:sequence>

				<xs:sequence>

          <xs:element name="hashAlgorithm" type="HashAlgorithm"></xs:element>

					<xs:element name="hashAlgorithm" type="HashAlgorithm"/>

          <xs:element name="salt" type="Salt"></xs:element>

					<xs:element name="salt" type="Salt"/>

				</xs:sequence>

				</xs:sequence>

			</xs:extension>

			</xs:extension>

		</xs:complexContent>

		</xs:complexContent>

	</xs:complexType>

	</xs:complexType>



	<xs:simpleType name="HashAlgorithm">

	<xs:simpleType name="HashAlgorithm">

		<xs:restriction base="xs:string">

		<xs:restriction base="xs:string">

			<xs:enumeration value="sha-256"/>

			<xs:enumeration value="sha-256"/>
@@ -28,18 +20,16 @@ 
			<xs:enumeration value="sha3-512"/>

			<xs:enumeration value="sha3-512"/>

		</xs:restriction>

		</xs:restriction>

	</xs:simpleType>

	</xs:simpleType>

    

	<xs:simpleType name="Salt">

	<xs:simpleType name="Salt">

		<xs:restriction base="xs:hexBinary">

		<xs:restriction base="xs:hexBinary">

      <xs:minLength value="8"></xs:minLength>

			<xs:minLength value="8"/>

		</xs:restriction>

		</xs:restriction>

	</xs:simpleType>

	</xs:simpleType>



	<xs:complexType name="HashedIdentifier">

	<xs:complexType name="HashedIdentifier">

		<xs:sequence>

		<xs:sequence>

      <xs:element name="hashContextID" type="x1:GenericObjectID"></xs:element>

			<xs:element name="hashContextID" type="x1:GenericObjectID"/>

      <xs:element name="targetIdentityType" type="etsi103280:ShortString"></xs:element>

			<xs:element name="targetIdentityType" type="etsi103280:ShortString"/>

      <xs:element name="hashDigest" type="xs:hexBinary"></xs:element>

			<xs:element name="hashDigest" type="xs:hexBinary"/>

		</xs:sequence>

		</xs:sequence>

	</xs:complexType>

	</xs:complexType>

</xs:schema>
 
</xs:schema>

103221-1/examples/CreateObject_example.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
    <admfIdentifier>admfID</admfIdentifier>

    <admfIdentifier>admfID</admfIdentifier>

    <neIdentifier>neID</neIdentifier>

    <neIdentifier>neID</neIdentifier>

    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>

    <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>

    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>

    <createObject xsi:type="example:FooObject">

    <createObject xsi:type="example:FooObject">

      <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>

      <objectId>3741800e-971b-4aa9-85f4-466d2b1adc7e</objectId>

103221-1/examples/GetAllDetailsResponse_example2.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <ns1:admfIdentifier>admfID</ns1:admfIdentifier>

    <ns1:admfIdentifier>admfID</ns1:admfIdentifier>

    <ns1:neIdentifier>neID</ns1:neIdentifier>

    <ns1:neIdentifier>neID</ns1:neIdentifier>

    <ns1:messageTimestamp>2017-10-06T18:46:21.496743Z</ns1:messageTimestamp>

    <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:x1TransactionId>bfd0c982-b7d6-4a8e-80a0-89dab964aafd</ns1:x1TransactionId>

    <ns1:neStatusDetails>

    <ns1:neStatusDetails>

      <ns1:neStatus>OK</ns1:neStatus>

      <ns1:neStatus>OK</ns1:neStatus>

103221-1/examples/GetObjectResponse_example.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <admfIdentifier>admfID</admfIdentifier>

    <admfIdentifier>admfID</admfIdentifier>

    <neIdentifier>neID</neIdentifier>

    <neIdentifier>neID</neIdentifier>

    <messageTimestamp>2017-10-06T18:46:21.247432Z</messageTimestamp>

    <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>

    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>

    <genericObjectResponseDetails>

    <genericObjectResponseDetails>

      <object xsi:type="exampleGenericObject:FooObject">

      <object xsi:type="exampleGenericObject:FooObject">