Commit 8c7162d4 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'draft/eevidence_crx13' into 'draft/eevidence' 

CRx13 - Form 5 and 6

See merge request !353
parents 1fa6803e 76d77b28

104144/examples/form5_subsequent_production.xml

+59 −1
Changes for 104144/examples/form5_subsequent_production.xml: 59 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:epoc="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo">

    <Header>

        <SenderIdentifier>

            <CountryCode>XX</CountryCode>
@@ -35,6 +35,64 @@ 
                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <UPDATE>

                        <HI1Object xsi:type="auth:AuthorisationObject">

                            <ObjectIdentifier>e241c1da-b108-48a4-a31a-04554d7bd3f8</ObjectIdentifier>

                            <auth:NationalAuthorisationParameters xsi:type="epoc:EPOCAuthorisationParameters">

                                <auth:CountryCode>EU</auth:CountryCode>

                                <epoc:Form5Details>

                                    <epoc:ContactAuthority>

                                        <epoc:Name>Issuing Authority</epoc:Name>

                                        <epoc:Identity>

                                            <common:CountryCode>EU</common:CountryCode>

                                            <epoc:ApproverEndpointID>

                                                <CountryCode>FR</CountryCode>

                                                <UniqueIdentifier>epoc-authority-1</UniqueIdentifier>

                                            </epoc:ApproverEndpointID>

                                        </epoc:Identity>

                                        <epoc:ContactDetails>

                                            <common:EmailAddress>issuing_authority@example.org</common:EmailAddress>

                                            <common:PhoneNumber>33199000000</common:PhoneNumber>

                                            <common:FaxNumber>33199000001</common:FaxNumber>

                                        </epoc:ContactDetails>

                                        <epoc:AdditionalContactDetails>Additional free text information from Form 5 Section A</epoc:AdditionalContactDetails>

                                    </epoc:ContactAuthority>

                                    <epoc:AddresseeInformation>

                                        <epoc:ContactPerson>Contact person specified in Form 5 Section B</epoc:ContactPerson>

                                        <epoc:FileNumber>File number specified in Form 5 Section B</epoc:FileNumber>

                                        <epoc:ServiceProviderConcerned>SP specified in Form 5 Section B</epoc:ServiceProviderConcerned>

                                        <epoc:AnyOtherInformation>Any other information specified in Form 5 Section B</epoc:AnyOtherInformation>

                                    </epoc:AddresseeInformation>

                                    <epoc:IssuedOn>2025-05-30T14:54:00+01:00</epoc:IssuedOn>

                                    <epoc:FileNumber>File number specified in Form 5 Section C</epoc:FileNumber>

                                    <epoc:WasExtended>

                                        <epoc:ExtendedByIdentity>

                                            <CountryCode>FR</CountryCode>

                                            <UniqueIdentifier>epoc-authority-1</UniqueIdentifier>

                                        </epoc:ExtendedByIdentity>

                                        <epoc:ExtendedByName>Issuing Authority</epoc:ExtendedByName>

                                        <epoc:ExtendedOn>2025-06-30T14:54:00+01:00</epoc:ExtendedOn>

                                        <epoc:FileNumber>Extension file number in Form 5 Section C</epoc:FileNumber>

                                    </epoc:WasExtended>

                                    <epoc:RequestType>EPOC</epoc:RequestType>

                                    <epoc:RequestInformation>

                                        <epoc:IssuedBy>Issuing Authority</epoc:IssuedBy>

                                        <epoc:IssuedOn>2025-05-30T14:54:00+01:00</epoc:IssuedOn>

                                        <epoc:TransmittedOn>2025-05-30T14:54:00+01:00</epoc:TransmittedOn>

                                        <epoc:FileNumber>File number specified in Form 5 Section D</epoc:FileNumber>

                                        <epoc:TransmittedTo>Details specified in Form 5 section D</epoc:TransmittedTo>

                                        <epoc:RequestedAuthorityFileNumber>Yet another file number in Form 5 Section D</epoc:RequestedAuthorityFileNumber>

                                    </epoc:RequestInformation>

                                    <epoc:SignedName>Signature name in Form 5 Section D</epoc:SignedName>

                                    <epoc:SignedDate>2025-05-30T14:54:00+01:00</epoc:SignedDate>

                                </epoc:Form5Details>

                            </auth:NationalAuthorisationParameters>

                            <auth:AuthorisationLegalEntity>Service Provider 1</auth:AuthorisationLegalEntity>

                        </HI1Object>

                    </UPDATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="doc:DocumentObject">

                            <ObjectIdentifier>a123e20b-b849-4e3f-b23b-9118a137320e</ObjectIdentifier>

