diff options
| author | knut <> | 2006-02-23 20:29:42 +0000 |
|---|---|---|
| committer | knut <> | 2006-02-23 20:29:42 +0000 |
| commit | b9da527d60a89b8a68eb9bf1af6b7b633b0dbde4 (patch) | |
| tree | 10376d10ca8f5531d1ea98de4a13de2304068f84 | |
| parent | d313727e7a9be7f5cf13de2202a954f9536a5bdc (diff) | |
Future correction of XSD files according to configuration documentation
| -rw-r--r-- | framework/Specs/application.xsd | 13 | ||||
| -rw-r--r-- | framework/Specs/config.xsd | 30 |
2 files changed, 12 insertions, 31 deletions
diff --git a/framework/Specs/application.xsd b/framework/Specs/application.xsd index 920eecc7..68861606 100644 --- a/framework/Specs/application.xsd +++ b/framework/Specs/application.xsd @@ -19,7 +19,7 @@ </xs:complexType>
<xs:element name="application">
<xs:annotation>
- <xs:documentation>configuration content for the whole application in prado3 framework</xs:documentation>
+ <xs:documentation>Application configuration for PRADO 3</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:all>
@@ -28,17 +28,6 @@ <xs:element name="services" type="servicesType" minOccurs="0" maxOccurs="1"/>
<xs:element name="parameters" type="parametersType" minOccurs="0" maxOccurs="1"/>
</xs:all>
- <xs:attribute name="id" type="xs:string" use="required"/>
- <xs:attribute name="Mode" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Off"/>
- <xs:enumeration value="Debug"/>
- <xs:enumeration value="Normal"/>
- <xs:enumeration value="Performance"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:anyAttribute namespace="##local" processContents="lax"/>
</xs:complexType>
</xs:element>
diff --git a/framework/Specs/config.xsd b/framework/Specs/config.xsd index c66dfed5..c60433b5 100644 --- a/framework/Specs/config.xsd +++ b/framework/Specs/config.xsd @@ -39,7 +39,7 @@ </xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="verb" use="required">
+ <xs:attribute name="verb" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="get"/>
@@ -49,10 +49,10 @@ </xs:attribute>
</xs:complexType>
<xs:complexType name="authorizationType">
- <xs:sequence>
- <xs:element name="allow" type="allowType"/>
- <xs:element name="deny" type="denyType"/>
- </xs:sequence>
+ <xs:all>
+ <xs:element name="allow" type="allowType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="deny" type="denyType" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
</xs:complexType>
<xs:element name="configuration">
<xs:annotation>
@@ -90,7 +90,7 @@ </xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="verb" use="required">
+ <xs:attribute name="verb" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="post"/>
@@ -102,16 +102,12 @@ <xs:complexType name="moduleType">
<xs:attribute name="id" use="required">
<xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="ModuleID"/>
- </xs:restriction>
+ <xs:restriction base="xs:string"/>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="class" use="required">
<xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="ModuleClass"/>
- </xs:restriction>
+ <xs:restriction base="xs:string"/>
</xs:simpleType>
</xs:attribute>
<xs:anyAttribute namespace="##local" processContents="lax"/>
@@ -134,16 +130,14 @@ <xs:complexType name="pageType">
<xs:attribute name="id" use="required">
<xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="PageID"/>
- </xs:restriction>
+ <xs:restriction base="xs:string"/>
</xs:simpleType>
</xs:attribute>
<xs:anyAttribute namespace="##local" processContents="lax"/>
</xs:complexType>
<xs:complexType name="pagesType">
<xs:sequence>
- <xs:element name="page" type="pageType" maxOccurs="unbounded"/>
+ <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="MasterClass" type="xs:string" use="optional"/>
<xs:attribute name="Theme" type="xs:string" use="optional"/>
@@ -191,9 +185,7 @@ <xs:complexType name="usingType">
<xs:attribute name="namespace" use="required">
<xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Namespace"/>
- </xs:restriction>
+ <xs:restriction base="xs:string"/>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
|