Schema und WSDL auf Version 1.3 gesetzt (Folge der Lösung für Bug 232).

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@407 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 22 insertions, 6 deletions

diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.2.wsdl b/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl
index b3f252562..cc7aec4dc 100644
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.2.wsdl
+++ b/spss.handbook/handbook/spec/MOA-SPSS-1.3.wsdl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

-  Web Service Description for MOA SP/SS 1.2

+  Web Service Description for MOA SP/SS 1.3

 -->

 <definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-  <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>

+  <import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.3.xsd"/>

   <message name="CreateXMLSignatureInput">

     <part name="body" element="moa:CreateXMLSignatureRequest"/>

   </message>

diff --git a/spss.handbook/handbook/spec/MOA-SPSS-1.2.xsd b/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd
index 8bd5f4af8..80842b36c 100644
--- a/spss.handbook/handbook/spec/MOA-SPSS-1.2.xsd
+++ b/spss.handbook/handbook/spec/MOA-SPSS-1.3.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-  MOA SP/SS 1.2 Schema

+  MOA SP/SS 1.3 Schema

 -->

-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">

+<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">

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

   <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

   <!--########## Create XML Signature ###-->

@@ -155,8 +155,8 @@
           <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>

         </xsd:annotation>

       </xsd:element>

-      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>

-      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>

+      <xsd:element name="HashInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>

+      <xsd:element name="ReferenceInputData" type="InputDataType" minOccurs="0" maxOccurs="unbounded"/>

       <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>

       <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>

       <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>

@@ -166,6 +166,22 @@
   <xsd:simpleType name="ProfileIdentifierType">

     <xsd:restriction base="xsd:token"/>

   </xsd:simpleType>

+  <xsd:complexType name="InputDataType">

+    <xsd:complexContent>

+      <xsd:extension base="ContentExLocRefBaseType">

+        <xsd:attribute name="PartOf" use="optional" default="SignedInfo">

+          <xsd:simpleType>

+            <xsd:restriction base="xsd:token">

+              <xsd:enumeration value="SignedInfo"/>

+              <xsd:enumeration value="XMLDSIGManifest"/>

+              <xsd:enumeration value="SignatureManifest"/>

+            </xsd:restriction>

+          </xsd:simpleType>

+        </xsd:attribute>

+        <xsd:attribute name="ReferringSigReference" type="xsd:nonNegativeInteger" use="optional"/>

+      </xsd:extension>

+    </xsd:complexContent>

+  </xsd:complexType>

   <xsd:complexType name="MetaInfoType">

     <xsd:sequence>

       <xsd:element name="MimeType" type="MimeTypeType"/>