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

Updating to match first draft of CR

parent dfdd6a61

103221-1/TS_103_221_01.xsd

+9 −7
Original line number Original line Diff line number Diff line
@@ -798,7 +798,9 @@ 
  </xs:simpleType>

  </xs:simpleType>





  <xs:simpleType name="X1ObjectType">

  <xs:simpleType name="X1ObjectType">

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

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

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

    </xs:restriction>

  </xs:simpleType>

  </xs:simpleType>

  

  

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

  <xs:complexType name="X1Object" abstract="true">
@@ -828,7 +830,7 @@ 
  </xs:complexType>

  </xs:complexType>









  <xs:complexType name="CreateObject">

  <xs:complexType name="CreateObjectRequest">

    <xs:complexContent>

    <xs:complexContent>

      <xs:extension base="X1RequestMessage">

      <xs:extension base="X1RequestMessage">

        <xs:sequence>

        <xs:sequence>
@@ -849,11 +851,11 @@ 
  </xs:complexType>

  </xs:complexType>









  <xs:complexType name="UpdateObject">

  <xs:complexType name="ModifyObjectRequest">

    <xs:complexContent>

    <xs:complexContent>

      <xs:extension base="X1RequestMessage">

      <xs:extension base="X1RequestMessage">

        <xs:sequence>

        <xs:sequence>

          <xs:element name="updateObject" type="X1Object"></xs:element>

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

        </xs:sequence>

        </xs:sequence>

      </xs:extension>

      </xs:extension>

    </xs:complexContent>

    </xs:complexContent>
@@ -870,7 +872,7 @@ 
  </xs:complexType>

  </xs:complexType>





  

  

  <xs:complexType name="GetObject">

  <xs:complexType name="GetObjectRequest">

    <xs:complexContent>

    <xs:complexContent>

      <xs:extension base="X1RequestMessage">

      <xs:extension base="X1RequestMessage">

        <xs:sequence>

        <xs:sequence>
@@ -891,7 +893,7 @@ 
  </xs:complexType>

  </xs:complexType>

  

  

  

  

  <xs:complexType name="DeleteObject">

  <xs:complexType name="DeleteObjectRequest">

    <xs:complexContent>

    <xs:complexContent>

      <xs:extension base="X1RequestMessage">

      <xs:extension base="X1RequestMessage">

        <xs:sequence>

        <xs:sequence>
@@ -912,7 +914,7 @@ 
  </xs:complexType>

  </xs:complexType>

  

  





  <xs:complexType name="ListObjectsOfType">

  <xs:complexType name="ListObjectsOfTypeRequest">

    <xs:complexContent>

    <xs:complexContent>

      <xs:extension base="X1RequestMessage">

      <xs:extension base="X1RequestMessage">

        <xs:sequence>

        <xs:sequence>

103221-1/examples/CreateObject_example.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" ?>

<?xml version="1.0" ?>

<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <x1RequestMessage xsi:type="CreateObject">

  <x1RequestMessage xsi:type="CreateObjectRequest">

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

103221-1/examples/GetObjectResponse_example.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ 
    <x1TransactionId>3741800e-971b-4aa9-85f4-466d2b1adc7f</x1TransactionId>

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

    <object xsi:type="FooObject">

    <object xsi:type="FooObject">

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

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

      <Foo>1</Foo>

    </object>

    </object>

  </x1ResponseMessage>

  </x1ResponseMessage>

</X1Response>
 
</X1Response>

103221-1/examples/ListObject_example.xml

+2 −2
Original line number Original line Diff line number Diff line 
<?xml version="1.0" ?>

<?xml version="1.0" ?>

<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<X1Request xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <x1RequestMessage xsi:type="ListObjectsOfType">

  <x1RequestMessage xsi:type="ListObjectsOfTypeRequest">

    <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.6.1</version>

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

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

    <objectType>FooObject</objectType>

    <objectType>Q{http://uri.etsi.org/03221/X1/2017/10}Foo</objectType>

  </x1RequestMessage>

  </x1RequestMessage>

</X1Request>
 
</X1Request>