Commit 7831030c authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict

parents e63b9fe4 5e55f1b3

103120/examples/json/request5-JSON-Delivery.json

0 → 100644
+68 −0
Original line number Diff line number Diff line 
{

  "@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core",

  "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",

  "@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task",

  "@xmlns:delivery": "http://uri.etsi.org/03120/common/2019/10/Delivery",

  "@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common",

  "Header": {

    "SenderIdentifier": {

      "CountryCode": "XX",

      "UniqueIdentifier": "ACTOR2"

    },

    "ReceiverIdentifier": {

      "CountryCode": "XX",

      "UniqueIdentifier": "ACTOR1"

    },

    "TransactionIdentifier": "64cd73e1-a438-4d47-9cfb-cead9125a502",

    "Timestamp": "2019-09-30T13:37:37.000000Z",

    "Version": {

      "ETSIVersion": "V1.14.1",

      "NationalProfileOwner": "XX",

      "NationalProfileVersion": "v1.0"

    }

  },

  "Payload": {

    "RequestPayload": {

      "ActionRequests": {

        "ActionRequest": [

          {

            "ActionIdentifier": 0,

            "DELIVER": {

              "Identifier": "11f49f11-39df-4596-aa58-1f7199b587df",

              "HI1Object": {

                "@xsi:type": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject",

                "ObjectIdentifier": "11f49f11-39df-4596-aa58-1f7199b587df",

                "AssociatedObjects": {

                  "AssociatedObject": [

                    "2b36a78b-b628-416d-bd22-404e68a0cd36"

                  ]

                },

                "delivery:Reference": {

                  "delivery:LDID": "XX-ACTOR01-1234"

                },

                "delivery:SequenceNumber": 1,

                "delivery:LastSequence": true,

                "delivery:Manifest": {

                  "delivery:ExternalSchema": {

                    "delivery:ManifestID" : "ExampleJSONSchema",

                    "delivery:ManifestContents" : {

                      "delivery:JSONSchema" : {

                        "schema_goes_here" : "schema_goes_here"

                      }

                    }

                  }

                },

                "delivery:Delivery": {

                  "delivery:JSONData": {

                    "field1" : "this is native JSON embedded data",

                    "field2" : 1234

                  }

                }

              }

            }

          }

        ]

      }

    }

  }

}

103120/schema/json/ts_103120_Delivery.schema.json

+24 −1
Original line number Diff line number Diff line
@@ -145,6 +145,17 @@ 
          "required": [

            "delivery:XMLSchema"

          ]

        },

        {

          "type": "object",

          "properties": {

            "delivery:JSONSchema": {

              "$ref": "#/$defs/EmbeddedJSONData"

            }

          },

          "required": [

            "delivery:JSONSchema"

          ]

        }

      ]

    },
@@ -180,6 +191,17 @@ 
          "required": [

            "delivery:XMLData"

          ]

        },

        {

          "type": "object",

          "properties": {

            "delivery:JSONData": {

              "$ref": "#/$defs/EmbeddedJSONData"

            }

          },

          "required": [

            "delivery:JSONData"

          ]

        }

      ]

    },
@@ -204,6 +226,7 @@ 
        "delivery:Data"

      ]

    },

    "EmbeddedXMLData": {}

    "EmbeddedXMLData": {},

    "EmbeddedJSONData": {}

  }

}
 
 No newline at end of file

103120/schema/xsd/ts_103120_Delivery.xsd

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
        <xs:choice>

            <xs:element name="BinaryData" type="EmbeddedBinaryData"/>

            <xs:element name="XMLSchema" type="SchemaContent"/>

            <xs:element name="JSONSchema" type="EmbeddedJSONData"/>

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="SchemaContent">
@@ -50,6 +51,7 @@ 
        <xs:choice>

            <xs:element name="BinaryData" type="EmbeddedBinaryData"/>

            <xs:element name="XMLData" type="EmbeddedXMLData"/>

            <xs:element name="JSONData" type="EmbeddedJSONData"/>

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="EmbeddedBinaryData">
@@ -65,4 +67,9 @@ 
            <xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="EmbeddedJSONData">

        <xs:sequence>

            <xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>

Draft_TS_33128__CR_0598___ObservedTime_parameter_to_be_optional_in_xsd_as_required_for_P2T_queries.docx

0 → 100644
+36.9 KiB

File added.

No diff preview for this file type.

View file

TS_103_120_CR_054__Add_Ethernet_Scoping.docx

0 → 100644
+36.7 KiB

File added.

No diff preview for this file type.

View file