104144/examples/form6_preservation_extension.xml

+41 −1
Changes for 104144/examples/form6_preservation_extension.xml: 41 added lines, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:ef1="http://uri.etsi.org/03120/common/2025/02/EpocForm1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ph="http://uri.etsi.org/03120/common/2025/02/EPOCPlaceholder" xmlns:epoc="http://data.europa.eu/edm/1/ns/epoc" xmlns:eio="http://data.europa.eu/edm/1/ns/eio" xmlns:epocform1="http://data.europa.eu/edm/1/ns/forms/EPOC-FORM-1#" xmlns:epocform2="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-2#" xmlns:epocform3="http://data.europa.eu/edm/1/ns/forms/EPOC-FORM-3#" xmlns:eopcform5="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-5#" xmlns:eopcform6="http://data.europa.eu/edm/1/ns/forms/EPOC-PR-FORM-6#" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:ecauth="http://uri.etsi.org/03120/common/2025/02/EioAuthority">

<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:notify="http://uri.etsi.org/03120/common/2016/02/Notification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:epoc="http://uri.etsi.org/03120/common/2025/06/EPOCAdditionalInfo">

    <Header>

        <SenderIdentifier>

            <CountryCode>FR</CountryCode>
@@ -31,6 +31,46 @@ 
                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>1</ActionIdentifier>

                    <UPDATE>

                        <HI1Object xsi:type="auth:AuthorisationObject">

                            <ObjectIdentifier>e241c1da-b108-48a4-a31a-04554d7bd3f8</ObjectIdentifier>

                            <auth:NationalAuthorisationParameters xsi:type="epoc:EPOCAuthorisationParameters">

                                <auth:CountryCode>EU</auth:CountryCode>

                                <epoc:Form6Details>

                                    <epoc:ContactAuthority>

                                        <epoc:Name>Issuing Authority</epoc:Name>

                                        <epoc:Identity>

                                            <common:CountryCode>EU</common:CountryCode>

                                            <epoc:ApproverEndpointID>

                                                <CountryCode>FR</CountryCode>

                                                <UniqueIdentifier>epoc-authority-1</UniqueIdentifier>

                                            </epoc:ApproverEndpointID>

                                        </epoc:Identity>

                                        <epoc:ContactDetails>

                                            <common:EmailAddress>issuing_authority@example.org</common:EmailAddress>

                                            <common:PhoneNumber>33199000000</common:PhoneNumber>

                                            <common:FaxNumber>33199000001</common:FaxNumber>

                                        </epoc:ContactDetails>

                                        <epoc:AdditionalContactDetails>Additional free text information from Form 6 Section A</epoc:AdditionalContactDetails>

                                    </epoc:ContactAuthority>

                                    <epoc:IssuingAuthorityFileNumber>File number specified in Form 6 Section A</epoc:IssuingAuthorityFileNumber>

                                    <epoc:AddresseeInformation>

                                        <epoc:ContactPerson>Contact person specified in Form 6 Section B</epoc:ContactPerson>

                                        <epoc:FileNumber>File number specified in Form 6 Section B</epoc:FileNumber>

                                        <epoc:ServiceProviderConcerned>SP specified in Form 6 Section B</epoc:ServiceProviderConcerned>

                                        <epoc:AnyOtherInformation>Any other information specified in Form 6 Section B</epoc:AnyOtherInformation>

                                    </epoc:AddresseeInformation>

                                    <epoc:IssuedOn>2025-05-30T14:54:00+01:00</epoc:IssuedOn>

                                    <epoc:FileNumber>File number specified in Form 6 Section C</epoc:FileNumber>

                                    <epoc:SignedName>Signature name in Form 6 Section D</epoc:SignedName>

                                    <epoc:SignedDate>2025-05-30T14:54:00+01:00</epoc:SignedDate>

                                </epoc:Form6Details>

                            </auth:NationalAuthorisationParameters>

                        </HI1Object>

                    </UPDATE>

                </ActionRequest>

                <ActionRequest>

                    <ActionIdentifier>2</ActionIdentifier>

                    <CREATE>

                        <HI1Object xsi:type="doc:DocumentObject">

                            <ObjectIdentifier>7f09fa28-19de-48a9-beed-cc68b0a8d9a7</ObjectIdentifier>

