You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2007/04/07 15:43:10 UTC

svn commit: r526433 - in /forrest/trunk/main/webapp/resources/schema: catalog.forrest.xcat catalog.xcat dtd/index.html entity/index.html entity/skinconf-common-plugins-07-1.xml open-office/catalog.xcat

Author: crossley
Date: Sat Apr  7 06:43:09 2007
New Revision: 526433

URL: http://svn.apache.org/viewvc?view=rev&rev=526433
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat
    forrest/trunk/main/webapp/resources/schema/catalog.xcat
    forrest/trunk/main/webapp/resources/schema/dtd/index.html
    forrest/trunk/main/webapp/resources/schema/entity/index.html
    forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
    forrest/trunk/main/webapp/resources/schema/open-office/catalog.xcat

Modified: forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat?view=diff&rev=526433&r1=526432&r2=526433
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat (original)
+++ forrest/trunk/main/webapp/resources/schema/catalog.forrest.xcat Sat Apr  7 06:43:09 2007
@@ -17,155 +17,147 @@
 -->
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
 "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
 <!-- OASIS XML Catalog for Forrest Documents -->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
          prefer="public">
-
 <!-- Document Type Definitions (current) -->
-<public publicId="-//APACHE//DTD Documentation V2.0//EN"
+  <public publicId="-//APACHE//DTD Documentation V2.0//EN"
         uri="dtd/document-v20.dtd"/>
-<public publicId="-//APACHE//DTD FAQ V2.0//EN"
+  <public publicId="-//APACHE//DTD FAQ V2.0//EN"
         uri="dtd/faq-v20.dtd"/>
-<public publicId="-//APACHE//DTD Changes V2.0//EN"
+  <public publicId="-//APACHE//DTD Changes V2.0//EN"
         uri="dtd/changes-v20.dtd"/>
-<public publicId="-//APACHE//DTD Todo V2.0//EN"
+  <public publicId="-//APACHE//DTD Todo V2.0//EN"
         uri="dtd/todo-v20.dtd"/>
-<public publicId="-//APACHE//DTD How-to V2.0//EN"
+  <public publicId="-//APACHE//DTD How-to V2.0//EN"
         uri="dtd/howto-v20.dtd"/>
-<public publicId="-//APACHE//DTD Documentation V1.3//EN"
+  <public publicId="-//APACHE//DTD Documentation V1.3//EN"
         uri="dtd/document-v13.dtd"/>
-<public publicId="-//APACHE//DTD FAQ V1.3//EN"
+  <public publicId="-//APACHE//DTD FAQ V1.3//EN"
         uri="dtd/faq-v13.dtd"/>
-<public publicId="-//APACHE//DTD Changes V1.3//EN"
+  <public publicId="-//APACHE//DTD Changes V1.3//EN"
         uri="dtd/changes-v13.dtd"/>
-<public publicId="-//APACHE//DTD Todo V1.3//EN"
+  <public publicId="-//APACHE//DTD Todo V1.3//EN"
         uri="dtd/todo-v13.dtd"/>
-<public publicId="-//APACHE//DTD How-to V1.3//EN"
+  <public publicId="-//APACHE//DTD How-to V1.3//EN"
         uri="dtd/howto-v13.dtd"/>
-<public publicId="-//APACHE//DTD Status V1.3//EN"
+  <public publicId="-//APACHE//DTD Status V1.3//EN"
         uri="dtd/status-v13.dtd"/>
-<public publicId="-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
+  <public publicId="-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
         uri="dtd/book-cocoon-v10.dtd"/>
-<public publicId="-//APACHE//DTD Cocoon Documentation Tab V1.0//EN"
+  <public publicId="-//APACHE//DTD Cocoon Documentation Tab V1.0//EN"
         uri="dtd/tab-cocoon-v10.dtd"/>
-<public publicId="-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
+  <public publicId="-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
         uri="dtd/tab-cocoon-v11.dtd"/>
