Skip to content
Permalink
Browse files

diverse justeringer etter møte med difi

  • Loading branch information...
tor-kleiberg committed Apr 1, 2014
1 parent eb39b30 commit afcb762a8b986c70f8f62259187e1a5e8be4aa69
Showing with 95 additions and 36 deletions.
  1. +64 −13 xsd/sdp-kvittering.xsd
  2. +2 −0 xsd/sdp-manifest.xsd
  3. +29 −23 xsd/sdp-melding.xsd
@@ -18,34 +18,85 @@


<xsd:complexType name="Kvittering">

<xsd:sequence>
<xsd:element name="refMeldingsId" type="sdp:GUID" minOccurs="1" maxOccurs="1"/>
<!--
<xsd:element name="refMeldingsId" type="sdp:GUID" minOccurs="1" maxOccurs="1"/>
-->
<xsd:choice>
<xsd:element name="suksess" type="sdp:Suksess"></xsd:element>
<xsd:element name="feil" type="sdp:Feil"></xsd:element>
<xsd:element name="levertTilPostkasse" type="sdp:LevertTilPostkasse"/>
<xsd:element name="aapnetAvMottaker" type="sdp:AapnetAvMottaker"/>
<xsd:element name="avvistAvMottaker" type="sdp:AvvistAvMottaker"/>
<xsd:element name="mottakerVarselFeilet" type="sdp:MottakerVarselFeilet"/>
<xsd:element name="feil" type="sdp:Feil"/>
</xsd:choice>
</xsd:sequence>
</xsd:complexType>


<xsd:complexType name="Suksess">
<xsd:complexType name="LevertTilPostkasse">
<!-- TODO: her kan vi vurdere å inkludere tid_levert, e.l. -->
</xsd:complexType>


<xsd:complexType name="Feil">
<xsd:sequence>
<xsd:element name="feilinformasjon" minOccurs="0" maxOccurs="1">
<xsd:element name="feilinformasjon" type="sdp:Feilinformasjon" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>


<xsd:complexType name="AapnetAvMottaker">
<!-- TODO: her kan vi vurdere å inkludere tid_åpnet, e.l. -->
</xsd:complexType>


<xsd:complexType name="AvvistAvMottaker">
<!-- TODO: trenger vi denne? -->
</xsd:complexType>


<!--
<xsd:complexType name="MottakerVarselSendt">
<xsd:element name="type" type="sdp:Varseltype" minOccurs="1" maxOccurs="1"/>
<xsd:element name="tidspunkt" type="xsd:dateTime" minOccurs="1" maxOccurs="1"∕>
</xsd:complexType>
-->


<xsd:complexType name="MottakerVarselFeilet">
<xsd:sequence>
<xsd:element name="type" type="sdp:Varseltype" minOccurs="1" maxOccurs="1"/>
<xsd:element name="tidspunkt" type="xsd:dateTime" minOccurs="1" maxOccurs="1"/>
<xsd:element name="feilinformasjon" type="sdp:Feilinformasjon" minOccurs="1" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>


<xsd:simpleType name="Varseltype">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="SMS" />
<xsd:enumeration value="EPOST" />
</xsd:restriction>
</xsd:simpleType>


<xsd:complexType name="Feilinformasjon">
<xsd:sequence>
<xsd:element name="feiltype" minOccurs="1" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="1000" />
<xsd:maxLength value="100" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<!-- nedenfor kan være en mulighet dersom vi har en tight SLA på levering og postkasseleverandør er nede
<xsd:element name="kanResendes" type="xsd:boolean" minOccurs="0" maxOccurs="1" dewfault="false"/>
-->
<∕xsd:sequence>
<xsd:element name="detaljer" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="1000" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
</xsd:sequence>
</xsd:complexType>



</xsd:schema>
@@ -19,7 +19,9 @@

<xsd:complexType name="Manifest">
<xsd:sequence>
<!--
<xsd:element name="meldingsId" type="sdp:GUID" minOccurs="0" maxOccurs="1"/>
-->
<xsd:element name="mottaker" type="sdp:Mottaker" minOccurs="1" maxOccurs="1"/>
<xsd:element name="avsender" type="sdp:Avsender" minOccurs="1" maxOccurs="1"/>
<xsd:element name="hoveddokument" type="sdp:Dokument" minOccurs="1" maxOccurs="1"/>
@@ -19,31 +19,12 @@
<xsd:complexType name="Melding">

<xsd:sequence>
<xsd:element name="meldingsId" type="sdp:GUID" minOccurs="1" maxOccurs="1"/>
<!--
<xsd:element name="meldingsId" type="sdp:GUID" minOccurs="0" maxOccurs="1"/>
-->
<xsd:element name="avsender" type="sdp:Avsender" minOccurs="1" maxOccurs="1"/>
<xsd:choice>
<xsd:sequence>
<xsd:element name="digitalMottaker" type="sdp:Mottaker" minOccurs="1" maxOccurs="1" />
<xsd:element name="virkningsdato" type="xsd:date" minOccurs="0" maxOccurs="1"/>
<xsd:element name="aapningskvittering" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false"/>
<xsd:element name="sikkerhetsnivaa" minOccurs="0"
maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:integer">
<xsd:enumeration value="3" />
<xsd:enumeration value="4" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="ikkeSensitivHoveddokumenttittel" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="varsler" type="sdp:Varsler" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
<xsd:element name="digitalPostInfo" type="sdp:DigitalPostInfo" minOccurs="1" maxOccurs="1" />
<xsd:element name="fysiskPostInfo" type="sdp:FysiskPostInfo" minOccurs="1" maxOccurs="1" />
</xsd:choice>
<xsd:element name="dokumentPakke" type="sdp:DokumentPakke" minOccurs="1" maxOccurs="1" />
@@ -177,7 +158,32 @@
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>


<xsd:complexType name="DigitalPostInfo">
<xsd:sequence>
<xsd:element name="digitalMottaker" type="sdp:Mottaker" minOccurs="1" maxOccurs="1" />
<xsd:element name="virkningsdato" type="xsd:date" minOccurs="0" maxOccurs="1"/>
<xsd:element name="aapningskvittering" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false"/>
<xsd:element name="sikkerhetsnivaa" minOccurs="0"
maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:integer">
<xsd:enumeration value="3" />
<xsd:enumeration value="4" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="ikkeSensitivHoveddokumenttittel" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="varsler" type="sdp:Varsler" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
</xsd:complexType>


<!-- typer nedenfor er for fysisk post -->

0 comments on commit afcb762

Please sign in to comment.
You can’t perform that action at this time.