aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgregor <gregor@d688527b-c9ab-4aba-bd8d-4036d912da1d>2003-11-17 14:04:39 +0000
committergregor <gregor@d688527b-c9ab-4aba-bd8d-4036d912da1d>2003-11-17 14:04:39 +0000
commit72819e05aa9db32ef828d9b35d8980a77d1bd76e (patch)
treea6671f04a47ab223f55474dceb7cd6353cf66d93
parentd025a0c88ad6aa213bb14fc100aac23888bd2880 (diff)
downloadmoa-id-spss-72819e05aa9db32ef828d9b35d8980a77d1bd76e.tar.gz
moa-id-spss-72819e05aa9db32ef828d9b35d8980a77d1bd76e.tar.bz2
moa-id-spss-72819e05aa9db32ef828d9b35d8980a77d1bd76e.zip
Bug 46 behoben.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@58 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--common/res/resources/schemas/MOA-SPSS-1.2.xsd12
-rw-r--r--spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd12
-rw-r--r--spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd12
3 files changed, 21 insertions, 15 deletions
diff --git a/common/res/resources/schemas/MOA-SPSS-1.2.xsd b/common/res/resources/schemas/MOA-SPSS-1.2.xsd
index b1b89bc30..6937d5dd7 100644
--- a/common/res/resources/schemas/MOA-SPSS-1.2.xsd
+++ b/common/res/resources/schemas/MOA-SPSS-1.2.xsd
@@ -258,18 +258,20 @@
<xsd:restriction base="CheckResultType">
<xsd:sequence>
<xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
+ <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
</xsd:sequence>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
<xsd:complexContent mixed="true">
- <xsd:extension base="ReferencesCheckResultInfoType">
+ <xsd:restriction base="AnyChildrenType">
<xsd:sequence>
+ <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
</xsd:sequence>
- </xsd:extension>
+ </xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<!--########## Error Response ###-->
@@ -298,8 +300,8 @@
<xsd:restriction base="xsd:token"/>
</xsd:simpleType>
<xsd:complexType name="AnyChildrenType" mixed="true">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:any namespace="##any" processContents="lax"/>
+ <xsd:sequence>
+ <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="XMLContentType" mixed="true">
diff --git a/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd b/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd
index b1b89bc30..6937d5dd7 100644
--- a/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd
+++ b/spss.server/doc/moa_spss/MOA-SPSS-1.2.xsd
@@ -258,18 +258,20 @@
<xsd:restriction base="CheckResultType">
<xsd:sequence>
<xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
+ <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
</xsd:sequence>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
<xsd:complexContent mixed="true">
- <xsd:extension base="ReferencesCheckResultInfoType">
+ <xsd:restriction base="AnyChildrenType">
<xsd:sequence>
+ <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
</xsd:sequence>
- </xsd:extension>
+ </xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<!--########## Error Response ###-->
@@ -298,8 +300,8 @@
<xsd:restriction base="xsd:token"/>
</xsd:simpleType>
<xsd:complexType name="AnyChildrenType" mixed="true">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:any namespace="##any" processContents="lax"/>
+ <xsd:sequence>
+ <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="XMLContentType" mixed="true">
diff --git a/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd b/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd
index b1b89bc30..6937d5dd7 100644
--- a/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd
+++ b/spss.server/res/resources/wsdl/MOA-SPSS-1.2.xsd
@@ -258,18 +258,20 @@
<xsd:restriction base="CheckResultType">
<xsd:sequence>
<xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
+ <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
</xsd:sequence>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
<xsd:complexContent mixed="true">
- <xsd:extension base="ReferencesCheckResultInfoType">
+ <xsd:restriction base="AnyChildrenType">
<xsd:sequence>
+ <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
</xsd:sequence>
- </xsd:extension>
+ </xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<!--########## Error Response ###-->
@@ -298,8 +300,8 @@
<xsd:restriction base="xsd:token"/>
</xsd:simpleType>
<xsd:complexType name="AnyChildrenType" mixed="true">
- <xsd:sequence minOccurs="0" maxOccurs="unbounded">
- <xsd:any namespace="##any" processContents="lax"/>
+ <xsd:sequence>
+ <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="XMLContentType" mixed="true">