PBLEID-5482 - Oppdatering etter siste kvalitetssikring av WSDL og XSD'r

difi · Mar 3, 2014 · f0ddd72 · f0ddd72
1 parent bb42fda
commit f0ddd72
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 21 deletions.
diff --git a/EpostAdresse.textile b/EpostAdresse.textile
@@ -17,7 +17,7 @@ h4. Attributer
 |_. Term |_. Kardinalitet |
 | "epostadresse":/Felles/epostadresse.html | 0..1 |
 | "sistOppdatert":/Felles/sistOppdatert.html | 1..1 |
-| "sistVerifisert":/Felles/sistVerifisert.html | 1..1 |
+| "sistVerifisert":/Felles/sistVerifisert.html | 0..1 |
 
 h4. Xml eksempel
 

diff --git a/MobilTelefonNummer.textile b/MobilTelefonNummer.textile
@@ -17,7 +17,7 @@ h4. Attributer
 |_. Term |_. Kardinalitet |
 | "mobiltelefonnummer":/Felles/mobiltelefonnummer.html | 0..1 |
 | "sistOppdatert":/Felles/sistOppdatert.html | 1..1 |
-| "sistVerifisert":/Felles/sistVerifisert.html | 1..1 |
+| "sistVerifisert":/Felles/sistVerifisert.html | 0..1 |
 
 
 h4. Xml eksempel

diff --git a/xsd/oppslagstjeneste-metadata-14-05.xsd b/xsd/oppslagstjeneste-metadata-14-05.xsd
@@ -28,17 +28,11 @@
         <xs:sequence>
             <xs:element type="tns:personidentifikator" name="personidentifikator"/>
             <xs:element type="tns:reservasjon" name="reservasjon" minOccurs="0"/>
-            <xs:element type="tns:status" name="status" />
+            <xs:element type="tns:status" name="status" minOccurs="0"/>
             <xs:element type="tns:beskrivelse" name="beskrivelse" minOccurs="0" />
             <xs:element type="tns:Kontaktinformasjon" name="Kontaktinformasjon" minOccurs="0" />
             <xs:element type="tns:SikkerDigitalPostAdresse" name="SikkerDigitalPostAdresse" minOccurs="0" />
-            <xs:element type="tns:Sertifikat" name="Sertifikat" minOccurs="0" />
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="Sertifikat" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Sertifikat.html">
-        <xs:sequence>
-            <xs:element ref="ds:X509Data"/>
+            <xs:element name="X509Certificate" type="xs:string" minOccurs="0" maxOccurs="1" />
         </xs:sequence>
     </xs:complexType>
 
@@ -69,29 +63,29 @@
 
     <xs:complexType name="Kontaktinformasjon" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Kontaktinformasjon.html">
         <xs:sequence>
-            <xs:element type="tns:MobilTelefonNummer" name="MobilTelefonNummer" minOccurs="0" />
-            <xs:element type="tns:EpostAdresse" name="EpostAdresse" minOccurs="0" />
+            <xs:element type="tns:MobiltelefonNnummer" name="Mobiltelefonnummer" minOccurs="0" />
+            <xs:element type="tns:Epostadresse" name="Epostadresse" minOccurs="0" />
         </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="SikkerDigitalPostAdresse" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/SikkerDigitalPostAdresse.html">
         <xs:sequence>
-            <xs:element type="tns:postkasseAdresse" name="postkasseAdresse"  />
-            <xs:element type="tns:postkasseLeverandoerAdresse" name="postkasseLeverandoerAdresse" />
+            <xs:element type="tns:postkasseadresse" name="postkasseadresse"  />
+            <xs:element type="tns:postkasseleverandoerAdresse" name="postkasseleverandoerAdresse" />
         </xs:sequence>
     </xs:complexType>
 
-    <xs:simpleType name="postkasseAdresse"  sawsdl:modelReference="http://begrep.difi.no/Felles/postkasseAdresse.html">
+    <xs:simpleType name="postkasseadresse"  sawsdl:modelReference="http://begrep.difi.no/Felles/postkasseadresse.html">
         <xs:restriction base="xs:string" />
     </xs:simpleType>
 
-    <xs:simpleType name="postkasseLeverandoerAdresse"  sawsdl:modelReference="http://begrep.difi.no/Felles/postkasseLeverandoerAdresse.html">
+    <xs:simpleType name="postkasseleverandoerAdresse"  sawsdl:modelReference="http://begrep.difi.no/Felles/postkasseleverandoerAdresse.html">
         <xs:restriction base="xs:string" />
     </xs:simpleType>
 
-    <xs:complexType name="EpostAdresse" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/EpostAdresse.html">
+    <xs:complexType name="Epostadresse" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Epostadresse.html">
         <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="sistVerifisert" use="optional" sawsdl:modelReference="http://begrep.difi.no/Felles/sistVerifisert.html"/>
             </xs:extension>
