crossley    2003/06/25 21:12:59

  Modified:    src/webapp/WEB-INF/entities catalog
               src/webapp/samples/catalog catalog-demo.xml
  Added:       src/webapp/samples/catalog testovr.txt
               src/webapp/WEB-INF/entities/catalog-demo override.txt
                        testpub.txt testsys.txt
  Removed:     src/webapp/samples/catalog testovr.xml
               src/webapp/WEB-INF/entities/catalog-demo override.xml
                        testpub.xml testsys.xml
  Log:
  Workaround a stupid problem. The catalog demo was including snippets of xml
  via entities. The xml validation was failing because these snippets did not
  declare their DTD. We can get around that using an internal DTD subset.
  However when we do that, then the parser complains when it includes those
  snippets saying "DOCTYPE declaration not allowed in content". Catch-22.
  Yet another reason to move away from using DTDs for xml validation.
  So now using plain-text snippets for this demo.
  
  Revision  Changes    Path
  1.4       +3 -3      cocoon-2.1/src/webapp/WEB-INF/entities/catalog
  
  Index: catalog
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/catalog,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalog   25 Jun 2003 19:47:38 -0000      1.3
  +++ catalog   26 Jun 2003 04:12:59 -0000      1.4
  @@ -56,12 +56,12 @@
   -- 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 --
  
  
  
  1.4       +6 -6      cocoon-2.1/src/webapp/samples/catalog/catalog-demo.xml
  
  Index: catalog-demo.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/catalog/catalog-demo.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalog-demo.xml  7 May 2003 04:57:12 -0000       1.3
  +++ catalog-demo.xml  26 Jun 2003 04:12:59 -0000      1.4
  @@ -7,7 +7,7 @@
      "bogus-system-identifier.xml">
    <!ENTITY testsys SYSTEM "urn:x-arbortext:test-system-identifier">
    <!ENTITY testovr PUBLIC "-//Arbortext//TEXT Test Override//EN"
  -   "testovr.xml">
  +   "testovr.txt">
    <!ENTITY % ISOnum PUBLIC
      "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
      "ISOnum.pen">
  @@ -41,9 +41,9 @@
     <para>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 &amp;frac12; (to represent &frac12;).
  +   so that we can use entities like "&amp;frac12;" (to represent &frac12;).
      Finally the internal DTD subset declares an internal general entity
  -   for &quot;note&quot;.
  +   for &quot;&amp;note&quot;.
     </para>
    </section>
   
  @@ -51,14 +51,14 @@
     <para>testpub ... this entity is declared with a PUBLIC identifier and a
      bogus system identifier (which will be overridden by the catalog)
     </para>
  -  &testpub;
  +  <para>&note; &testpub;</para>
    </section>
   
    <section>
     <para>testsys ... this entity is declared with a SYSTEM identifier
      (which will be resolved by the catalog)
     </para>
  -  &testsys;
  +  <para>&note; &testsys;</para>
    </section>
   
    <section>
  @@ -66,7 +66,7 @@
      identifier (the catalog is set to not override this one, so the
      declared system identifier is used)
     </para>
  -  &testovr;
  +  <para>&note; &testovr;</para>
    </section>
   
   </catalog-demo>
  
  
  
  1.1                  cocoon-2.1/src/webapp/samples/catalog/testovr.txt
  
  Index: testovr.txt
  ===================================================================
  This paragraph is automatically included from the
  testovr.txt external file.
  The location of this entity was not resolved by the catalog, because
  there is no matching catalog entry for its public identifier or its
  system identifier. So the declared system identifier is used,
  i.e. the file is retrieved relative to the top-level document.
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/catalog-demo/override.txt
  
  Index: override.txt
  ===================================================================
  This is content from the override.txt external file.
  This content will not actually be included, because the catalog
  was set with OVERRIDE NO for this public identifier.
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/catalog-demo/testpub.txt
  
  Index: testpub.txt
  ===================================================================
  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.
  
  
  
  1.1                  cocoon-2.1/src/webapp/WEB-INF/entities/catalog-demo/testsys.txt
  
  Index: testsys.txt
  ===================================================================
  This paragraph is automatically included from the
  testsys.txt external file.
  The declared SYSTEM identifier was resolved by the catalog to a
  specific location on the local filesystem.
  
  
  

Reply via email to