Skip to content
Permalink
Browse files

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

  • Loading branch information...
Arne Berner
Arne Berner committed Jun 10, 2014
2 parents 7491cf5 + ca9946d commit bd190b74bc54625661ce2facc22f322f8c1fcf6f
Showing with 1 addition and 27 deletions.
  1. +0 −1 xsd/sdp-feil.xsd
  2. +0 −1 xsd/sdp-kvittering.xsd
  3. +0 −3 xsd/sdp-manifest.xsd
  4. +0 −21 xsd/sdp-melding.xsd
  5. +1 −1 xsd/sdp.xsd
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>

<xsd:schema version="1.0" targetNamespace="http://begrep.difi.no/sdp/schema_v10" elementFormDefault="qualified"
xmlns="http://begrep.difi.no/sdp/schema_v10"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://begrep.difi.no/sdp/schema_v10"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
targetNamespace="http://begrep.difi.no/sdp/schema_v10"
elementFormDefault="qualified" version="1.0">

@@ -6,10 +6,8 @@

<xsd:include schemaLocation="sdp-felles.xsd"/>


<xsd:element name="manifest" type="Manifest"/>


<xsd:complexType name="Manifest">
<xsd:annotation>
<xsd:documentation>
@@ -24,7 +22,6 @@
</xsd:sequence>
</xsd:complexType>


<xsd:complexType name="Dokument">
<xsd:sequence>
<xsd:element name="tittel" minOccurs="0" maxOccurs="1" type="Tittel">
@@ -2,19 +2,14 @@
<xsd:schema
xmlns="http://begrep.difi.no/sdp/schema_v10"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
targetNamespace="http://begrep.difi.no/sdp/schema_v10" elementFormDefault="qualified" version="1.0">

<xsd:include schemaLocation="sdp-felles.xsd"/>
<xsd:import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="w3/xenc-schema.xsd"/>
<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="w3/xmldsig-core-schema.xsd"/>


<xsd:element name="digitalPost" type="DigitalPost" />
<xsd:element name="tilbaketrekking" type="Tilbaketrekking" />



<xsd:complexType name="DigitalPost" >
<xsd:annotation>
@@ -50,21 +45,6 @@
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="Tilbaketrekking">
<xsd:annotation>
<xsd:documentation>
Meldingen sendes dersom det oppdages alvorlig feil i en DigitalPost. Dette kan f.eks. være
dersom DigitalPost er sendt til feil Mottaker. Ved feilforsendelser tilbyr postkasseleverandørene
mulighet for, på bakgrunn av konversasjonsId, at dokumenter kan trekkes tilbake av avsender. Hvis
tilbaketrekking skjer innen virkningsdato er inntruffet, vil dokumentet bli fjernet fra
mottakerens postkasse.
</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="Melding" />
</xsd:complexContent>
</xsd:complexType>

<xsd:complexType name="Repetisjoner">
<xsd:sequence>
<xsd:element name="dagerEtter" minOccurs="1" maxOccurs="10">
@@ -168,7 +148,6 @@
</xsd:restriction>
</xsd:simpleType>


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

<xsd:complexType name="FysiskPostInfo">
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema version="1.0" targetNamespace="http://begrep.difi.no/sdp/schema_v10" xmlns="http://begrep.difi.no/sdp/schema_v10" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:enc="http://www.w3.org/2001/04/xmlenc#" xmlns:sawsdl="http://www.w3.org/ns/sawsdl" elementFormDefault="qualified">
xmlns:sawsdl="http://www.w3.org/ns/sawsdl" elementFormDefault="qualified">

<xsd:import namespace="http://www.w3.org/2001/04/xmlenc#" schemaLocation="w3/xenc-schema.xsd" />

0 comments on commit bd190b7

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