@@ -105,15 +99,14 @@
         </xs:restriction>
     </xs:simpleType>
 
-    <xs:simpleType name="epostAdresse" sawsdl:modelReference="http://begrep.difi.no/Felles/epostadresse.html">
+    <xs:simpleType name="epostadresse" sawsdl:modelReference="http://begrep.difi.no/Felles/epostadresse.html">
         <xs:restriction base="xs:string">
             <xs:minLength value="3"/>
             <xs:maxLength value="50"/>
-            <!-- TODO: USE PATTERN RESTRICTION HERE ?? -->
         </xs:restriction>
     </xs:simpleType>
 
-    <xs:complexType name="MobilTelefonNummer" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/MobilTelefonNummer.html">
+    <xs:complexType name="Mobiltelefonnummer" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/Mobiltelefonnummer.html">
         <xs:simpleContent>
             <xs:extension base="tns:mobiltelefonnummer">
                 <xs:attribute type="xs:dateTime" name="sistOppdatert" use="required" sawsdl:modelReference="http://begrep.difi.no/Felles/sistOppdatert.html"/>

diff --git a/xsd/oppslagstjeneste-ws-14-05.wsdl b/xsd/oppslagstjeneste-ws-14-05.wsdl
@@ -4,6 +4,7 @@
 	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:tns="http://kontaktinfo.difi.no/wsdl/oppslagstjeneste-14-05"
 	    xmlns:ot14-05="http://kontaktinfo.difi.no/xsd/oppslagstjeneste/14-05"
+
         name="kontaktinfo-oppslagstjeneste-14-05" targetNamespace="http://kontaktinfo.difi.no/wsdl/oppslagstjeneste-14-05">
 
 	<wsdl:types>
@@ -26,6 +27,13 @@
         <wsdl:part name="HentPersonerRespons" element="ot14-05:HentPersonerRespons" />
     </wsdl:message>
 
+    <wsdl:message name="HentPrintSertifikatForespoersel">
+        <wsdl:part name="HentPrintSertifikatForespoersel" element="ot14-05:HentPrintSertifikatForespoersel" />
+    </wsdl:message>
+    <wsdl:message name="HentPrintSertifikatRespons">
+        <wsdl:part name="HentPrintSertifikatRespons" element="ot14-05:HentPrintSertifikatRespons" />
+    </wsdl:message>
+
 	<wsdl:portType name="oppslagstjeneste-14-05">
 		<wsdl:operation name="HentEndringer">
 			<wsdl:input message="tns:HentEndringerForespoersel" />
@@ -36,6 +44,11 @@
             <wsdl:input message="tns:HentPersonerForespoersel" />
             <wsdl:output message="tns:HentPersonerRespons" />
         </wsdl:operation>
+
+        <wsdl:operation name="HentPrintSertifikat">
+            <wsdl:input message="tns:HentPrintSertifikatForespoersel" />
+            <wsdl:output message="tns:HentPrintSertifikatRespons" />
+        </wsdl:operation>
 	</wsdl:portType>
 
 	<wsdl:binding name="oppslagstjeneste-14-05_SOAP11Binding" type="tns:oppslagstjeneste-14-05">
@@ -61,6 +74,16 @@
             </wsdl:output>
         </wsdl:operation>
 
+        <wsdl:operation name="HentPrintSertifikat">
+            <soap:operation soapAction="" />
+            <wsdl:input>
+                <soap:body use="literal" />
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" />
+            </wsdl:output>
+        </wsdl:operation>
+
 	</wsdl:binding>
 
 	<wsdl:service name="oppslagstjeneste-14-05">

diff --git a/xsd/oppslagstjeneste-ws-14-05.xsd b/xsd/oppslagstjeneste-ws-14-05.xsd
@@ -4,6 +4,7 @@
            xmlns:sawsdl="http://www.w3.org/ns/sawsdl"
            xmlns:tns="http://kontaktinfo.difi.no/xsd/oppslagstjeneste/14-05"
            targetNamespace="http://kontaktinfo.difi.no/xsd/oppslagstjeneste/14-05"
+           xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
            elementFormDefault="qualified"
            version="3.0">
 
@@ -74,4 +75,20 @@
         </xs:restriction>
     </xs:simpleType>
 
+
+    <xs:element name="HentPrintSertifikatForespoersel" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/HentPrintSertifikatForespoersel.html">
+        <xs:complexType/>
+
+    </xs:element>
+
+    <xs:element name="HentPrintSertifikatRespons" sawsdl:modelReference="http://begrep.difi.no/Oppslagstjenesten/HentPrintSertifikatRespons.html">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="postkasseleverandorAdresse" type="xs:string" minOccurs="1" maxOccurs="1" />
+                <xs:element name="X509Certificate" type="xs:string" minOccurs="1" maxOccurs="1" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+
 </xs:schema>