Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into xsd-forslag
Browse files Browse the repository at this point in the history
  • Loading branch information
eoftedal committed Oct 15, 2014
2 parents 2a7d261 + 5afc6a0 commit e729d36
Showing 1 changed file with 35 additions and 30 deletions.
65 changes: 35 additions & 30 deletions xsd/oppslag/oppslagstjeneste-metadata-14-05.xsd
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,16 +3,8 @@
<xs:schema attributeFormDefault="unqualified" <xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified" elementFormDefault="qualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:sawsdl="http://www.w3.org/ns/sawsdl"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:tns="http://begrep.difi.no" xmlns:tns="http://begrep.difi.no"
xsi:schemaLocation="http://www.w3.org/2000/09/xmldsig# ../w3/xmldsig-core-schema.xsd" targetNamespace="http://begrep.difi.no">
targetNamespace="http://begrep.difi.no"
>

<xs:import namespace="http://www.w3.org/2000/09/xmldsig#"
schemaLocation="../w3/xmldsig-core-schema.xsd"/>


<xs:annotation> <xs:annotation>
<xs:appinfo>Metadata for Oppslagstjenesten</xs:appinfo> <xs:appinfo>Metadata for Oppslagstjenesten</xs:appinfo>
Expand All @@ -21,96 +13,109 @@
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>



<xs:element name="Person" type="tns:Person"/> <xs:element name="Person" type="tns:Person"/>


<xs:complexType name="Person" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Person.html"> <xs:complexType name="Person">
<xs:sequence> <xs:sequence>
<xs:element type="tns:personidentifikator" name="personidentifikator"/> <xs:element type="tns:personidentifikator" name="personidentifikator"/>
<xs:element type="tns:reservasjon" name="reservasjon" minOccurs="0"/> <xs:element type="tns:reservasjon" name="reservasjon" minOccurs="0"/>
<xs:element type="tns:status" name="status" minOccurs="0"/> <xs:element type="tns:status" name="status" minOccurs="0"/>
<xs:element type="tns:beskrivelse" name="beskrivelse" minOccurs="0" /> <xs:element type="tns:beskrivelse" name="beskrivelse" minOccurs="0" />
<xs:element type="tns:Kontaktinformasjon" name="Kontaktinformasjon" minOccurs="0" /> <xs:element type="tns:Kontaktinformasjon" name="Kontaktinformasjon" minOccurs="0" />
<xs:element type="tns:SikkerDigitalPostAdresse" name="SikkerDigitalPostAdresse" minOccurs="0" /> <xs:element type="tns:SikkerDigitalPostAdresse" name="SikkerDigitalPostAdresse" minOccurs="0" />
<xs:element name="X509Certificate" type="xs:string" minOccurs="0" maxOccurs="1" /> <xs:element name="X509Sertifikat" type="tns:X509Sertifikat" minOccurs="0" maxOccurs="1" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>


<xs:simpleType name="personidentifikator" sawsdl:modelReference="http://begrep.difi.no/Felles/personidentifikator.html"> <xs:simpleType name="X509Sertifikat">
<xs:restriction base="xs:base64Binary" />
</xs:simpleType>

<xs:simpleType name="personidentifikator">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:length value="11"/> <xs:length value="11"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>


<xs:simpleType name="status" sawsdl:modelReference="http://begrep.difi.no/Felles/status.html"> <xs:simpleType name="status">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value="AKTIV"/> <xs:enumeration value="AKTIV"/>
<xs:enumeration value="SLETTET"/> <xs:enumeration value="SLETTET"/>
<xs:enumeration value="IKKE_REGISTRERT"/> <xs:enumeration value="IKKE_REGISTRERT"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>

<xs:simpleType name="postkasseleverandoerOrgNummer">
<xs:restriction base="xs:string" />
</xs:simpleType>


<xs:simpleType name="beskrivelse" sawsdl:modelReference="http://begrep.difi.local/Felles/beskrivelse.html"> <xs:simpleType name="beskrivelse">
<xs:restriction base="xs:string" /> <xs:restriction base="xs:string" />
</xs:simpleType> </xs:simpleType>


<xs:simpleType name="reservasjon" sawsdl:modelReference="http://begrep.difi.no/Felles/reservasjon.html"> <xs:simpleType name="reservasjon">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value="JA" /> <xs:enumeration value="JA" />
<xs:enumeration value="NEI" /> <xs:enumeration value="NEI" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>


