Commit 0055f336 authored by Laurent Velez's avatar Laurent Velez
Browse files

v1.1.2

parent d81cde80
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>

<!-- ================================================ -->
<!-- This document is part of ETSI TS 119 512 v.1.1.1 -->
<!-- This document is part of ETSI TS 119 512 v.1.1.2 -->
<!-- ================================================ -->

<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
	xmlns:ex="http://uri.etsi.org/19512/exchange/v1.1.1#"
	xmlns:ex="http://uri.etsi.org/19512/exchange/v1.1.2#"
	xmlns:xs="http://www.w3.org/2001/XMLSchema"
	xmlns:ds-rw="http://docs.oasis-open.org/dss-x/ns/xmldsig/rewritten"
	xmlns:pres="http://uri.etsi.org/19512/v1.1.1#"
	targetNamespace="http://uri.etsi.org/19512/exchange/v1.1.1#"
	xmlns:pres="http://uri.etsi.org/19512/v1.1.2#"
	targetNamespace="http://uri.etsi.org/19512/exchange/v1.1.2#"
	elementFormDefault="qualified" attributeFormDefault="unqualified"
	version="1.1.1">
	version="1.1.2">


	<xs:import namespace="http://docs.oasis-open.org/dss-x/ns/xmldsig/rewritten"
		schemaLocation="http://docs.oasis-open.org/dss-x/dss-core/v2.0/cs02/schema/oasis-dss-rw-xmldsig-core-schema.xsd" />
	<xs:import namespace="http://uri.etsi.org/19512/v1.1.1#"
		schemaLocation="https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API.xsd" />
	<xs:import namespace="http://uri.etsi.org/19512/v1.1.2#"
		schemaLocation="19512-Preservation-API.xsd" />


	<!-- ======================================= -->
	<!-- Evidence Exchange Format				 -->
	<!-- ======================================= -->
	<!-- Version 1.0 (12.01.2020)                -->
	<!-- Version 1.1.2 (24.09.2020)              -->
	<!-- ======================================= -->

	<xs:element name="EvidenceExchange" type="ex:EvidenceExchangeType" />
+19 −19
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@
        "contact": {
            "name": "ETSI ESI",
            "url": "https://www.etsi.org/committee/esi",
            "email": "esisupport@etsi.org"  
            "email": "ESI@LIST.ETSI.ORG"
        },
        "license": {
            "name": "BSD-3-Clause",
            "url": "https://forge.etsi.org/legal-matters"
        },
        "version": "1.1.1"
        "version": "1.1.2"
    },
    "servers": [
        {
@@ -37,7 +37,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-RetrieveInfoType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-RetrieveInfoType"
                            }
                        }
                    }
@@ -48,7 +48,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-RetrieveInfoResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-RetrieveInfoResponseType"
                                }
                            }
                        }
@@ -64,7 +64,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-PreservePOType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-PreservePOType"
                            }
                        }
                    }
@@ -75,7 +75,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-PreservePOResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-PreservePOResponseType"
                                }
                            }
                        }
@@ -91,7 +91,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-RetrievePOType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-RetrievePOType"
                            }
                        }
                    }
@@ -102,7 +102,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-RetrievePOResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-RetrievePOResponseType"
                                }
                            }
                        }
@@ -118,7 +118,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-DeletePOType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-DeletePOType"
                            }
                        }
                    }
@@ -129,7 +129,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-ResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-ResponseType"
                                }
                            }
                        }
@@ -145,7 +145,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-UpdatePOCType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-UpdatePOCType"
                            }
                        }
                    }
@@ -156,7 +156,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-UpdatePOCResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-UpdatePOCResponseType"
                                }
                            }
                        }
@@ -172,7 +172,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-RetrieveTraceType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-RetrieveTraceType"
                            }
                        }
                    }
@@ -183,7 +183,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-RetrieveTraceResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-RetrieveTraceResponseType"
                                }
                            }
                        }
@@ -199,7 +199,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-ValidateEvidenceType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-ValidateEvidenceType"
                            }
                        }
                    }
@@ -210,7 +210,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-ValidateEvidenceResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-ValidateEvidenceResponseType"
                                }
                            }
                        }
@@ -220,7 +220,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-ValidateEvidenceResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-ValidateEvidenceResponseType"
                                }
                            }
                        }
@@ -236,7 +236,7 @@
                    "content": {
                        "application/json": {
                            "schema": {
                                "$ref": "19512-Preservation-API-schema.json#/definitions/pres-SearchType"
                                "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-SearchType"
                            }
                        }
                    }