-
 <!-- Sets of symbols. e.g. for string replacements -->
-<public publicId="-//Apache Forrest//ENTITIES Symbols Core v1.0//EN"
+  <public publicId="-//Apache Forrest//ENTITIES Symbols Core v1.0//EN"
         uri="entity/symbols-core-v10.ent"/>
 
 -- Various other resources --
 <public publicId="-//Apache Forrest//ENTITIES Skin Configuration common plugins V0.7-1//EN"
         uri="entity/skinconf-common-plugins-07-1.xml"/>
-
 <!-- New unfinished DTDs -->
-<public publicId="-//APACHE//DTD Skin Configuration V0.8-1//EN"
+  <public publicId="-//APACHE//DTD Skin Configuration V0.8-1//EN"
         uri="dtd/skinconfig-v08-1.dtd"/>
-<public publicId="-//APACHE//DTD Skin Configuration V0.7-1//EN"
+  <public publicId="-//APACHE//DTD Skin Configuration V0.7-1//EN"
         uri="dtd/skinconfig-v07-1.dtd"/>
-<public publicId="-//APACHE//DTD Skin Configuration V0.6-3//EN"
+  <public publicId="-//APACHE//DTD Skin Configuration V0.6-3//EN"
         uri="dtd/skinconfig-v06-3.dtd"/>
-
 <!-- Reusable modules -->
-<public publicId="-//APACHE//ENTITIES Documentation V2.0//EN"
+  <public publicId="-//APACHE//ENTITIES Documentation V2.0//EN"
         uri="dtd/document-v20.mod"/>
-<public publicId="-//APACHE//ENTITIES Changes V2.0//EN"
+  <public publicId="-//APACHE//ENTITIES Changes V2.0//EN"
         uri="dtd/changes-v20.mod"/>
-<public publicId="-//APACHE//ENTITIES FAQ V2.0//EN"
+  <public publicId="-//APACHE//ENTITIES FAQ V2.0//EN"
         uri="dtd/faq-v20.mod"/>
-<public publicId="-//APACHE//ENTITIES Todo V2.0//EN"
+  <public publicId="-//APACHE//ENTITIES Todo V2.0//EN"
         uri="dtd/todo-v20.mod"/>
-<public publicId="-//APACHE//ENTITIES Status V1.3//EN"
+  <public publicId="-//APACHE//ENTITIES Status V1.3//EN"
         uri="dtd/status-v13.mod"/>
-<public publicId="-//APACHE//ENTITIES Documentation V1.3//EN"
+  <public publicId="-//APACHE//ENTITIES Documentation V1.3//EN"
         uri="dtd/document-v13.mod"/>
-<public publicId="-//APACHE//ENTITIES Documentation V1.2//EN"
+  <public publicId="-//APACHE//ENTITIES Documentation V1.2//EN"
         uri="dtd/document-v12.mod"/>
-<public publicId="-//APACHE//ENTITIES Documentation V1.1//EN"
+  <public publicId="-//APACHE//ENTITIES Documentation V1.1//EN"
         uri="dtd/document-v11.mod"/>
-<public publicId="-//APACHE//ENTITIES FAQ V1.1//EN"
+  <public publicId="-//APACHE//ENTITIES FAQ V1.1//EN"
         uri="dtd/faq-v11.mod"/>
-<public publicId="-//APACHE//ENTITIES FAQ V1.2//EN"
+  <public publicId="-//APACHE//ENTITIES FAQ V1.2//EN"
         uri="dtd/faq-v12.mod"/>
-<public publicId="-//APACHE//ENTITIES FAQ V2.0//EN"
+  <public publicId="-//APACHE//ENTITIES FAQ V2.0//EN"
         uri="dtd/faq-v20.mod"/>
-<public publicId="-//APACHE//ENTITIES Changes V1.1//EN"
+  <public publicId="-//APACHE//ENTITIES Changes V1.1//EN"
         uri="dtd/changes-v11.mod"/>
