Merge branch 'master' of https://github.com/difi/begrep-SikkerDigital…

…Post
difi · Jun 25, 2014 · 6a8e07f · 6a8e07f
2 parents e08fcb7 + b3f8bf0
commit 6a8e07f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 77 deletions.
diff --git a/eksempler/sdpKvittering-tilbaketrekking.xml b/eksempler/sdpKvittering-tilbaketrekking.xml
diff --git a/xsd/sdp-felles.xsd b/xsd/sdp-felles.xsd
@@ -9,7 +9,7 @@
 
 	<xsd:complexType name="Melding" abstract="true">
 		<xsd:sequence>
-			<xsd:element name="Signature" type="ds:SignatureType" minOccurs="1" maxOccurs="1" />
+			<xsd:element ref="ds:Signature" minOccurs="1" maxOccurs="1" />
 		</xsd:sequence>
 	</xsd:complexType>
 

diff --git a/xsd/sdp-kvittering.xsd b/xsd/sdp-kvittering.xsd
@@ -17,7 +17,6 @@
 						<xsd:element name="levering" type="Levering"/>
 						<xsd:element name="aapning" type="Aapning"/>
 						<xsd:element name="varslingfeilet" type="Varslingfeilet"/>
-						<xsd:element name="tilbaketrekking" type="Tilbaketrekkingsresultat" />
 					</xsd:choice>
 				</xsd:sequence>
 			</xsd:extension>
@@ -58,25 +57,6 @@
 		</xsd:restriction>
 	</xsd:simpleType>
 
-	<xsd:complexType name="Tilbaketrekkingsresultat">
-		<xsd:annotation>
-			<xsd:documentation>
-				Kvitteringen gir informasjon om DigitalPost som ble forespurt tilbaketrukket
-				ble satt i karantene eller ikke.
-			</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="status" type="Tilbaketrekkingsstatus" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="beskrivelse" type="Beskrivelse" minOccurs="0" maxOccurs="1"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:simpleType name="Tilbaketrekkingsstatus">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="OK" />
-			<xsd:enumeration value="FEILET" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
 	<xsd:simpleType name="Beskrivelse">
 		<xsd:restriction base="xsd:string">
 			<xsd:maxLength value="1000"/>