From 8fd668db9dc86bbe3fe7c2e5433dffdac91106ef Mon Sep 17 00:00:00 2001
From: knut <>
Date: Thu, 23 Feb 2006 16:58:25 +0000
Subject: Corrected DTD files (they where mixed) ;)

---
 framework/Specs/application.dtd | 46 ++++++++++++++---------------------------
 framework/Specs/config.dtd      | 46 +++++++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'framework')

diff --git a/framework/Specs/application.dtd b/framework/Specs/application.dtd
index e140f468..b85a0595 100644
--- a/framework/Specs/application.dtd
+++ b/framework/Specs/application.dtd
@@ -1,46 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This is the XML Schema Definition for the config.xml file(s) used in Prado/3 framework. -->
+<!-- This is the XML Schema Definition for the application.xml file used in Prado/3 framework. -->
 <!-- @package prado.config -->
 <!-- @author Robert Kummer <r.kummer@ipunkt.biz> -->
 <!-- @since Prado/3.0b rev688 -->
 <!-- @version 1.0/2006-02-21 -->
-<!ELEMENT allow EMPTY>
-<!ATTLIST allow
-	pages CDATA #IMPLIED
-	users CDATA #IMPLIED
-	roles CDATA #IMPLIED
-	verb (get | post) #REQUIRED
->
-<!ELEMENT deny EMPTY>
-<!ATTLIST deny
-	pages CDATA #IMPLIED
-	users CDATA #IMPLIED
-	roles CDATA #IMPLIED
-	verb (post | get) #REQUIRED
+<!ELEMENT application (paths, modules, services, parameters)>
+<!ATTLIST application
+	id CDATA #REQUIRED
+	Mode (Off | Debug | Normal | Performance) #REQUIRED
 >
-<!ELEMENT configuration (paths?, modules?, authorization?, pages?, parameters?)>
 <!ELEMENT paths (alias? | using?)+>
 <!ELEMENT modules (module+)>
-<!ELEMENT authorization (allow, deny)>
-<!ELEMENT pages (page+)>
-<!ATTLIST pages
-	MasterClass CDATA #IMPLIED
-	Theme CDATA #IMPLIED
->
+<!ELEMENT services (service+)>
 <!ELEMENT parameters (parameter+)>
 <!ELEMENT module (#PCDATA)>
 <!ATTLIST module
-	id (ModuleID) #REQUIRED
-	class (ModuleClass) #REQUIRED
->
-<!ELEMENT page EMPTY>
-<!ATTLIST page
-	id (PageID) #REQUIRED
+	id CDATA #REQUIRED
+	class CDATA #REQUIRED
 >
 <!ELEMENT parameter (#PCDATA)>
 <!ATTLIST parameter
-	id (ParameterID) #REQUIRED
-	class (ParameterClass) #IMPLIED
+	id CDATA #REQUIRED
+	class CDATA #IMPLIED
 	value CDATA #IMPLIED
 >
 <!ELEMENT alias EMPTY>
@@ -50,5 +31,10 @@
 >
 <!ELEMENT using EMPTY>
 <!ATTLIST using
-	namespace (Namespace) #REQUIRED
+	namespace CDATA #REQUIRED
+>
+<!ELEMENT service (#PCDATA)>
+<!ATTLIST service
+	id CDATA #REQUIRED
+	class CDATA #REQUIRED
 >
diff --git a/framework/Specs/config.dtd b/framework/Specs/config.dtd
index b85a0595..e140f468 100644
--- a/framework/Specs/config.dtd
+++ b/framework/Specs/config.dtd
@@ -1,27 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This is the XML Schema Definition for the application.xml file used in Prado/3 framework. -->
+<!-- This is the XML Schema Definition for the config.xml file(s) used in Prado/3 framework. -->
 <!-- @package prado.config -->
 <!-- @author Robert Kummer <r.kummer@ipunkt.biz> -->
 <!-- @since Prado/3.0b rev688 -->
 <!-- @version 1.0/2006-02-21 -->
-<!ELEMENT application (paths, modules, services, parameters)>
-<!ATTLIST application
-	id CDATA #REQUIRED
-	Mode (Off | Debug | Normal | Performance) #REQUIRED
+<!ELEMENT allow EMPTY>
+<!ATTLIST allow
+	pages CDATA #IMPLIED
+	users CDATA #IMPLIED
+	roles CDATA #IMPLIED
+	verb (get | post) #REQUIRED
+>
+<!ELEMENT deny EMPTY>
+<!ATTLIST deny
+	pages CDATA #IMPLIED
+	users CDATA #IMPLIED
+	roles CDATA #IMPLIED
+	verb (post | get) #REQUIRED
 >
+<!ELEMENT configuration (paths?, modules?, authorization?, pages?, parameters?)>
 <!ELEMENT paths (alias? | using?)+>
 <!ELEMENT modules (module+)>
-<!ELEMENT services (service+)>
+<!ELEMENT authorization (allow, deny)>
+<!ELEMENT pages (page+)>
+<!ATTLIST pages
+	MasterClass CDATA #IMPLIED
+	Theme CDATA #IMPLIED
+>
 <!ELEMENT parameters (parameter+)>
 <!ELEMENT module (#PCDATA)>
 <!ATTLIST module
-	id CDATA #REQUIRED
-	class CDATA #REQUIRED
+	id (ModuleID) #REQUIRED
+	class (ModuleClass) #REQUIRED
+>
+<!ELEMENT page EMPTY>
+<!ATTLIST page
+	id (PageID) #REQUIRED
 >
 <!ELEMENT parameter (#PCDATA)>
 <!ATTLIST parameter
-	id CDATA #REQUIRED
-	class CDATA #IMPLIED
+	id (ParameterID) #REQUIRED
+	class (ParameterClass) #IMPLIED
 	value CDATA #IMPLIED
 >
 <!ELEMENT alias EMPTY>
@@ -31,10 +50,5 @@
 >
 <!ELEMENT using EMPTY>
 <!ATTLIST using
-	namespace CDATA #REQUIRED
->
-<!ELEMENT service (#PCDATA)>
-<!ATTLIST service
-	id CDATA #REQUIRED
-	class CDATA #REQUIRED
+	namespace (Namespace) #REQUIRED
 >
-- 
cgit v1.2.3