-<public publicId="-//APACHE//ENTITIES Todo V1.1//EN"
+  <public publicId="-//APACHE//ENTITIES Todo V1.1//EN"
         uri="dtd/todo-v11.mod"/>
-<public publicId="-//APACHE//ENTITIES Common Elements V1.0//EN"
+  <public publicId="-//APACHE//ENTITIES Common Elements V1.0//EN"
         uri="dtd/common-elems-v10.mod"/>
-<public publicId="-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
+  <public publicId="-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
         uri="dtd/common-charents-v10.mod"/>
-
 <!-- ISO public identifiers for sets of character entities -->
-<public publicId="ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
+  <public publicId="ISO 8879-1986//ENTITIES Added Latin 1//EN//XML"
         uri="entity/ISOlat1.pen"/>
-<public publicId="ISO 9573-15:1993//ENTITIES Greek Letters//EN//XML"
+  <public publicId="ISO 9573-15:1993//ENTITIES Greek Letters//EN//XML"
         uri="entity/ISOgrk1.pen"/>
-<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
         uri="entity/ISOpub.pen"/>
-<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
         uri="entity/ISOtech.pen"/>
-<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
         uri="entity/ISOnum.pen"/>
-<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
         uri="entity/ISOdia.pen"/>
-<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+  <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
         uri="entity/ISOlat1.pen"/>
-
 <!-- Old DTDs -->
-<public publicId="-//APACHE//DTD Skin Configuration V0.6-2//EN"
+  <public publicId="-//APACHE//DTD Skin Configuration V0.6-2//EN"
         uri="dtd/skinconfig-v06-2.dtd"/>
-<public publicId="-//APACHE//DTD Skin Configuration V0.6-1//EN"
+  <public publicId="-//APACHE//DTD Skin Configuration V0.6-1//EN"
         uri="dtd/skinconfig-v06-1.dtd"/>
-<public publicId="-//APACHE//DTD Skin Configuration V0.6//EN"
+  <public publicId="-//APACHE//DTD Skin Configuration V0.6//EN"
         uri="dtd/skinconfig-v06.dtd"/>
-<public publicId="-//APACHE//DTD Documentation V2.0a//EN"
+  <public publicId="-//APACHE//DTD Documentation V2.0a//EN"
         uri="dtd/v20a/document-v20.dtd"/>
-<public publicId="-//APACHE//ENTITIES Documentation V2.0a//EN"
+  <public publicId="-//APACHE//ENTITIES Documentation V2.0a//EN"
         uri="dtd/v20a/document-v20.mod"/>
-<public publicId="-//APACHE//DTD FAQ V2.0a//EN"
+  <public publicId="-//APACHE//DTD FAQ V2.0a//EN"
         uri="dtd/v20a/faq-v20.dtd"/>
-<public publicId="-//APACHE//ENTITIES FAQ V2.0a//EN"
+  <public publicId="-//APACHE//ENTITIES FAQ V2.0a//EN"
         uri="dtd/v20a/faq-v20.mod"/>
-<public publicId="-//APACHE//DTD Documentation V1.2//EN"
+  <public publicId="-//APACHE//DTD Documentation V1.2//EN"
         uri="dtd/document-v12.dtd"/>
-<public publicId="-//APACHE//DTD FAQ V1.2//EN"
+  <public publicId="-//APACHE//DTD FAQ V1.2//EN"
         uri="dtd/faq-v12.dtd"/>
-<public publicId="-//APACHE//DTD Changes V1.2//EN"
+  <public publicId="-//APACHE//DTD Changes V1.2//EN"
         uri="dtd/changes-v12.dtd"/>
-<public publicId="-//APACHE//DTD Todo V1.2//EN"
+  <public publicId="-//APACHE//DTD Todo V1.2//EN"
         uri="dtd/todo-v12.dtd"/>
