Skip to content
Permalink
Browse files

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

  • Loading branch information...
Arne Berner
Arne Berner committed May 7, 2014
2 parents bb08878 + 9d705b5 commit 90cbedeb19b9fcf838866481123f646dc1deb081
Showing with 73 additions and 33 deletions.
  1. +4 −4 eksempler/sdpManifest.xml
  2. +5 −3 eksempler/sdpMelding-digital.xml
  3. +3 −1 eksempler/sdpMelding-print.xml
  4. +1 −7 xsd/sdp-manifest.xsd
  5. +57 −16 xsd/sdp-melding.xsd
  6. +3 −2 xsd/sdp.xsd
@@ -28,19 +28,19 @@
<avsender>
<organisasjon authority="iso6523-actorid-upis">9908:123456789</organisasjon>
<avsenderidentifikator>A</avsenderidentifikator>
<fakturakonto>ABC barnehage</fakturakonto>
<fakturaReferanse>ABC barnehage</fakturaReferanse>
</avsender>

<hoveddokument href="vedtak_2398324.pdf" mime="application/pdf">
<tittel>Vedtak</tittel>
<tittel lang="no">Vedtak</tittel>
</hoveddokument>

<vedlegg href="info.html" mime="text/html">
<tittel>informasjon</tittel>
<tittel lang="no">informasjon</tittel>
</vedlegg>

<vedlegg href="journal.txt" mime="text/plain">
<tittel>journal</tittel>
<tittel lang="no">journal</tittel>
</vedlegg>

</manifest>
@@ -7,20 +7,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-melding.xsd ">

<sdpMeldingId>31415926535987</sdpMeldingId>

<behandlingsansvarlig>
<organisasjon>9908:123456789</organisasjon>
<avsenderidentifikator>123456789-A</avsenderidentifikator>
<fakturakonto>ØK1</fakturakonto>
<fakturaReferanse>ØK1</fakturaReferanse>
</behandlingsansvarlig>

<digitalPostInfo>
<virkningsdato>2014-05-17</virkningsdato>
<aapningskvittering>false</aapningskvittering>
<sikkerhetsnivaa>3</sikkerhetsnivaa>
<tittel>Hurra for 17. mai</tittel>
<tittel lang="no">Hurra for 17. mai</tittel>
<varsler>
<epostVarsel>
<tekst>Viktig melding fra Staten i din digital postkasse</tekst>
<tekst lang="no">Viktig melding fra Staten i din digital postkasse</tekst>
<repetisjoner>
<dagerEtter>0</dagerEtter>
<dagerEtter>7</dagerEtter>
@@ -6,10 +6,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-melding.xsd ">

<sdpMeldingId>31415926535987</sdpMeldingId>

<behandlingsansvarlig>
<organisasjon>9908:123123123</organisasjon>
<avsenderidentifikator>123456789-A</avsenderidentifikator>
<fakturakonto>ØK1</fakturakonto>
<fakturaReferanse>ØK1</fakturaReferanse>
</behandlingsansvarlig>

<fysiskPostInfo>
@@ -27,18 +27,12 @@

<xsd:complexType name="Dokument">
<xsd:sequence>
<xsd:element name="tittel" minOccurs="0" maxOccurs="1">
<xsd:element name="tittel" minOccurs="0" maxOccurs="1" type="Tittel">
<xsd:annotation>
<xsd:documentation>
Emnet på dokumentet som skal vises til bruker når innlogget riktig sikkerhetsnivå.
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100" />
<xsd:minLength value="1" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="href" use="required">
@@ -18,6 +18,16 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="sdpMeldingId" minOccurs="1" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Unik meldings-ID for behandlingsansvarlig.</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="40"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="behandlingsansvarlig" type="Avsender" minOccurs="1" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
@@ -111,19 +121,13 @@
<xsd:sequence>
<xsd:element name="virkningsdato" type="xsd:date" minOccurs="0" maxOccurs="1"/>
<xsd:element name="aapningskvittering" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
<xsd:element name="sikkerhetsnivaa" type="Sikkerhetsnivaa" default="4" minOccurs="0" maxOccurs="1"/>
<xsd:element name="tittel" minOccurs="0" maxOccurs="1">
<xsd:element name="sikkerhetsnivaa" type="Sikkerhetsnivaa" minOccurs="1" maxOccurs="1"/>
<xsd:element name="tittel" minOccurs="0" maxOccurs="1" type="Tittel">
<xsd:annotation>
<xsd:documentation>
Ikke-sensitiv tittel på dokumentpakken
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100"/>
<xsd:minLength value="1"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="varsler" type="Varsler" minOccurs="0" maxOccurs="1"/>
</xsd:sequence>
@@ -148,14 +152,7 @@
</xsd:complexType>
<xsd:complexType name="EpostVarsel">
<xsd:sequence>
<xsd:element name="tekst" minOccurs="0" maxOccurs="1">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="500"/>
<xsd:minLength value="1"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element name="tekst" minOccurs="0" maxOccurs="1" type="EpostVarselTekst"/>
<xsd:element name="repetisjoner" type="Repetisjoner" minOccurs="1" maxOccurs="1">
<xsd:unique name="UnikeEpostVarselRepetisjoner">
<xsd:selector xpath="dagerEtter"/>
@@ -182,7 +179,51 @@
</xsd:element>
</xsd:sequence>
</xsd:complexType>


<xsd:complexType name="Tittel">
<xsd:simpleContent>
<xsd:extension base="TittelString">
<xsd:attribute name="lang" type="Spraakkode" use="required"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="TittelString">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1"/>
<xsd:maxLength value="100"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="EpostVarselTekst">
<xsd:simpleContent>
<xsd:extension base="EpostVarselTekstString">
<xsd:attribute name="lang" type="Spraakkode" use="required"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="EpostVarselTekstString">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1"/>
<xsd:maxLength value="500"/>
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="Spraakkode">
<xsd:annotation>
<xsd:documentation>
Språkkode ihht ISO-639
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:minLength value="2"></xsd:minLength>
<xsd:maxLength value="5"></xsd:maxLength>
</xsd:restriction>
</xsd:simpleType>


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

<xsd:complexType name="FysiskPostInfo">
<xsd:sequence>
<xsd:element name="mottaker" type="Navn" minOccurs="1" maxOccurs="1"/>
@@ -5,8 +5,9 @@
<xsd:import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="w3/xenc-schema.xsd" />
<xsd:import namespace="http://begrep.difi.no" schemaLocation="oppslag/oppslagstjeneste-metadata-14-05.xsd" />

<xsd:include schemaLocation="sdp-melding.xsd"/>
<xsd:include schemaLocation="sdp-manifest.xsd"/>
<xsd:include schemaLocation="sdp-feil.xsd"/>
<xsd:include schemaLocation="sdp-kvittering.xsd"/>
<xsd:include schemaLocation="sdp-manifest.xsd"/>
<xsd:include schemaLocation="sdp-melding.xsd"/>

</xsd:schema>

0 comments on commit 90cbede

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