summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknut <>2006-02-23 14:02:09 +0000
committerknut <>2006-02-23 14:02:09 +0000
commit78bddd0357fe5fc8fd0ab085ac7757ca996dcc48 (patch)
tree5e5664d5732920a8eddf49dba62970c33202fb98
parent4416943e5d682c212b7a15b2f71d9b6c5d3f3e1f (diff)
Corrected some problems related to validation of application.xml
-rw-r--r--demos/personal/protected/application.xml2
-rw-r--r--framework/Specs/PageConfiguration.xsd14
2 files changed, 8 insertions, 8 deletions
diff --git a/demos/personal/protected/application.xml b/demos/personal/protected/application.xml
index 0e6bd313..e8189eb0 100644
--- a/demos/personal/protected/application.xml
+++ b/demos/personal/protected/application.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<application mode="Debug">
+<application id="personal" mode="Debug">
<!-- modules configured and loaded for all services -->
<modules>
<!-- Remove this comment mark to enable caching
diff --git a/framework/Specs/PageConfiguration.xsd b/framework/Specs/PageConfiguration.xsd
index c1d9a1ef..4aec216f 100644
--- a/framework/Specs/PageConfiguration.xsd
+++ b/framework/Specs/PageConfiguration.xsd
@@ -22,14 +22,14 @@
<xs:documentation>configuration content for the whole application in prado3 framework</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:sequence>
- <xs:element name="paths" type="pathsType"/>
- <xs:element name="modules" type="modulesType"/>
- <xs:element name="services" type="servicesType"/>
- <xs:element name="parameters" type="parametersType"/>
- </xs:sequence>
+ <xs:all>
+ <xs:element name="paths" type="pathsType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="modules" type="modulesType" minOccurs="0" maxOccurs="1"/>
+ <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:attribute name="mode" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="Off"/>