-<public publicId="-//APACHE//DTD How-to V1.2//EN"
+  <public publicId="-//APACHE//DTD How-to V1.2//EN"
         uri="dtd/howto-v12.dtd"/>
-<public publicId="-//APACHE//DTD Documentation V1.1//EN"
+  <public publicId="-//APACHE//DTD Documentation V1.1//EN"
         uri="dtd/document-v11.dtd"/>
-<public publicId="-//APACHE//DTD Specification V1.1//EN"
+  <public publicId="-//APACHE//DTD Specification V1.1//EN"
         uri="dtd/specification-v11.dtd"/>
-<public publicId="-//APACHE//DTD FAQ V1.1//EN"
+  <public publicId="-//APACHE//DTD FAQ V1.1//EN"
         uri="dtd/faq-v11.dtd"/>
-<public publicId="-//APACHE//DTD Changes V1.1//EN"
+  <public publicId="-//APACHE//DTD Changes V1.1//EN"
         uri="dtd/changes-v11.dtd"/>
-<public publicId="-//APACHE//DTD Todo V1.1//EN"
+  <public publicId="-//APACHE//DTD Todo V1.1//EN"
         uri="dtd/todo-v11.dtd"/>
-<public publicId="-//APACHE//DTD How-to V1.0//EN"
+  <public publicId="-//APACHE//DTD How-to V1.0//EN"
         uri="dtd/howto-v10.dtd"/>
-<public publicId="-//APACHE//DTD Gump Descriptor V1.0//EN"
+  <public publicId="-//APACHE//DTD Gump Descriptor V1.0//EN"
         uri="dtd/xgump-draft.dtd"/>
-<public publicId="-//APACHE//DTD JavaDoc V1.0//EN"
+  <public publicId="-//APACHE//DTD JavaDoc V1.0//EN"
         uri="dtd/javadoc-v04draft.dtd"/>
-<public publicId="-//APACHE//DTD Contributors V1.0//EN"
+  <public publicId="-//APACHE//DTD Contributors V1.0//EN"
         uri="dtd/contributors-v10.dtd"/>
-<public publicId="-//APACHE//DTD Documentation V1.0//EN"
+  <public publicId="-//APACHE//DTD Documentation V1.0//EN"
         uri="dtd/v10/document-v10.dtd"/>
-<public publicId="-//APACHE//DTD FAQ V1.0//EN"
+  <public publicId="-//APACHE//DTD FAQ V1.0//EN"
         uri="dtd/v10/faq-v10.dtd"/>
-<public publicId="-//APACHE//DTD Changes V1.0//EN"
+  <public publicId="-//APACHE//DTD Changes V1.0//EN"
         uri="dtd/v10/changes-v10.dtd"/>
-<public publicId="-//APACHE//DTD Todo V1.0//EN"
+  <public publicId="-//APACHE//DTD Todo V1.0//EN"
         uri="dtd/v10/todo-v10.dtd"/>
-
 </catalog>

Modified: forrest/trunk/main/webapp/resources/schema/catalog.xcat
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/catalog.xcat?view=diff&rev=526433&r1=526432&r2=526433
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/catalog.xcat (original)
+++ forrest/trunk/main/webapp/resources/schema/catalog.xcat Sat Apr  7 06:43:09 2007
@@ -17,23 +17,18 @@
 -->
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
 "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
 <!-- OASIS XML Catalog for all documents that Forrest uses -->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
          prefer="public">
-
 <!-- The core Forrest catalog -->
-<nextCatalog catalog="catalog.forrest.xcat"/>
-
+  <nextCatalog catalog="catalog.forrest.xcat"/>
 <!-- The generated build/plugins/catalog.xcat
   will include each other plugin's catalog -->
-<nextCatalog catalog="../../../../build/plugins/catalog.xcat"/>
+  <nextCatalog catalog="../../../../build/plugins/catalog.xcat"/>
 <!-- Its location is different in the war archive -->
