Return-Path: <brian@apache.org>
Mailing-List: contact forrest-dev-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list forrest-dev@xml.apache.org
Delivered-To: moderator for forrest-dev@xml.apache.org
Received: (qmail 46146 invoked by uid 500); 1 Mar 2002 07:36:17 -0000
Delivered-To: apmail-xml-forrest-cvs@apache.org
Received: (qmail 46143 invoked from network); 1 Mar 2002 07:36:17 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 1 Mar 2002 07:36:17 -0000
Received: (qmail 25384 invoked by uid 1389); 1 Mar 2002 07:36:16 -0000
Date: 1 Mar 2002 07:36:16 -0000
Message-ID: <20020301073616.25383.qmail@icarus.apache.org>
From: crossley@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/tools/cocoon/conf cocoon.xconf
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

crossley    02/02/28 23:36:15

  Modified:    tools/centipede/targets docs.xtarget
               tools/cocoon/conf cocoon.xconf
  Log:
  Changes for Cocoon's entity-resolver to find new location of OASIS Catalog.
  
  Revision  Changes    Path
  1.2       +3 -3      xml-forrest/tools/centipede/targets/docs.xtarget
  
  Index: docs.xtarget
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/centipede/targets/docs.xtarget,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- docs.xtarget	26 Feb 2002 23:50:29 -0000	1.1
  +++ docs.xtarget	1 Mar 2002 07:36:15 -0000	1.2
  @@ -21,12 +21,12 @@
       </copy>
   
       <!-- Copy entity catalog and entities -->
  -    <copy todir="${build.context}/resources/entities" filtering="on">
  -      <fileset dir="${resource.dir}/entities"/>
  +    <copy todir="${build.context}/resources/schema" filtering="on">
  +      <fileset dir="${resource.dir}/schema"/>
       </copy>
       <mkdir dir="${build.context}/WEB-INF/classes"/>
       <move todir="${build.context}/WEB-INF/classes">
  -      <fileset dir="${build.context}/resources/entities">
  +      <fileset dir="${build.context}/resources/schema">
           <include name="CatalogManager.properties"/>
         </fileset>
       </move>
  
  
  
  1.2       +3 -3      xml-forrest/tools/cocoon/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/tools/cocoon/conf/cocoon.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.xconf	26 Feb 2002 23:50:29 -0000	1.1
  +++ cocoon.xconf	1 Mar 2002 07:36:15 -0000	1.2
  @@ -143,10 +143,10 @@
   
     <!-- Entity resolution catalogs: *********************************************
       catalog:
  -    The default catalog is distributed at /resources/entities/catalog
  +    The default catalog is distributed at /resources/schema/catalog
       This is the contextual pathname for Cocoon resources.
       You can override this path, if necessary, using the "catalog" parameter.
  -   <parameter name="catalog" value="/resources/entities/catalog"/>
  +   <parameter name="catalog" value="/resources/schema/catalog"/>
       However, it is probably desirable to leave this default catalog config
       and declare your own local catalogs, which are loaded in addition to
       the system catalog.
  @@ -174,7 +174,7 @@
     ************************************************************************** -->
     <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
               logger="core.resolver">
  -   <parameter name="catalog" value="/resources/entities/catalog"/>
  +   <parameter name="catalog" value="/resources/schema/catalog"/>
      <parameter name="verbosity" value="1"/>
     </entity-resolver>