104144/schema/xsd/ts_104144_EPOCAdditionalInfo.xsd

+67 −0
Changes for 104144/schema/xsd/ts_104144_EPOCAdditionalInfo.xsd: 67 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
                    <xs:element name="SectionCAdditionalInformation" type="etsi:LongString" minOccurs="0"/>

                    <xs:element name="SectionEAdditionallnformation" type="etsi:LongString" minOccurs="0"/>

                    <xs:element name="SectionLPreferredMeans" type="etsi:LongString" minOccurs="0"/>

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -125,4 +127,69 @@ 
            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="Form5Details">

        <xs:sequence>

            <xs:element name="ContactAuthority" type="ContactAuthorityDetails" minOccurs="0"/>

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

            <xs:element name="IssuedOn" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="FileNumber" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="WasExtended" type="ExtensionInformation" minOccurs="0"/>

            <xs:element name="RequestType" type="TypeOfProductionRequest"/>

            <xs:element name="RequestInformation" type="ProductionRequestInformation" minOccurs="0"/>

            <xs:element name="SignedName" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="SignedDate" type="etsi:QualifiedDateTime" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="Form6Details">

        <xs:sequence>

            <xs:element name="ContactAuthority" type="ContactAuthorityDetails" minOccurs="0"/>

            <xs:element name="IssuingAuthorityFileNumber" type="etsi:LongString" minOccurs="0"/>

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

            <xs:element name="IssuedOn" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="FileNumber" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="SignedName" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="SignedDate" type="etsi:QualifiedDateTime" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ContactAuthorityDetails">

        <xs:sequence>

            <xs:element name="Name" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="Identity" type="EPOCApproverIdentity" minOccurs="0"/>

            <xs:element name="ContactDetails" type="common:ApproverContactDetails" minOccurs="0"/>

            <xs:element name="AdditionalContactDetails" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="AddresseeInformation">

        <xs:sequence>

            <xs:element name="ContactPerson" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="FileNumber" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="ServiceProviderConcerned" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="AnyOtherInformation" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ExtensionInformation">

        <xs:sequence>

            <xs:element name="ExtendedByIdentity" type="core:EndpointID"/>

            <xs:element name="ExtendedByName" type="etsi:LongString"/>

            <xs:element name="ExtendedOn" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="FileNumber" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="TypeOfProductionRequest">

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

            <xs:enumeration value="EPOC"/>

            <xs:enumeration value="EIO"/>

            <xs:enumeration value="MLA"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:complexType name="ProductionRequestInformation">

        <xs:sequence>

            <xs:element name="IssuedBy" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="IssuedOn" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="TransmittedOn" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="FileNumber" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="TransmittedTo" type="etsi:LongString" minOccurs="0"/>

            <xs:element name="RequestedAuthorityFileNumber" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>
 
 No newline at end of file