-<nextCatalog catalog="../../build/plugins/catalog.xcat"/>
-
-<nextCatalog catalog="w3c-dtd/catalog.xcat"/>
-<nextCatalog catalog="docbook/catalog.xcat"/>
-<nextCatalog catalog="sdocbook/catalog.xcat"/>
-<nextCatalog catalog="open-office/catalog.xcat"/>
-
+  <nextCatalog catalog="../../build/plugins/catalog.xcat"/>
+  <nextCatalog catalog="w3c-dtd/catalog.xcat"/>
+  <nextCatalog catalog="docbook/catalog.xcat"/>
+  <nextCatalog catalog="sdocbook/catalog.xcat"/>
+  <nextCatalog catalog="open-office/catalog.xcat"/>
 </catalog>

Modified: forrest/trunk/main/webapp/resources/schema/dtd/index.html
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/index.html?view=diff&rev=526433&r1=526432&r2=526433
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/dtd/index.html (original)
+++ forrest/trunk/main/webapp/resources/schema/dtd/index.html Sat Apr  7 06:43:09 2007
@@ -15,21 +15,19 @@
   limitations under the License.
 -->
 <html>
-<head>
- <title>Apache Document Type Definitions</title>
-</head>
-<body>
- <h1>Apache Document Type Definitions</h1>
-                                                                                
- <p>
-  If you are here looking for the Apache Document DTDs
-  then you shouldn't be :-)
-  See <a href="http://forrest.apache.org/docs/catalog.html">Using Catalog Entity Resolver for local DTDs</a>.
- </p>
-                                                                                
- <p>
-  That said, you can find the relevant DTDs using the naming convention
-  "forrest.apache.org/dtd/document-v13.dtd" etc.
- </p>
-</body>
+  <head>
+    <title>Apache Document Type Definitions</title>
+  </head>
+  <body>
+    <h1>Apache Document Type Definitions</h1>
+    <p>
+      If you are here looking for the Apache Document DTDs then you shouldn't be
+      :-) See <a href="http://forrest.apache.org/docs/catalog.html">Using
+      Catalog Entity Resolver for local DTDs</a>.
+    </p>
+    <p>
+      That said, you can find the relevant DTDs using the naming convention
+      "forrest.apache.org/dtd/document-v13.dtd" etc.
+    </p>
+  </body>
 </html>

Modified: forrest/trunk/main/webapp/resources/schema/entity/index.html
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/entity/index.html?view=diff&rev=526433&r1=526432&r2=526433
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/entity/index.html (original)
+++ forrest/trunk/main/webapp/resources/schema/entity/index.html Sat Apr  7 06:43:09 2007
@@ -1,19 +1,17 @@
 <html>
-<head>
- <title>Apache Document Type Definitions</title>
-</head>
-<body>
- <h1>Apache Document Type Definitions</h1>
-                                                                                
- <p>
-  If you are here looking for the Apache Document DTDs
-  then you shouldn't be :-)
-  See <a href="http://forrest.apache.org/docs/catalog.html">Using Catalog Entity Resolver for local DTDs</a>.
- </p>
-                                                                                
- <p>
-  That said, you can find the relevant DTDs using the naming convention
-  "forrest.apache.org/dtd/document-v13.dtd" etc.
- </p>
-</body>
+  <head>
+    <title>Apache Document Type Definitions</title>
+  </head>
+  <body>
+    <h1>Apache Document Type Definitions</h1>
+    <p>
+      If you are here looking for the Apache Document DTDs then you shouldn't be
+      :-) See <a href="http://forrest.apache.org/docs/catalog.html">Using
+      Catalog Entity Resolver for local DTDs</a>.
+    </p>
+    <p>
+      That said, you can find the relevant DTDs using the naming convention
+      "forrest.apache.org/dtd/document-v13.dtd" etc.
+    </p>
+  </body>
 </html>

