aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/res/resources/schemas/MOA-SPSS-config-1.3.xsd73
-rw-r--r--spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd73
-rw-r--r--spss.handbook/handbook/config/config.html2
3 files changed, 95 insertions, 53 deletions
diff --git a/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd b/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd
index 590804e1d..279311514 100644
--- a/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd
+++ b/common/res/resources/schemas/MOA-SPSS-config-1.3.xsd
@@ -144,12 +144,26 @@
<xs:sequence>
<xs:element name="EnableChecking" type="xs:boolean" default="true"/>
<xs:element name="MaxRevocationAge" type="xs:integer" default="0"/>
+ <xs:element name="ServiceOrder" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence minOccurs="2" maxOccurs="2">
+ <xs:element name="Service">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="OCSP"/>
+ <xs:enumeration value="CRL"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="Archiving">
<xs:complexType>
<xs:sequence>
<xs:element name="EnableArchiving" type="xs:boolean" default="true"/>
- <xs:element name="ArchiveDuration" type="xs:nonNegativeInteger" default="365"/>
- <xs:element name="Archive">
+ <xs:element name="ArchiveDuration" type="xs:nonNegativeInteger" default="365" minOccurs="0"/>
+ <xs:element name="Archive" minOccurs="0">
<xs:complexType>
<xs:choice>
<xs:element name="DatabaseArchive">
@@ -166,13 +180,41 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="DistributionPoints" minOccurs="0">
+ <xs:element name="DistributionPoint" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:element name="CAIssuerDN" type="xs:token"/>
<xs:choice maxOccurs="unbounded">
- <xs:element name="CRLDP" type="config:DistributionPointType"/>
- <xs:element name="OCSPDP" type="config:DistributionPointType"/>
+ <xs:element name="CRLDP">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Location" type="xs:anyURI"/>
+ <xs:element name="ReasonCode" minOccurs="0" maxOccurs="unbounded">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="all"/>
+ <xs:enumeration value="unused"/>
+ <xs:enumeration value="keyCompromise"/>
+ <xs:enumeration value="cACompromise"/>
+ <xs:enumeration value="affiliationChanged"/>
+ <xs:enumeration value="superseded"/>
+ <xs:enumeration value="cessationOfOperation"/>
+ <xs:enumeration value="certificateHold"/>
+ <xs:enumeration value="privilegeWithdrawn"/>
+ <xs:enumeration value="aACompromise"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="OCSPDP">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Location" type="xs:anyURI"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:choice>
</xs:sequence>
</xs:complexType>
@@ -197,27 +239,6 @@
<xs:enumeration value="pkix"/>
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="DistributionPointType">
- <xs:sequence>
- <xs:element name="Location" type="xs:anyURI"/>
- <xs:element name="ReasonCode" minOccurs="0" maxOccurs="unbounded">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="all"/>
- <xs:enumeration value="unused"/>
- <xs:enumeration value="keyCompromise"/>
- <xs:enumeration value="cACompromise"/>
- <xs:enumeration value="affiliationChanged"/>
- <xs:enumeration value="superseded"/>
- <xs:enumeration value="cessationOfOperation"/>
- <xs:enumeration value="certificateHold"/>
- <xs:enumeration value="privilegeWithdrawn"/>
- <xs:enumeration value="aACompromise"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="ProfileType">
<xs:sequence>
<xs:element name="Id" type="xs:token"/>
diff --git a/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd b/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd
index 590804e1d..279311514 100644
--- a/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd
+++ b/spss.handbook/handbook/config/MOA-SPSS-config-1.3.xsd
@@ -144,12 +144,26 @@
<xs:sequence>
<xs:element name="EnableChecking" type="xs:boolean" default="true"/>
<xs:element name="MaxRevocationAge" type="xs:integer" default="0"/>
+ <xs:element name="ServiceOrder" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence minOccurs="2" maxOccurs="2">
+ <xs:element name="Service">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="OCSP"/>
+ <xs:enumeration value="CRL"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="Archiving">
<xs:complexType>
<xs:sequence>
<xs:element name="EnableArchiving" type="xs:boolean" default="true"/>
- <xs:element name="ArchiveDuration" type="xs:nonNegativeInteger" default="365"/>
- <xs:element name="Archive">
+ <xs:element name="ArchiveDuration" type="xs:nonNegativeInteger" default="365" minOccurs="0"/>
+ <xs:element name="Archive" minOccurs="0">
<xs:complexType>
<xs:choice>
<xs:element name="DatabaseArchive">
@@ -166,13 +180,41 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="DistributionPoints" minOccurs="0">
+ <xs:element name="DistributionPoint" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:element name="CAIssuerDN" type="xs:token"/>
<xs:choice maxOccurs="unbounded">
- <xs:element name="CRLDP" type="config:DistributionPointType"/>
- <xs:element name="OCSPDP" type="config:DistributionPointType"/>
+ <xs:element name="CRLDP">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Location" type="xs:anyURI"/>
+ <xs:element name="ReasonCode" minOccurs="0" maxOccurs="unbounded">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="all"/>
+ <xs:enumeration value="unused"/>
+ <xs:enumeration value="keyCompromise"/>
+ <xs:enumeration value="cACompromise"/>
+ <xs:enumeration value="affiliationChanged"/>
+ <xs:enumeration value="superseded"/>
+ <xs:enumeration value="cessationOfOperation"/>
+ <xs:enumeration value="certificateHold"/>
+ <xs:enumeration value="privilegeWithdrawn"/>
+ <xs:enumeration value="aACompromise"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="OCSPDP">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Location" type="xs:anyURI"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:choice>
</xs:sequence>
</xs:complexType>
@@ -197,27 +239,6 @@
<xs:enumeration value="pkix"/>
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="DistributionPointType">
- <xs:sequence>
- <xs:element name="Location" type="xs:anyURI"/>
- <xs:element name="ReasonCode" minOccurs="0" maxOccurs="unbounded">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="all"/>
- <xs:enumeration value="unused"/>
- <xs:enumeration value="keyCompromise"/>
- <xs:enumeration value="cACompromise"/>
- <xs:enumeration value="affiliationChanged"/>
- <xs:enumeration value="superseded"/>
- <xs:enumeration value="cessationOfOperation"/>
- <xs:enumeration value="certificateHold"/>
- <xs:enumeration value="privilegeWithdrawn"/>
- <xs:enumeration value="aACompromise"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
<xs:complexType name="ProfileType">
<xs:sequence>
<xs:element name="Id" type="xs:token"/>
diff --git a/spss.handbook/handbook/config/config.html b/spss.handbook/handbook/config/config.html
index ed8e622c1..ab036d966 100644
--- a/spss.handbook/handbook/config/config.html
+++ b/spss.handbook/handbook/config/config.html
@@ -304,7 +304,7 @@
<code>DataBaseArchiveParameter.JDBCUrl</code> (siehe unten) angegeben wird. </p>
<p>Zul&auml;ssige Werte f&uuml;r diesen Parameter sind <code>true</code> oder <code>false</code>.</p>
- <p>Der Default-Wert lautet <code>true</code>. </p></td>
+ <p>Der Default-Wert lautet <code>false</code>. </p></td>
</tr>
</table>
<table class="fixedWidth" border="1" cellpadding="2">