<xs:complexType name="Kontaktinformasjon" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Kontaktinformasjon.html"> <xs:complexType name="Kontaktinformasjon">
<xs:sequence> <xs:sequence>
<xs:element type="tns:Mobiltelefonnummer" name="Mobiltelefonnummer" minOccurs="0" /> <xs:element type="tns:Mobiltelefonnummer" name="Mobiltelefonnummer" minOccurs="0" />
<xs:element type="tns:Epostadresse" name="Epostadresse" minOccurs="0" /> <xs:element type="tns:Epostadresse" name="Epostadresse" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>


<xs:complexType name="SikkerDigitalPostAdresse" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/SikkerDigitalPostAdresse.html"> <xs:complexType name="SikkerDigitalPostAdresse">
<xs:sequence> <xs:sequence>
<xs:element type="tns:postkasseadresse" name="postkasseadresse" /> <xs:element type="tns:postkasseadresse" name="postkasseadresse" />
<xs:element type="tns:postkasseleverandoerAdresse" name="postkasseleverandoerAdresse" /> <xs:element type="tns:postkasseleverandoerAdresse" name="postkasseleverandoerAdresse" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>


<xs:simpleType name="postkasseadresse" sawsdl:modelReference="http://begrep.difi.no/Felles/postkasseadresse.html"> <xs:simpleType name="postkasseadresse">
<xs:restriction base="xs:string" /> <xs:restriction base="xs:string">
<xs:minLength value="8"/>
<xs:maxLength value="100"/>
</xs:restriction>
</xs:simpleType> </xs:simpleType>


<xs:simpleType name="postkasseleverandoerAdresse" sawsdl:modelReference="http://begrep.difi.no/Felles/postkasseleverandoerAdresse.html"> <xs:simpleType name="postkasseleverandoerAdresse">
<xs:restriction base="xs:string" /> <xs:restriction base="xs:string">
<xs:minLength value="8"/>
<xs:maxLength value="20"/>
</xs:restriction>
</xs:simpleType> </xs:simpleType>


<xs:complexType name="Epostadresse" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Epostadresse.html"> <xs:complexType name="Epostadresse">
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="tns:epostadresse"> <xs:extension base="tns:epostadresse">
<xs:attribute type="xs:dateTime" name="sistOppdatert" use="required" sawsdl:modelReference="http://begrep.difi.no/Felles/sistOppdatert.html"/> <xs:attribute type="xs:dateTime" name="sistOppdatert" use="optional" />
<xs:attribute type="xs:dateTime" name="sistVerifisert" use="optional" sawsdl:modelReference="http://begrep.difi.no/Felles/sistVerifisert.html"/> <xs:attribute type="xs:dateTime" name="sistVerifisert" use="optional" />
</xs:extension> </xs:extension>
</xs:simpleContent> </xs:simpleContent>
</xs:complexType> </xs:complexType>


<xs:simpleType name="mobiltelefonnummer" sawsdl:modelReference="http://begrep.difi.no/Felles/mobiltelefonnummer.html"> <xs:simpleType name="mobiltelefonnummer">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:minLength value="8"/> <xs:minLength value="8"/>
<xs:maxLength value="20"/> <xs:maxLength value="20"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>


<xs:simpleType name="epostadresse" sawsdl:modelReference="http://begrep.difi.no/Felles/epostadresse.html"> <xs:simpleType name="epostadresse">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:minLength value="3"/> <xs:minLength value="3"/>
<xs:maxLength value="50"/> <xs:maxLength value="50"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>


<xs:complexType name="Mobiltelefonnummer" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Mobiltelefonnummer.html"> <xs:complexType name="Mobiltelefonnummer">
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="tns:mobiltelefonnummer"> <xs:extension base="tns:mobiltelefonnummer">
<xs:attribute type="xs:dateTime" name="sistOppdatert" use="required" sawsdl:modelReference="http://begrep.difi.no/Felles/sistOppdatert.html"/> <xs:attribute type="xs:dateTime" name="sistOppdatert" use="optional" />
<xs:attribute type="xs:dateTime" name="sistVerifisert" use="optional" sawsdl:modelReference="http://begrep.difi.no/Felles/sistVerifisert.html"/> <xs:attribute type="xs:dateTime" name="sistVerifisert" use="optional" />
</xs:extension> </xs:extension>
</xs:simpleContent> </xs:simpleContent>
</xs:complexType> </xs:complexType>
Expand Down

0 comments on commit e729d36

Please sign in to comment.