Modified: forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml?view=diff&rev=526433&r1=526432&r2=526433
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml (original)
+++ forrest/trunk/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml Sat Apr  7 06:43:09 2007
@@ -14,7 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 This is the minimal common skinconf for plugins documentation.
 This file is included into plugins/*/src/documentation/skinconf.xml
@@ -22,106 +21,81 @@
 See the full configuration elements and the usage instructions
 in a 'forrest seed-sample" site.
 -->
-
-  <disable-print-link>true</disable-print-link>
-  <disable-pdf-link>true</disable-pdf-link>
-  <disable-pod-link>true</disable-pod-link>
-  <disable-txt-link>true</disable-txt-link>
-  <disable-xml-link>true</disable-xml-link>
-
-  <disable-external-link-image>true</disable-external-link-image>
-
-  <disable-compliance-links>false</disable-compliance-links>
-
-  <obfuscate-mail-links>true</obfuscate-mail-links>
-  <obfuscate-mail-value>.at.</obfuscate-mail-value>
-
-  <disable-font-script>false</disable-font-script>
-
-  <project-logo>images/project.png</project-logo>
-
-  <group-name>Apache Forrest</group-name>
-  <group-description>Apache Forrest</group-description>
-  <group-url>http://forrest.apache.org/</group-url>
-  <group-logo>images/project-logo.gif</group-logo>
-
-  <favicon-url>favicon.ico</favicon-url>
-
-  <year inception="true">2004</year>
-  <vendor>The Apache Software Foundation.</vendor>
-  <copyright-link>http://www.apache.org/licenses/</copyright-link>
-
-  <trail>
-    <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
-    <link2 name="Plugins" href="http://forrest.apache.org/pluginDocs/"/>
-    <link3 name="" href=""/>
-  </trail>
-
-  <toc max-depth="2" min-sections="1" location="page"/>
-
-  <headings type="underlined"/>
-
-  <extra-css>
+<disable-print-link>true</disable-print-link>
+<disable-pdf-link>true</disable-pdf-link>
+<disable-pod-link>true</disable-pod-link>
+<disable-txt-link>true</disable-txt-link>
+<disable-xml-link>true</disable-xml-link>
+<disable-external-link-image>true</disable-external-link-image>
+<disable-compliance-links>false</disable-compliance-links>
+<obfuscate-mail-links>true</obfuscate-mail-links>
+<obfuscate-mail-value>.at.</obfuscate-mail-value>
+<disable-font-script>false</disable-font-script>
+<project-logo>images/project.png</project-logo>
+<group-name>Apache Forrest</group-name>
+<group-description>Apache Forrest</group-description>
+<group-url>http://forrest.apache.org/</group-url>
+<group-logo>images/project-logo.gif</group-logo>
+<favicon-url>favicon.ico</favicon-url>
+<year inception="true">2004</year>
+<vendor>The Apache Software Foundation.</vendor>
+<copyright-link>http://www.apache.org/licenses/</copyright-link>
+<trail>
+  <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
+  <link2 name="Plugins" href="http://forrest.apache.org/pluginDocs/"/>
+  <link3 name="" href=""/>
+</trail>
+<toc max-depth="2" min-sections="1" location="page"/>
+<headings type="underlined"/>
+<extra-css>
     #footer a { color: #0F3660; }
     #footer a:visited { color: #009999; }
   </extra-css>
-
-  <colors>
-  <!-- Forrest -->
-    <color name="header" value="#294563"/>
-
-    <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-
-    <color name="heading" value="#294563"/>
-    <color name="subheading" value="#4a6d8c"/>
-
-    <color name="published" value="#4C6C8F" font="#FFFFFF"/>
-    <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
-
-    <color name="navstrip" value="#4a6d8c" font="#ffffff" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="toolbox" value="#4a6d8c"/>
-    <color name="border" value="#294563"/>
-
-    <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>
-
-    <color name="menuheading" value="#cfdced" font="#000000" />
-    <color name="searchbox" value="#4a6d8c" font="#000000"/>
-
-    <color name="dialog" value="#4a6d8c"/>
-    <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
-
-    <color name="table" value="#7099C5"/>
-    <color name="table-cell" value="#f0f0ff"/>
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#CFDCED"/>
-
-    <color name="footer" value="#cedfef"/>
-  </colors>
-
-  <pdf>
-    <page size="a4" orientation="portrait" text-align="left"/>
-    <margins double-sided="false">
-      <top>1cm</top>
-      <bottom>1cm</bottom>
-      <inner>1.25cm</inner>
-      <outer>1.5cm</outer>
-    </margins>
-    <show-external-urls>false</show-external-urls>
-    <disable-copyright-footer>true</disable-copyright-footer>
-  </pdf>
-
-  <credits>
-    <credit>
-      <name>Built with Apache Forrest</name>
-      <url>http://forrest.apache.org/</url>
-      <image>images/built-with-forrest-button.png</image>
-      <width>88</width>
-      <height>31</height>
-    </credit>
-  </credits>
+<colors>
+<!-- Forrest -->
+  <color name="header" value="#294563"/>
+  <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+  <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+  <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+  <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+  <color name="heading" value="#294563"/>
+  <color name="subheading" value="#4a6d8c"/>
+  <color name="published" value="#4C6C8F" font="#FFFFFF"/>
+  <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+  <color name="navstrip" value="#4a6d8c" font="#ffffff" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+  <color name="toolbox" value="#4a6d8c"/>
+  <color name="border" value="#294563"/>
+  <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>
+  <color name="menuheading" value="#cfdced" font="#000000" />
+  <color name="searchbox" value="#4a6d8c" font="#000000"/>
+  <color name="dialog" value="#4a6d8c"/>
+  <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+  <color name="table" value="#7099C5"/>
+  <color name="table-cell" value="#f0f0ff"/>
+  <color name="highlight" value="#ffff00"/>
+  <color name="fixme" value="#cc6600"/>
+  <color name="note" value="#006699"/>
+  <color name="warning" value="#990000"/>
+  <color name="code" value="#CFDCED"/>
+  <color name="footer" value="#cedfef"/>
+</colors>
+<pdf>
+  <page size="a4" orientation="portrait" text-align="left"/>
+  <margins double-sided="false">
+    <top>1cm</top>
+    <bottom>1cm</bottom>
+    <inner>1.25cm</inner>
+    <outer>1.5cm</outer>
+  </margins>
+  <show-external-urls>false</show-external-urls>
+  <disable-copyright-footer>true</disable-copyright-footer>
+</pdf>
+<credits>
+  <credit>
+    <name>Built with Apache Forrest</name>
+    <url>http://forrest.apache.org/</url>
+    <image>images/built-with-forrest-button.png</image>
+    <width>88</width>
+    <height>31</height>
+  </credit>
+</credits>

Modified: forrest/trunk/main/webapp/resources/schema/open-office/catalog.xcat
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/open-office/catalog.xcat?view=diff&rev=526433&r1=526432&r2=526433
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/open-office/catalog.xcat (original)
+++ forrest/trunk/main/webapp/resources/schema/open-office/catalog.xcat Sat Apr  7 06:43:09 2007
@@ -17,20 +17,15 @@
 -->
 <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
 "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
 <!-- OASIS XML Catalog for OpenOffice.org -->
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
          prefer="public">
-
 <!-- ...................................................................... -->
 <!-- Catalog data for OpenOffice.org Documents 1.0 ........................ -->
-
 <!-- This is only a dummy file because Forrest can't include the original
-     Openoffice.org DTD because it is published under the LGPL. -->     
-<public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
+     Openoffice.org DTD because it is published under the LGPL. -->
+  <public publicId="-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
         uri="dummy.dtd"/>
-
 <!-- End of catalog data for OpenOffice.org Documents 1.0 ................... -->
 <!-- ........................................................................ -->
-
 </catalog>