forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject cvs commit: xml-forrest/src/resources/schema catalog.xcat
Date Mon, 24 Mar 2003 21:20:17 GMT
stevenn     2003/03/24 13:20:17

  Modified:    src/resources/conf cocoon.xconf
               src/resources/convert/cocoon forrest.build.xml
               src/resources/forrest-shbat forrest.build.xml
               src/resources/fresh-site forrest.properties
               src/resources/schema catalog.xcat
  Log:
  Now that Ant's xmlvalidate seems to be more up-to-spec, we should start soft-deprecating
the non-XML entity catalogs: swapping them in.
  
  Revision  Changes    Path
  1.16      +1 -1      xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- cocoon.xconf	17 Mar 2003 13:48:09 -0000	1.15
  +++ cocoon.xconf	24 Mar 2003 21:20:16 -0000	1.16
  @@ -224,7 +224,7 @@
         |     <parameter name="verbosity" value="2"/>
         +-->
     <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl" logger="core.resolver">
  -    <parameter name="catalog" value="/resources/schema/catalog"/>
  +    <parameter name="catalog" value="/resources/schema/catalog.xcat"/>
       <parameter name="local-catalog" value="@local-catalog@"/>
       <parameter name="verbosity" value="@catalog-verbosity@"/>
     </entity-resolver>
  
  
  
  1.4       +5 -5      xml-forrest/src/resources/convert/cocoon/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/convert/cocoon/forrest.build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- forrest.build.xml	29 Nov 2002 06:44:13 -0000	1.3
  +++ forrest.build.xml	24 Mar 2003 21:20:16 -0000	1.4
  @@ -726,7 +726,7 @@
             <include name="catalog*"/>
           </catalogfiles>
           <catalogfiles dir="${forrest.home}/context/resources/schema">
  -          <include name="catalog" />
  +          <include name="catalog.xcat" />
           </catalogfiles>
         </xmlcatalog>
         <fileset dir="${project.xdocs-dir}"
  @@ -882,7 +882,7 @@
             <include name="catalog*"/>
           </catalogfiles>
           <catalogfiles dir="${forrest.home}/context/resources/schema">
  -          <include name="catalog" />
  +          <include name="catalog.xcat" />
           </catalogfiles>
         </xmlcatalog>
         <fileset dir="${project.home}/src/documentation/xdocs"
  @@ -914,7 +914,7 @@
     >
         <xmlcatalog>
           <catalogfiles dir="${forrest.home}/context/resources/schema">
  -          <include name="catalog" />
  +          <include name="catalog.xcat" />
           </catalogfiles>
         </xmlcatalog>
     </xslt> 
  @@ -935,7 +935,7 @@
     >
         <xmlcatalog>
           <catalogfiles dir="${forrest.home}/context/resources/schema">
  -          <include name="catalog" />
  +          <include name="catalog.xcat" />
           </catalogfiles>
         </xmlcatalog>
   
  @@ -956,7 +956,7 @@
     >
         <xmlcatalog>
           <catalogfiles dir="${forrest.home}/context/resources/schema">
  -          <include name="catalog" />
  +          <include name="catalog.xcat" />
           </catalogfiles>
         </xmlcatalog>
     </xslt> 
  
  
  
  1.59      +3 -3      xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- forrest.build.xml	22 Mar 2003 12:10:35 -0000	1.58
  +++ forrest.build.xml	24 Mar 2003 21:20:17 -0000	1.59
  @@ -82,7 +82,7 @@
       <property name="project.stylesheets-dir" location="${project.content-dir}/resources/stylesheets"
/>
       <property name="project.images-dir"  location="${project.content-dir}/resources/images"
/>
       <property name="project.schema-dir"  location="${project.content-dir}/resources/schema"
/>
  -    <property name="project.catalog"     location="${project.schema-dir}/catalog" />
  +    <property name="project.catalog"     location="${project.schema-dir}/catalog.xcat"
/>
       <property name="forrest.catalog.verbosity" value="1" />
       <property name="project.skins-dir"   location="${project.content-dir}/skins" />
       <property name="project.skinconf"    location="${project.content-dir}/skinconf.xml"
/>
  @@ -779,7 +779,7 @@
         <xmlcatalog>
           <catalogpath>
             <pathelement
  -            location="${forrest.home}/context/resources/schema/catalog"/>
  +            location="${forrest.home}/context/resources/schema/catalog.xcat"/>
             <pathelement location="${project.catalog}"/>
           </catalogpath>
         </xmlcatalog>
  
  
  
  1.22      +1 -1      xml-forrest/src/resources/fresh-site/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/forrest.properties,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- forrest.properties	3 Mar 2003 23:38:05 -0000	1.21
  +++ forrest.properties	24 Mar 2003 21:20:17 -0000	1.22
  @@ -40,7 +40,7 @@
   # Cocoon catalog entity resolver properties
   
   # A local OASIS catalog file to supplement the default Forrest catalog
  -#project.catalog=${project.schema-dir}/catalog
  +#project.catalog=${project.schema-dir}/catalog.xcat
   
   # The verbosity level for the entity resolver (1..10)
   #forrest.catalog.verbosity=1
  
  
  
  1.10      +0 -3      xml-forrest/src/resources/schema/catalog.xcat
  
  Index: catalog.xcat
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/catalog.xcat,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- catalog.xcat	14 Feb 2003 11:14:18 -0000	1.9
  +++ catalog.xcat	24 Mar 2003 21:20:17 -0000	1.10
  @@ -1,8 +1,5 @@
   <!-- OASIS XML Catalog for Forrest -->
  -<!-- FIXME: The parser used by Ant chokes on this.
   <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
  --->
  -<catalog>
   
   <!-- Document Type Definitions (current) -->
   <public publicId="-//APACHE//DTD Documentation V1.1//EN"
  
  
  

Mime
View raw message