Merge pull request #59 from digipost/xsd-forslag

Fjerner konversasjonsId og legger inn SBDH correlation information
difi · May 22, 2014 · 728d6e9 · 728d6e9
2 parents 383f3a4 + d788d61
commit 728d6e9
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 69 deletions.
diff --git a/eksempler/sbdh.xml b/eksempler/sbdh.xml
@@ -10,11 +10,22 @@
 	<Receiver> <!-- orgnr mottaker, postboks eller print -->
 		<Identifier Authority="iso6523-actorid-upis">9908:996460320</Identifier>
 	</Receiver>
-	<DocumentIdentification> <!-- Unik identifikator i "Sender" sitt scope -->
+	<DocumentIdentification> 
 		<Standard>urn:no:difi.sdp:1.0</Standard>
 		<TypeVersion>1.0</TypeVersion>
-		<InstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</InstanceIdentifier> <!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
+		<!-- Unik identifikator i "Sender" sitt scope -->
+		<InstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</InstanceIdentifier>
 		<Type>Sikkerpost</Type>
 		<CreationDateAndTime>2013-02-19T05:10:10Z</CreationDateAndTime>
 	</DocumentIdentification>
+	<BusinessScope>
+	    <Scope>
+	        <Type>SCHEMA_GUIDE</Type>
+	        <InstanceIdentifier>SikkerDigitalPost/1.0</InstanceIdentifier>
+	        <CorrelationInformation>
+	        	<!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
+	            <RequestingDocumentInstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</RequestingDocumentInstanceIdentifier>
+	        </CorrelationInformation>
+	    </Scope>
+	</BusinessScope>
 </StandardBusinessDocumentHeader>
diff --git a/eksempler/sdpFeil.xml b/eksempler/sdpFeil.xml
@@ -4,8 +4,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-feil.xsd ">
 
-	<konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
-
 	<signatur>
       <SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>

diff --git a/eksempler/sdpKvittering-aapnetAvMottaker.xml b/eksempler/sdpKvittering-aapnetAvMottaker.xml
@@ -4,8 +4,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-kvittering.xsd ">
 
-  <konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
-
   <signatur>
       <SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>

diff --git a/eksempler/sdpKvittering-levertTilPostkasse.xml b/eksempler/sdpKvittering-levertTilPostkasse.xml
@@ -4,8 +4,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-kvittering.xsd ">
 
-	<konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
-
 	<signatur>
       <SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>

diff --git a/eksempler/sdpKvittering-mottakerVarselFeilet.xml b/eksempler/sdpKvittering-mottakerVarselFeilet.xml
@@ -4,8 +4,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-kvittering.xsd ">
 
-	<konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
-
     <signatur>
       <SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>

diff --git a/eksempler/sdpKvittering-tilbaketrekking.xml b/eksempler/sdpKvittering-tilbaketrekking.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kvittering xmlns="http://begrep.difi.no/sdp/schema_v10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-kvittering.xsd ">
 
-	<konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
-
+
 	<signatur>
 		<SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
 			<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />

diff --git a/eksempler/sdpMelding-digital.xml b/eksempler/sdpMelding-digital.xml
@@ -7,7 +7,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-melding.xsd ">
 
-	<konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
 
     <signatur>
       <SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -101,26 +100,9 @@
 		</varsler>
 	</digitalPostInfo>
 
-	<dokumentpakke>
-		<digest>
-			<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-			<ds:DigestValue></ds:DigestValue>
-		</digest>
-		<encryptedKey Encoding="" MimeType="" Recipient="" Type="">
-			<enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
-				<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-			</enc:EncryptionMethod>
-			<ds:KeyInfo Id="id0001">
-				<ds:KeyName>nøkkelnavn</ds:KeyName>
-				<X509Data>
-				    <X509SubjectName>...</X509SubjectName>
-				    <X509Certificate>...</X509Certificate>
-				</X509Data>
-			</ds:KeyInfo>
-			<enc:CipherData>
-				<enc:CipherValue>Zm9v</enc:CipherValue>
-			</enc:CipherData>
-		</encryptedKey>
-	</dokumentpakke>
+	<dokumentpakkefingeravtrykk>
+		<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+		<ds:DigestValue></ds:DigestValue>
+	</dokumentpakkefingeravtrykk>
 
 </digitalPost>
