Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 34810 invoked by uid 500); 26 Jun 2003 06:57:28 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 34785 invoked by uid 500); 26 Jun 2003 06:57:27 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 34778 invoked from network); 26 Jun 2003 06:57:27 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 26 Jun 2003 06:57:27 -0000 Received: (qmail 24949 invoked by uid 1389); 26 Jun 2003 06:57:26 -0000 Date: 26 Jun 2003 06:57:26 -0000 Message-ID: <20030626065726.24947.qmail@icarus.apache.org> From: crossley@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/concepts catalog.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N crossley 2003/06/25 23:57:26 Modified: src/documentation/xdocs/userdocs/concepts catalog.xml Log: Reflect the recent changes in the "catalog-demo" sample. Revision Changes Path 1.4 +28 -21 cocoon-2.1/src/documentation/xdocs/userdocs/concepts/catalog.xml Index: catalog.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/concepts/catalog.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- catalog.xml 18 Mar 2003 07:11:20 -0000 1.3 +++ catalog.xml 26 Jun 2003 06:57:26 -0000 1.4 @@ -5,7 +5,7 @@
Entity resolution with catalogs Resolve external entities to local or other resources - 1.5 + 1.6 Technical document @@ -240,15 +240,22 @@ PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ISOnum.pen" +-- Document Type Definitions -- +PUBLIC "-//APACHE//DTD Documentation V1.0//EN" + "document-v10.dtd" +PUBLIC "-//APACHE//DTD FAQ V1.0//EN" + "faq-v10.dtd" +-- (other declarations removed for brevity) -- + -- these entries are used for the catalog-demo sample application -- OVERRIDE NO PUBLIC "-//Arbortext//TEXT Test Override//EN" - "catalog-demo/override.xml" + "catalog-demo/override.txt" OVERRIDE YES PUBLIC "-//Arbortext//TEXT Test Public Identifier//EN" - "catalog-demo/testpub.xml" + "catalog-demo/testpub.txt" SYSTEM "urn:x-arbortext:test-system-identifier" - "catalog-demo/testsys.xml" + "catalog-demo/testsys.txt" PUBLIC "-//Indexgeo//DTD Catalog Demo v1.0//EN" "catalog-demo/catalog-demo-v10.dtd" -- end of entries for the catalog-demo sample application -- @@ -297,6 +304,7 @@ + + "testovr.txt"> @@ -316,9 +324,9 @@
This sample application demonstrates the use of catalogs for entity resolution. ¬e; see the Apache Cocoon documentation - Entity - resolution with catalogs for the full background and - explanation, and the XML source of this document (catalog-demo.xml). + Entity resolution + with catalogs for the full background and explanation, and the XML + source of this document (catalog-demo.xml). This top-level XML instance document is catalog-demo.xml - it declares @@ -338,9 +346,9 @@ The internal DTD subset of the top-level document instance goes on to declare the three external sub-document entities using various means. It also declares and includes the ISOnum set of character entities, - so that we can use entities like &frac12; (to represent ½). + so that we can use entities like "&frac12;" (to represent ½). Finally the internal DTD subset declares an internal general entity - for "note". + for "&note".
@@ -348,14 +356,14 @@ testpub ... this entity is declared with a PUBLIC identifier and a bogus system identifier (which will be overridden by the catalog) - &testpub; + ¬e; &testpub;
testsys ... this entity is declared with a SYSTEM identifier (which will be resolved by the catalog) - &testsys; + ¬e; &testsys;
@@ -363,7 +371,7 @@ identifier (the catalog is set to not override this one, so the declared system identifier is used) - &testovr; + ¬e; &testovr;
@@ -371,17 +379,16 @@

Here is the source for one of the included sub-document external entities - testpub.xml ... + testpub.txt (a slab of plain text) ...

¬e; This paragraph is automatically included from the - testpub.xml external file. - The entity declaration deliberately used a non-existent file - as the system identifier. The catalog then used the declared - public identifer to resolve to a specific location on the local - filesystem. - +This paragraph is automatically included from the +testpub.txt external file. +The entity declaration deliberately used a non-existent file +as the system identifier. The catalog then used the declared +public identifer to resolve to a specific location on the local +filesystem. ]]>