forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-forrest/src/resources/forrest-shbat forrest.build.xml
Date Thu, 21 Nov 2002 04:17:43 GMT
crossley    2002/11/20 20:17:43

  Modified:    .        status.xml
               src/resources/conf cocoon.xconf
               src/resources/fresh-site forrest.properties
               src/resources/forrest-shbat forrest.build.xml
  Log:
  * Allow configuration of a project local-catalog and the entity resolver
  verbosity level, via forrest.properties configuration. This replaces tokens
  in the default cocoon.xconf
  * Disabled the copy-schema target because it was overwriting the default
  Forrest catalog with the project catalog and causing major errors.
  
  Revision  Changes    Path
  1.64      +5 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- status.xml	21 Nov 2002 03:22:10 -0000	1.63
  +++ status.xml	21 Nov 2002 04:17:43 -0000	1.64
  @@ -24,6 +24,11 @@
   
     <changes>
       <release version="0.3-dev" date="unreleased">
  +      <action dev="DC" type="add" context="build">
  +        Allow configuration of a project local-catalog and the entity resolver
  +        verbosity level, via forrest.properties configuration. This replaces
  +        tokens in the default cocoon.xconf
  +      </action>
         <action dev="JT" type="fix" context="webapp">
           Fix bug where the webapp would break due to missing XML jars under JDK
           1.2/1.3.
  
  
  
  1.6       +2 -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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- cocoon.xconf	25 Oct 2002 07:34:42 -0000	1.5
  +++ cocoon.xconf	21 Nov 2002 04:17:43 -0000	1.6
  @@ -430,7 +430,8 @@
     ************************************************************************** -->
     <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl" logger="core.resolver">
      <parameter name="catalog" value="/resources/schema/catalog"/>
  -   <parameter name="verbosity" value="1"/>
  +   <parameter name="local-catalog" value="@local-catalog@"/>
  +   <parameter name="verbosity" value="@catalog-verbosity@"/>
     </entity-resolver>
   
   
  
  
  
  1.17      +10 -0     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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- forrest.properties	16 Nov 2002 13:30:06 -0000	1.16
  +++ forrest.properties	21 Nov 2002 04:17:43 -0000	1.17
  @@ -36,6 +36,16 @@
   
   
   ##############
  +# Cocoon catalog entity resolver properties
  +
  +# A local catalog to supplement the default Forrest catalog
  +#project.catalog=${project.schema-dir}/catalog
  +
  +# The verbosity level for the entity resolver (1..10)
  +#forrest.catalog.verbosity=1
  +
  +
  +##############
   # validation properties
   
   # These props determine if validation is performed at all
  
  
  
  1.25      +9 -2      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- forrest.build.xml	21 Nov 2002 03:14:37 -0000	1.24
  +++ forrest.build.xml	21 Nov 2002 04:17:43 -0000	1.25
  @@ -83,6 +83,8 @@
       <property name="project.stylesheets-dir" value="${project.content-dir}/resources/stylesheets"
/>
       <property name="project.images-dir"  value="${project.content-dir}/resources/images"
/>
       <property name="project.schema-dir" value="${project.content-dir}/resources/schema"
/>
  +    <property name="project.catalog" value="${project.schema-dir}/catalog" />
  +    <property name="forrest.catalog.verbosity" value="1" />
       <property name="project.skins-dir"   value="${project.content-dir}/skins" />
       <property name="project.skinconf"    value="${project.content-dir}/skinconf.xml"
/>
       <property name="project.conf-dir"     value="${project.content-dir}/conf" />
  @@ -301,6 +303,8 @@
          =============================================================== -->
     <target name="bare-context" depends="init" >
       <filter token="skin"              value="${project.skin}" />
  +    <filter token="local-catalog"     value="${project.catalog}" />
  +    <filter token="catalog-verbosity" value="${forrest.catalog.verbosity}" />
   
       <!--
       These filters defined for backwards-compatibility with old skins.
  @@ -366,11 +370,11 @@
          param: location to make temporary context-dir ${project.ctxt-dir} 
          =============================================================== -->
     <target name="project-context-bot" depends="init, examine-proj, copy-conf, copy-sitemap,
  -    copy-xdocs, copy-stylesheets, copy-images, copy-schema, copy-lib, 
  +    copy-xdocs, copy-stylesheets, copy-images, copy-lib, 
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
     <target name="project-context" depends="examine-proj, ensure-content, validate, init,
bare-context, copy-conf, copy-sitemap,
  -    copy-xdocs, copy-stylesheets, copy-images, copy-schema, copy-content, copy-lib, 
  +    copy-xdocs, copy-stylesheets, copy-images, copy-content, copy-lib, 
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
     <target name="copy-conf" if="conf.present">
  @@ -424,6 +428,9 @@
       </copy>
     </target>
   
  +<!-- FIXME: This target has been disabled because it was overwriting the
  +     default Forrest catalog with the project catalog and causing major errors.
  +-->
     <target name="copy-schema" if="schema.present">
       <copy toDir="${project.ctxt-dir}/resources/schema" filtering="false"
         overwrite="true" failonerror="false">
  
  
  

Mime
View raw message