diff --git a/eksempler/sdpMelding-print.xml b/eksempler/sdpMelding-print.xml
@@ -7,8 +7,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-melding.xsd ">
 
-	<konversasjonsId>00c5ae20-da79-11e3-9c1a-0800200c9a66</konversasjonsId>
-
+
 	<signatur>
 	    <SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
 	      <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
@@ -97,26 +96,9 @@
 	  </returadresse>
 	</fysiskPostInfo>
 
-	<dokumentpakke>
-		<digest>
-			<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
-			<ds:DigestValue></ds:DigestValue>
-		</digest>
-		<encryptedKey Encoding="" MimeType="" Recipient="" Type="">
-			<enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
-				<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-			</enc:EncryptionMethod>
-			<ds:KeyInfo Id="id0001">
-				<ds:KeyName>nøkkelnavn</ds:KeyName>
-				<X509Data>
-				    <X509SubjectName>...</X509SubjectName>
-				    <X509Certificate>...</X509Certificate>
-				</X509Data>
-			</ds:KeyInfo>
-			<enc:CipherData>
-				<enc:CipherValue>Zm9v</enc:CipherValue>
-			</enc:CipherData>
-		</encryptedKey>
-	</dokumentpakke>
+	<dokumentpakkefingeravtrykk>
+		<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+		<ds:DigestValue></ds:DigestValue>
+	</dokumentpakkefingeravtrykk>
 
 </digitalPost>
diff --git a/xsd/StandardBusinessDocument.xml b/xsd/StandardBusinessDocument.xml
@@ -11,13 +11,22 @@
       <Identifier Authority="iso6523-actorid-upis">0088:4562458856624</Identifier>
     </Receiver>
     <DocumentIdentification>
-      <!-- Unik identifikator i "Sender" sitt scope -->
       <Standard>urn:no:kommune:leikanger:sdp:barnehage:1.0</Standard>
       <TypeVersion>1.0</TypeVersion>
+      <!-- Unik identifikator i "Sender" sitt scope -->
       <InstanceIdentifier>2014/001</InstanceIdentifier>
-      <!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
       <Type>Digitalpost</Type>
       <CreationDateAndTime>2013-02-19T05:10:10Z</CreationDateAndTime>
     </DocumentIdentification>
+      <BusinessScope>
+          <Scope>
+              <Type>SCHEMA_GUIDE</Type>
+              <InstanceIdentifier>SikkerDigitalPost/1.0</InstanceIdentifier>
+              <CorrelationInformation>
+                <!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
+                  <RequestingDocumentInstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</RequestingDocumentInstanceIdentifier>
+              </CorrelationInformation>
+          </Scope>
+      </BusinessScope>
   </StandardBusinessDocumentHeader>
 </StandardBusinessDocument>
diff --git a/xsd/sdp-felles.xsd b/xsd/sdp-felles.xsd
@@ -11,20 +11,10 @@
 
 	<xsd:complexType name="Melding" abstract="true">
 		<xsd:sequence>
-			<xsd:element name="konversasjonsId" type="KonversasjonsId" minOccurs="1" maxOccurs="1" />
 			<xsd:element name="signatur" type="ds:SignatureType" minOccurs="1" maxOccurs="1" />
 		</xsd:sequence>
 	</xsd:complexType>
 
-	<xsd:simpleType name="KonversasjonsId">
-		<xsd:annotation>
-			<xsd:documentation>ID for forsendelsen. Unik i kontekst av avsender. Maks 36 tegn.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:restriction base="xsd:string">
-			<xsd:maxLength value="36"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
 	<xsd:complexType name="Avsender">
 		<xsd:sequence>
 			<xsd:element name="organisasjon" type="Organisasjon" minOccurs="1" maxOccurs="1"/>