@@ -247,7 +247,7 @@
                        "content": {
                            "application/json": {
                                "schema": {
                                    "$ref": "19512-Preservation-API-schema.json#/definitions/pres-SearchResponseType"
                                    "$ref": "https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API-schema.json#/definitions/pres-SearchResponseType"
                                }
                            }
                        }
+1 −9
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@
                    }
                },
                "sor": {
                    "$ref": "#\/definitions\/pres-SubjectOfRetrievalType"
                    "type": "string"
                },
                "poFormat": {
                    "type": "string"
@@ -264,10 +264,6 @@
                }
            }
        },
        "pres-SubjectOfRetrievalType": {
            "type": "string",
            "enum": ["PO", "Evidence", "POwithEmbeddedEvidence", "POwithDetachedEvidence"]
          },         
        "pres-DeletePOType": {
            "type": "object",
            "properties": {
@@ -292,10 +288,6 @@
            },
            "required": ["poId"]
        },
        "pres-DeletionModeType": {
            "type": "string",
            "enum": ["OnlySubDOs", "SubDOsAndEvidence"]
          },         
        "pres-ResponseType": {
            "type": "object",
            "properties": {
+20 −19
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>

<!-- ================================================ -->
<!-- This document is part of ETSI TS 119 512 v.1.1.1 -->
<!-- ================================================ -->
<!-- =============================================== -->
<!-- This document is part of ETSI TS 119 512 v1.1.2 -->
<!-- =============================================== -->

<wsdl:definitions name="Preservation-API.wsdl"
				  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
				  xmlns:pres="http://uri.etsi.org/19512/v1.1.1#"
				  xmlns:pres="http://uri.etsi.org/19512/v1.1.2#"
				  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
				  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
				  targetNamespace="http://uri.etsi.org/19512/v1.1.1#">
				  targetNamespace="http://uri.etsi.org/19512/v1.1.2#">


	<!-- =================== -->
@@ -19,15 +19,16 @@

	<wsdl:types>
		<xsd:schema elementFormDefault="qualified"
					targetNamespace="http://uri.etsi.org/19512/v1.1.1#">
			<xsd:include schemaLocation="https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-Preservation-API.xsd" />
					targetNamespace="http://uri.etsi.org/19512/v1.1.2#">
			<xsd:include schemaLocation="https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.2/19512-Preservation-API.xsd" />
		</xsd:schema>
		<!-- Additional types for evidence exchange -->

		<!-- Additional types for evidence exchange 
		<xsd:schema elementFormDefault="qualified"
					targetNamespace="http://uri.etsi.org/19512/exchange/v1.1.1#">
			<xsd:include schemaLocation="https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.1/19512-EvidenceExchange.xsd" />
					targetNamespace="http://uri.etsi.org/19512/exchange/v1.1.2#">
			<xsd:include schemaLocation="https://forge.etsi.org/rep/esi/x19_512_preservation_protocol/raw/v1.1.2/19512-EvidenceExchange.xsd" />
		</xsd:schema>

		-->
	</wsdl:types>


@@ -164,7 +165,7 @@
		<soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

		<wsdl:operation name="RetrieveInfo">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#RetrieveInfo" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#RetrieveInfo" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -174,7 +175,7 @@
		</wsdl:operation>

		<wsdl:operation name="PreservePO">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#PreservePO" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#PreservePO" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -184,7 +185,7 @@
		</wsdl:operation>

		<wsdl:operation name="RetrievePO">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#RetrievePO" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#RetrievePO" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -194,7 +195,7 @@
		</wsdl:operation>

		<wsdl:operation name="DeletePO">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#DeletePO" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#DeletePO" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -204,7 +205,7 @@
		</wsdl:operation>

		<wsdl:operation name="UpdatePOC">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#UpdatePOC" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#UpdatePOC" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -214,7 +215,7 @@
		</wsdl:operation>

		<wsdl:operation name="RetrieveTrace">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#RetrieveTrace" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#RetrieveTrace" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -224,7 +225,7 @@
		</wsdl:operation>

		<wsdl:operation name="ValidateEvidence">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#ValidateEvidence" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#ValidateEvidence" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
@@ -234,7 +235,7 @@
		</wsdl:operation>

		<wsdl:operation name="Search">
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.1#Search" />
			<soap12:operation soapAction="http://uri.etsi.org/19512/v1.1.2#Search" />
			<wsdl:input>
				<soap12:body use="literal" />
			</wsdl:input>
+608 −604

File changed.

Preview size limit exceeded, changes collapsed.