diff options
| author | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2010-07-13 09:38:55 +0000 |
|---|---|---|
| committer | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2010-07-13 09:38:55 +0000 |
| commit | 4aa19048995f9ddca2f8943287a681992a55b79a (patch) | |
| tree | 32d3c58ff50764055d3b2fa7b068f48f11d91f79 /common/src | |
| parent | 3e3f35ebc780085b2c6a4064adf708fee1b5d5d7 (diff) | |
| download | moa-id-spss-4aa19048995f9ddca2f8943287a681992a55b79a.tar.gz moa-id-spss-4aa19048995f9ddca2f8943287a681992a55b79a.tar.bz2 moa-id-spss-4aa19048995f9ddca2f8943287a681992a55b79a.zip | |
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1169 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'common/src')
| -rw-r--r-- | common/src/main/resources/resources/schemas/MOA-SPSS-1.4.7.xsd | 18 | ||||
| -rw-r--r-- | common/src/main/resources/resources/schemas/MOA-SPSS-config-1.4.7.xsd | 6 |
2 files changed, 3 insertions, 21 deletions
diff --git a/common/src/main/resources/resources/schemas/MOA-SPSS-1.4.7.xsd b/common/src/main/resources/resources/schemas/MOA-SPSS-1.4.7.xsd index e3b06b416..653bec578 100644 --- a/common/src/main/resources/resources/schemas/MOA-SPSS-1.4.7.xsd +++ b/common/src/main/resources/resources/schemas/MOA-SPSS-1.4.7.xsd @@ -107,14 +107,6 @@ </xsd:element>
<xsd:element name="SignatureCheck" type="CheckResultType"/>
<xsd:element name="CertificateCheck" type="CheckResultType"/>
- <xsd:element name="TSLCheck" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
</xsd:sequence>
</xsd:complexType>
<!--########## Verify XML Signature ###-->
@@ -169,15 +161,7 @@ <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
<xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
<xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="CertificateCheck" type="CheckResultType"/>
- <xsd:element name="TSLCheck" minOccurs="0">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
- <xsd:element name="Info" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
+ <xsd:element name="CertificateCheck" type="CheckResultType"/>
</xsd:sequence>
</xsd:complexType>
<xsd:simpleType name="ProfileIdentifierType">
diff --git a/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.4.7.xsd b/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.4.7.xsd index a61eed289..4808f3cb7 100644 --- a/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.4.7.xsd +++ b/common/src/main/resources/resources/schemas/MOA-SPSS-config-1.4.7.xsd @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 4 U (http://www.xmlspy.com) by Klaus Stranacher (ORiON) -->
<!--
- MOA SP/SS 1.4.5 Configuration Schema
+ MOA SP/SS 1.4.7 Configuration Schema
-->
<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:config="http://reference.e-government.gv.at/namespace/moaconfig/20021122#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
@@ -140,7 +139,6 @@ <xs:element name="Id" type="xs:token"/>
<xs:element name="TrustAnchorsLocation" type="xs:anyURI"/>
<xs:element name="SignerCertsLocation" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="TSLLocation" type="xs:anyURI" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -154,7 +152,7 @@ <xs:element name="MaxRevocationAge" type="xs:integer"/>
<xs:element name="ServiceOrder" minOccurs="0">
<xs:complexType>
- <xs:sequence maxOccurs="2">
+ <xs:sequence minOccurs="1" maxOccurs="2">
<xs:element name="Service">
<xs:simpleType>
<xs:restriction base="xs:token">
|