forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 10172 - in xml/forrest/branches/copyless: . src/core/fresh-site/src/documentation src/documentation
Date Thu, 22 Apr 2004 11:13:29 GMT
Author: nicolaken
Date: Thu Apr 22 04:13:28 2004
New Revision: 10172

Modified:
   xml/forrest/branches/copyless/build.xml
   xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml
   xml/forrest/branches/copyless/src/documentation/skinconf.xml
Log:
Remove DTD from skinconf and make it validate as simple XML.

Modified: xml/forrest/branches/copyless/build.xml
==============================================================================
--- xml/forrest/branches/copyless/build.xml	(original)
+++ xml/forrest/branches/copyless/build.xml	Thu Apr 22 04:13:28 2004
@@ -212,6 +212,7 @@
     <!-- skinconf.xml -->
     <echo message="validating **/skinconf.xml ..."/>
     <xmlvalidate failonerror="true" lenient="no" warn="yes">
+      <attribute name="http://apache.org/xml/features/validation/dynamic"  value="true"/>
       <xmlcatalog >
         <dtd publicId="-//APACHE//DTD Skin Configuration V0.6//EN"
         location="src/core/context/resources/schema/dtd/skinconfig-v06.dtd"/>

Modified: xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml	(original)
+++ xml/forrest/branches/copyless/src/core/fresh-site/src/documentation/skinconf.xml	Thu Apr
22 04:13:28 2004
@@ -19,11 +19,6 @@
 Skin configuration file. This file contains details of your project, which will
 be used to configure the chosen Forrest skin.
 -->
-
- <!DOCTYPE skinconfig PUBLIC
-        "-//APACHE//DTD Skin Configuration V0.6//EN"
-        "skinconfig-v06.dtd">
-
 <skinconfig>
   <!-- Do we want to disable the Lucene search box? -->
   <disable-lucene>true</disable-lucene>

Modified: xml/forrest/branches/copyless/src/documentation/skinconf.xml
==============================================================================
--- xml/forrest/branches/copyless/src/documentation/skinconf.xml	(original)
+++ xml/forrest/branches/copyless/src/documentation/skinconf.xml	Thu Apr 22 04:13:28 2004
@@ -20,59 +20,6 @@
 be used to configure the chosen Forrest skin.
 -->
 
-<!DOCTYPE skinconfig [
-
-  <!ENTITY % links.att 'name CDATA #REQUIRED'>
-  <!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
-  <!ELEMENT skinconfig (disable-lucene?, disable-search?, disable-print-link?, disable-pdf-link?,
-  disable-xml-link?, disable-compliance-links?, obfuscate-mail-links?, searchsite-domain?,
searchsite-name?,
-  project-name, project-description?, project-url, project-logo, group-name?, group-description?,
group-url?, group-logo?,
-  host-url?, host-logo?, favicon-url?, year?, vendor?, trail?, toc?, credits?)*>
-  <!ELEMENT credits (credit*)>
-  <!ELEMENT credit (name, url, image?, width?, height?)>
-  <!-- id uniquely identifies the tool, and role indicates its function -->
-  <!ATTLIST credit id   CDATA #IMPLIED
-                   role CDATA #IMPLIED>
-  <!ELEMENT disable-lucene (#PCDATA)>
-  <!ELEMENT disable-search (#PCDATA)>
-  <!ELEMENT disable-print-link (#PCDATA)>
-  <!ELEMENT disable-pdf-link (#PCDATA)>
-  <!ELEMENT disable-xml-link (#PCDATA)>    
-  <!ELEMENT disable-compliance-links (#PCDATA)>   
-  <!ELEMENT obfuscate-mail-links (#PCDATA)>   
-  <!ELEMENT searchsite-domain (#PCDATA)>
-  <!ELEMENT searchsite-name (#PCDATA)>  
-  <!ELEMENT project-name (#PCDATA)>
-  <!ELEMENT project-description (#PCDATA)>
-  <!ELEMENT project-url (#PCDATA)>
-  <!ELEMENT project-logo (#PCDATA)>
-  <!ELEMENT group-name (#PCDATA)>
-  <!ELEMENT group-description (#PCDATA)>
-  <!ELEMENT group-url (#PCDATA)>
-  <!ELEMENT group-logo (#PCDATA)>
-  <!ELEMENT host-url (#PCDATA)>
-  <!ELEMENT host-logo (#PCDATA)>
-  <!ELEMENT favicon-url (#PCDATA)>
-  <!ELEMENT year (#PCDATA)>
-  <!ELEMENT vendor (#PCDATA)>
-  <!ELEMENT trail (link1, link2, link3)>
-  <!ELEMENT link1 EMPTY>
-  <!-- Seems we can't use param entity refs until this is DTDified -->
-  <!ATTLIST link1 name CDATA #REQUIRED href CDATA #IMPLIED>
-  <!ELEMENT link2 EMPTY>
-  <!ATTLIST link2 name CDATA #REQUIRED href CDATA #IMPLIED>
-  <!ELEMENT link3 EMPTY>
-  <!ATTLIST link3 name CDATA #REQUIRED href CDATA #IMPLIED>
-  <!ELEMENT name (#PCDATA)>
-  <!ELEMENT url (#PCDATA)>
-  <!ELEMENT image (#PCDATA)>
-  <!ELEMENT width (#PCDATA)>
-  <!ELEMENT height (#PCDATA)>
-  <!ELEMENT toc EMPTY>
-  <!ATTLIST toc max-depth CDATA #IMPLIED min-sections CDATA #IMPLIED
-            location CDATA #IMPLIED>
-  ]>
-
 <skinconfig>
   <!-- Do we want to disable the Lucene search box? -->
   <disable-lucene>true</disable-lucene>

Mime
View raw message