forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/resources/conf cocoon.xconf logkit.xconf sitemap.xmap
Date Mon, 22 Jul 2002 14:17:56 GMT
nicolaken    2002/07/22 07:17:56

  Modified:    .        build.xml status.xml
               src/resources/conf cocoon.xconf logkit.xconf sitemap.xmap
  Log:
       <action dev="NKB" type="updTE" context="build">
        Updated Cocoon to 2.1-dev to use xsltc and new CLI
        status messages.
        Logs are under the WEBINF dir in the work dir and in the build dir
        there is the list of the broken links.
       </action>
  
  Revision  Changes    Path
  1.12      +4 -2      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	11 Jul 2002 08:54:53 -0000	1.11
  +++ build.xml	22 Jul 2002 14:17:55 -0000	1.12
  @@ -244,6 +244,7 @@
         <fileset dir="${documentation.context.dir}/conf">
           <include name="sitemap.xmap"/>
           <include name="cocoon.xconf"/>
  +        <include name="logkit.xconf"/>
         </fileset>
       </copy>
       <copy todir="${build.context}/WEB-INF/" filtering="on">
  @@ -251,7 +252,7 @@
           <exclude name="sitemap.xmap"/>
         </fileset>
       </copy>
  -
  +    
       <!-- Copy libraries -->
       <copy todir="${build.context}/library/" filtering="on">
         <fileset dir="${documentation.context.dir}/library">
  @@ -369,7 +370,8 @@
         <arg value="-c."/>
         <arg value="-d../docs"/>
         <arg value="-w../work"/>
  -      <arg value="-l../work/cocoon.log"/>
  +      <arg value="-b../brokenlinks.txt"/>      
  +      <arg value="-k../work/logkit.xconf"/>
         <arg value="-u${centipede.tools.cents.forrest.loglevel}"/>
         <arg value="index.html"/>
         <classpath>
  
  
  
  1.3       +5 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- status.xml	11 Jul 2002 13:22:12 -0000	1.2
  +++ status.xml	22 Jul 2002 14:17:55 -0000	1.3
  @@ -79,6 +79,11 @@
   
     <changes>
      <release version="0.1" date="2002">
  +    <action dev="NKB" type="updTE" context="build">
  +     Updated Cocoon to 2.1-dev to use xsltc and new CLI status messages.
  +     Logs are under the WEBINF dir in the work dir and in the build dir
  +     there is the list of the broken links.
  +    </action>
       <action dev="SN" type="add" context="code">
        added NekoDTD-based DTD documentation using a custom Cocoon Generator
       </action>
  
  
  
  1.2       +208 -387  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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.xconf	29 May 2002 16:44:56 -0000	1.1
  +++ cocoon.xconf	22 Jul 2002 14:17:56 -0000	1.2
  @@ -1,183 +1,6 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8"?>
   <cocoon version="2.0">
   
  -<tree-processor>
  -  <!-- The sitemap language -->
  -  <language name="sitemap" class="org.apache.cocoon.treeprocessor.sitemap.SitemapLanguage">
  -  
  -    <!-- Namespace for this language -->
  -    <namespace uri="http://apache.org/cocoon/sitemap/1.0"/>
  -  
  -    <!-- File name for files in this language, relative to the environment prefix -->
  -    <file name="sitemap.xmap"/>
  -    
  -    <!-- Description of the element for nodes parameters -->
  -    <parameter element="parameter"/>
  -    
  -    <!-- roles for the sitemap language -->
  -    <roles>
  -      <role name="org.apache.cocoon.acting.ActionSelector"
  -            shorthand="actions"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector"/>
  -      
  -      <role name="org.apache.cocoon.selection.SelectorSelector"
  -            shorthand="selectors"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector"/>
  -      
  -      <role name="org.apache.cocoon.matching.MatcherSelector"
  -            shorthand="matchers"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector">
  -
  -        <hint shorthand="regexp-uri-matcher"
  -              class="org.apache.cocoon.matching.RegexpURIMatcher"/>
  -
  -        <hint shorthand="wildcard-uri-matcher"
  -              class="org.apache.cocoon.matching.WildcardURIMatcher"/>
  -
  -      </role>
  -      
  -      <role name="org.apache.cocoon.generation.GeneratorSelector"
  -            shorthand="generators"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector">
  -
  -        <hint shorthand="file-generator"
  -              class="org.apache.cocoon.generation.FileGenerator"/>
  -
  -        <hint shorthand="XSP-generator"
  -              class="org.apache.cocoon.generation.ServerPagesGenerator"/>
  -      </role>
  -      
  -      <role name="org.apache.cocoon.transformation.TransformerSelector"
  -            shorthand="transformers"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector">
  -
  -        <hint shorthand="XSLT-transformer"
  -              class="org.apache.cocoon.transformation.TraxTransformer"/>
  -
  -        <hint shorthand="cinclude-transformer"
  -              class="org.apache.cocoon.transformation.CIncludeTransformer"/>
  -
  -      </role>
  -      
  -      <role name="org.apache.cocoon.serialization.SerializerSelector"
  -            shorthand="serializers"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector"/>
  -      
  -      <role name="org.apache.cocoon.reading.ReaderSelector"
  -            shorthand="readers"
  -            default-class="org.apache.cocoon.treeprocessor.sitemap.ComponentsSelector"/>
  -          
  -      <role name="org.apache.cocoon.components.notification.NotifyingBuilder"
  -            shorthand="notifying-builder"
  -            default-class="org.apache.cocoon.components.notification.DefaultNotifyingBuilder"/>  
  -
  -    </roles>
  -    
  -    <!-- node definitions for the sitemap language -->
  -    <nodes>
  -      <!-- All node names are given as local names in the above namespace (no prefix) -->
  -      
  -      <!-- Sitemap root node -->
  -      <node name="sitemap" builder="org.apache.cocoon.treeprocessor.sitemap.SitemapNodeBuilder">
  -        <allowed-children>components, views, action-sets, resources, pipelines</allowed-children>
  -      </node>
  -    
  -      <!-- Components definition : parse view info associated to components
  -           (actual components creation is done by SitemapLanguage) -->
  -      <node name="components" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.ComponentsNodeBuilder"/>
  -      
  -      <node name="pipelines" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.PipelinesNodeBuilder">
  -        <allowed-children>pipeline</allowed-children>
  -      </node>
  -      
  -      <node name="views" builder="org.apache.cocoon.treeprocessor.CategoryNodeBuilder"/>
  -      <node name="view" builder="org.apache.cocoon.treeprocessor.sitemap.ViewNodeBuilder"/>
  -      <node name="resources" builder="org.apache.cocoon.treeprocessor.CategoryNodeBuilder"/>
  -      <node name="resource" builder="org.apache.cocoon.treeprocessor.NamedContainerNodeBuilder"/>
  -      <node name="action-sets" builder="org.apache.cocoon.treeprocessor.CategoryNodeBuilder"/>
  -      <node name="action-set" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.ActionSetNodeBuilder"/>
  -      <node name="pipeline" builder="org.apache.cocoon.treeprocessor.sitemap.PipelineNodeBuilder">
  -        <forbidden-children>sitemap, components, pipelines</forbidden-children>
  -      </node>
  -      <node name="match" builder="org.apache.cocoon.treeprocessor.sitemap.MatchNodeBuilder">
  -        <forbidden-children>sitemap, components, pipeline, handle-errors</forbidden-children>
  -      </node>
  -      <node name="select" builder="org.apache.cocoon.treeprocessor.sitemap.SelectNodeBuilder"/>
  -
  -      <node name="act" builder="org.apache.cocoon.treeprocessor.sitemap.ActNodeBuilder">
  -        <forbidden-children>sitemap, components, pipeline, handle-errors</forbidden-children>
  -      </node>
  -      <node name="redirect-to" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.RedirectToNodeBuilder"/>
  -      <node name="call" builder="org.apache.cocoon.treeprocessor.sitemap.CallNodeBuilder"/>
  -      <node name="mount" builder="org.apache.cocoon.treeprocessor.sitemap.MountNodeBuilder"/>
  -      <node name="read" builder="org.apache.cocoon.treeprocessor.sitemap.ReadNodeBuilder"/>
  -      <node name="aggregate" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.AggregateNodeBuilder"/>
  -      <node name="generate" builder="org.apache.cocoon.treeprocessor.sitemap.GenerateNodeBuilder"/>
  -      <node name="transform" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.TransformNodeBuilder"/>
  -      <node name="serialize" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.SerializeNodeBuilder"/>
  -      <node name="handle-errors" 
  -builder="org.apache.cocoon.treeprocessor.sitemap.HandleErrorsNodeBuilder"/>
  -
  -    </nodes>
  -    
  -  </language>
  -
  -</tree-processor>
  -
  -  <!-- Source Handler:
  -    The source handler adds special url protocols to the system, they are
  -    then available inside Cocoon, e.g. as a source argument for one of the
  -    sitemap components.
  -  -->
  -  <source-handler logger="core.source-handler">
  -    <!-- file protocol : this is a WriteableSource -->
  -    <protocol name="file" class="org.apache.cocoon.components.source.FileSourceFactory"/>
  -  </source-handler>
  -
  -  <!-- Entity resolution catalogs: *********************************************
  -    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/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.
  -
  -    There are various ways to do local configuration (see "Entity Catalogs"
  -    documentation). One way is via the CatalogManager.properties file.
  -    As an additional method, you can specify the "local-catalog" parameter here.
  -
  -    local-catalog:
  -    The full filesystem pathname to a single local catalog file.
  -   <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
  -
  -    verbosity:
  -    The level of messages for status/debug (messages go to standard output)
  -    The following messages are provided ...
  -     0 = none
  -     1 = ? (... not sure yet)
  -     2 = 1+, Loading catalog, Resolved public, Resolved system
  -     3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
  -     10 = 3+, List all catalog entries when loading a catalog
  -    (Cocoon also logs the "Resolved public" messages.) 
  -    TODO: determine all messages at each level
  -   <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="verbosity" value="1"/>
  -  </entity-resolver>
  -
   <!-- ================ Apache Cocoon configuration file ================== -->
   <!-- For full description of the components and their parameters ...
        - Apache Cocoon User Documentation at /userdocs/
  @@ -190,6 +13,9 @@
   
   <!-- ===================== General Components =========================== -->
   
  +  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser" 
  +              logger="core.xml-parser" pool-grow="4" pool-max="32" pool-min="8">
  +
     <!-- Parser:
       The default parser used in Apache Cocoon is
       org.apache.avalon.excalibur.xml.JaxpParser. Apache Cocoon requires a 
  @@ -231,14 +57,12 @@
           DocumentBuilderFactory implementation to be used (similar to
           sax-parser-factory for DOM).
     -->
  -  <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
  -              logger="core.xml-parser">
       <parameter name="validate" value="false"/>
       <parameter name="namespace-prefixes" value="false"/>
       <parameter name="stop-on-warning" value="true"/>
       <parameter name="stop-on-recoverable-error" value="true"/>
  +    <parameter name="reuse-parsers" value="false"/>
       <!--
  -    <parameter name="reuse-parsers" value="true"/>
       <parameter name="sax-parser-factory" value="???"/>
       <parameter name="document-builder-factory" value="???"/>
       -->
  @@ -248,41 +72,22 @@
     <!-- Persistent store for the cache. Two store implementations to choose
          from:
            * FilesystemStore: Simple. Dependable. Thorougly tested.
  -         * JispFilesystemStore: Scalable. New kid on the block. Not thorougly tested.
  -       If you opt in to use JispFilesystemStore, comment out FilesystemStore
  -       entry.
  -
  -       JispFilesystemStore configuration parameters
  -       (in addition to common parameters):
  -         datafile: name of the store file to use.
  -         indexfile: name of the index file to use.
  -         order: FIXME: put description here.
  -
  -  <cache-persistent class="org.apache.cocoon.components.store.JispFilesystemStore"
  -                    logger="core.store.persistent">
  -    <parameter name="use-cache-directory" value="true"/>
  -    <parameter name="datafile" value="cocoon-cache.dat"/>
  -    <parameter name="indexfile" value="cocoon-cache.idx"/>
  -    <parameter name="order" value="1701"/>
  -  </cache-persistent>
  -
  -  <cache-persistent class="org.apache.cocoon.components.store.FilesystemStore"
  -                    logger="core.store.persistent">
  -    <parameter name="use-cache-directory" value="true"/>
  -  </cache-persistent>
  +         * JispFilesystemStore: Scalable. New kid on the block.
  +           
  +       Common configuration parameters:
  +         use-cache-directory: Indicates that cache directory specified in
  +                              web.xml should be used.
  +         use-work-directory: Indicates that work directory specified in
  +                             web.xml should be used.
  +         directory: Specifies directory to use. Absolute or relative to the
  +                    work directory.
     -->
  -  
  -  <cache-persistent class="org.apache.cocoon.components.store.JispFilesystemStore"
  -                    logger="core.store.persistent">
  +  <persistent-store logger="core.store.persistent">
       <parameter name="use-cache-directory" value="true"/>
  -    <parameter name="datafile" value="cocoon-cache.dat"/>
  -    <parameter name="indexfile" value="cocoon-cache.idx"/>
  -    <parameter name="order" value="1701"/>
  -  </cache-persistent>
  -  
  +  </persistent-store>
  +
     <!-- Memory Storing: -->
  -  <cache-transient class="org.apache.cocoon.components.store.MRUMemoryStore"
  -         logger="core.store.transient">
  +  <transient-store logger="core.store.transient">
        <!-- Indicates how many objects will be hold in the cache.
        When the number of maxobjects has been reached. The last object in the 
        cache will be thrown out. -->
  @@ -291,25 +96,23 @@
        <!-- Turns the swapping of the objects into persistent cache on
             and off. -->
        <parameter name="use-persistent-cache" value="true"/>
  -  </cache-transient>
  +  </transient-store>
   
     <!-- Store Janitor:
       Be careful with the heapsize and freememory parameters. Wrong values can
       cause high cpu usage. Example configuration:
       Jvm settings: 
  -      -Xms100000000 -Xmx200000000
  +       -Xmx200000000
       store-janitor settings:
          <parameter name="freememory" value="5000000"/>
          <parameter name="heapsize" value="150000000"/>
     
  -    Heapsize *must* be higher then the -Xms parameter and *must* be lower or
  -    equal than -Xmx. It is recommended to have heapsize equal to -Xmx, especially
  +    It is recommended to have heapsize equal to -Xmx, especially
       on Sun's JVM which are unable to shrink its heap once it grows above minimum. 
  -    Freememory parameter *must* be lower than -Xms, and should be greater than
  -    amount of memory necessary for normal application operation.
  +    Freememory should be greater than amount of memory necessary for normal 
  +    application operation.
     -->
  -  <store-janitor class="org.apache.cocoon.components.store.StoreJanitorImpl"
  -                 logger="core.store.janitor">
  +  <store-janitor logger="core.store.janitor">
        <!-- How much free memory shall be available in the jvm -->                 
        <parameter name="freememory" value="1000000"/>
        <!-- Indicates the limit of the jvm memory consumption. The default max 
  @@ -326,35 +129,71 @@
     <!-- ============================ STORE END ========================= -->
   
     <!-- XSLT Processor:
  -    For Xalan: Turn 'incremental-processing' to true if you want a continous output (if set to 
  -false the transformer 
  -    delivers SAX events after all transformations has been done). -->
  -  <xslt-processor class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"
  -                  logger="core.xslt-processor">
  -     <parameter name="use-store" value="true"/>
  -     <parameter name="incremental-processing" value="false"/>
  +    For Xalan: Turn 'incremental-processing' to true if you want a continous output 
  +    (if set to false the transformer delivers SAX events after all transformations has been done). 
  +  -->
  +  <xslt-processor logger="core.xslt-processor">
  +     <parameter name="use-store" value="false"/> 
  +     <parameter name="incremental-processing" value="true"/>
     </xslt-processor>
   
     <!-- Xpath Processor:
     -->
  -  <xpath-processor class="org.apache.cocoon.components.xpath.XPathProcessorImpl"
  -                   logger="core.xpath-processor"/>
  +  <xpath-processor class="org.apache.avalon.excalibur.xml.xpath.XPathProcessorImpl" logger="core.xpath-processor"/>
   
     <!-- URL Factory:
       The url factory adds special url protocols to the system, they are then
       available inside Cocoon, e.g. as a source argument for one of the sitemap
       components.
  +    THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE 
     -->
     <url-factory logger="core.url-factory">
       <!-- Allows access to resources available from the ClassLoader,
            using getResource() method. -->
  -    <protocol name="resource" class="org.apache.cocoon.components.url.ResourceURLFactory"/>
  +    <protocol class="org.apache.cocoon.components.url.ResourceURLFactory" name="resource"/>
       <!-- Allows access to resources available from the servlet context,
            using getResource() method. -->
  -    <protocol name="context"  class="org.apache.cocoon.components.url.ContextURLFactory"/>
  +    <protocol class="org.apache.cocoon.components.url.ContextURLFactory" name="context"/>
       <!-- Add here protocol factories for your own protocols -->
     </url-factory>
   
  +  <!-- Source Handler:
  +    The source handler adds special url protocols to the system, they are
  +    then available inside Cocoon, e.g. as a source argument for one of the
  +    sitemap components.
  +    THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE 
  +  -->
  +  <source-handler logger="core.source-handler">
  +    <!-- file protocol : this is a WriteableSource -->
  +    <protocol class="org.apache.cocoon.components.source.FileSourceFactory" name="file"/>
  +
  +  
  +
  +
  +</source-handler>
  +
  +  <!-- Source Factories
  +       Each source factory adds a special uri protocol to the system.
  +       This will replace the source-handler and url-factory components.
  +  -->
  +  <source-factories>
  +      <component-instance class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
  +      <component-instance class="org.apache.cocoon.components.source.impl.ContextSourceFactory" name="context"/>
  +      <component-instance class="org.apache.cocoon.components.source.impl.CocoonSourceFactory" name="cocoon"/>
  +      <!-- file protocol : this is a WriteableSource -->
  +      <component-instance class="org.apache.cocoon.components.source.impl.FileSourceFactory" name="file"/>
  +  
  +
  +
  +
  +</source-factories>
  +
  +  <!-- The XMLizer converts different mime-types to XML -->
  +  <xmlizer>
  +      <component-instance class="org.apache.excalibur.xmlizer.impl.TextXMLizer" name="text/xml"/>
  +      <component-instance class="org.apache.excalibur.xmlizer.impl.HTMLXMLizer" name="text/html"/>
  +  </xmlizer>
  +
     <!-- Program Generator:
       The ProgamGenerator builds programs from a XML document written in a
       MarkupLanguage.
  @@ -368,44 +207,31 @@
       <parameter name="preload" value="true"/>
     </program-generator>
   
  -  <!-- Xscript:
  -  -->
  -  <xscript logger="core.xscript">
  -    <parameter name="xscript:copy-of" 
  -value="resource://org/apache/cocoon/components/xscript/xslt/copy-of.xsl"/>
  -    <parameter name="xscript:value-of" 
  -value="resource://org/apache/cocoon/components/xscript/xslt/value-of.xsl"/>
  -  </xscript>
  -
     <!-- Programming Languages: -->
     <programming-languages>
  -    <java-language name="java" logger="core.language.java">
  -      <!-- Compiler parameter specifies which class to use to compile Java.
  -           Possible variants are:
  -             Javac. Requires javac.jar (included with Cocoon distribution).
  -             Pizza. Requires pizza.jar (included with Cocoon distribution).
  -             Jikes. Requires IBM jikes compiler to be present in the PATH  -->
  -      <parameter name="compiler" 
  -value="org.apache.cocoon.components.language.programming.java.Javac"/>
  +    <java-language logger="core.language.java" name="java">
         <!-- Specifies which formatter to use to format source code.
              This parameter is optional. 
  -           It is commented out because of bug #5689: Java "code-formatter" incorrectly formats 
  -double values
  -      <parameter name="code-formatter" 
  -value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/>
  +           It is commented out because of bug #5689: Java "code-formatter" incorrectly formats double values
  +      <parameter name="code-formatter" value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/>
         -->
         <!-- A singleton-like implementation of a ClassLoader -->
  -      <parameter name="class-loader" 
  -value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
  -    </java-language>
  +      <parameter name="class-loader" value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
  +    
  +      <!-- Compiler parameter specifies which class to use to compile Java.
  +           Possible variants are:
  +             Javac. Requires javac.jar (included with JDK as lib/toools.jar).
  +             Pizza. Requires pizza.jar (included with Cocoon distribution).
  +             Jikes. Requires IBM jikes compiler to be present in the PATH  -->
  +      <parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.Javac"/>
  +</java-language>
   
  -  </programming-languages>
  +</programming-languages>
   
     <!-- Class loader:
       A singleton-like implementation of a ClassLoader.
     -->
  -  <classloader class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"
  -               logger="core.classloader"/>
  +  <classloader class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl" logger="core.classloader"/>
     
     <!-- Markup Languages:
       This section defines several builtin logicsheets. A logicsheet is an XML
  @@ -413,22 +239,20 @@
       code embedding directives for a given markup language.
     -->
     <markup-languages>
  -    <xsp-language name="xsp" logger="core.markup.xsp">
  +    <xsp-language logger="core.markup.xsp" name="xsp">
         <parameter name="prefix" value="xsp"/>
         <parameter name="uri" value="http://apache.org/xsp"/>
   
  -      <!-- Defines the XSP Core logicsheet for the Java language -->
         <target-language name="java">
  -        <parameter name="core-logicsheet" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
  +        <!-- Defines the XSP Core logicsheet for the Java language -->
  +        <parameter name="core-logicsheet" value="resource://org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl"/>
           
           <!-- The Request logicsheet (taglib) is an XSP logicsheet that wraps XML tags 
                around standard request operations -->
           <builtin-logicsheet>
             <parameter name="prefix" value="xsp-request"/>
             <parameter name="uri" value="http://apache.org/xsp/request/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/request.xsl"/>
           </builtin-logicsheet>
          
           <!-- The Response logicsheet (taglib) is an XSP logicsheet that wraps XML tags 
  @@ -436,8 +260,7 @@
           <builtin-logicsheet>
             <parameter name="prefix" value="xsp-response"/>
             <parameter name="uri" value="http://apache.org/xsp/response/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/response.xsl"/>
           </builtin-logicsheet>
   
           <!-- The Session logicsheet (taglib) is an XSP logicsheet that wraps XML tags around 
  @@ -445,10 +268,9 @@
                XML interface to most methods of the HttpSession object (see the Java Servlet API 
                Specification, version 2.2 ) for more information. -->
           <builtin-logicsheet>
  -          <parameter name="prefix" value="session"/>
  +          <parameter name="prefix" value="xsp-session"/>
             <parameter name="uri" value="http://apache.org/xsp/session/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/session.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/session.xsl"/>
           </builtin-logicsheet>
   
           <!-- The Cookie logicsheet (taglib) is an XSP logicsheet that wraps XML tags 
  @@ -456,8 +278,7 @@
           <builtin-logicsheet>
             <parameter name="prefix" value="xsp-cookie"/>
             <parameter name="uri" value="http://apache.org/xsp/cookie/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/cookie.xsl"/>
           </builtin-logicsheet>
   
           <!-- The ESQL logicsheet is an XSP logicsheet that performs sql queries and 
  @@ -466,22 +287,19 @@
           <builtin-logicsheet>
             <parameter name="prefix" value="esql"/>
             <parameter name="uri" value="http://apache.org/cocoon/SQL/v2"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/esql.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/esql.xsl"/>
           </builtin-logicsheet>
   
           <builtin-logicsheet>
             <parameter name="prefix" value="log"/>
             <parameter name="uri" value="http://apache.org/xsp/log/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/log.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/log.xsl"/>
           </builtin-logicsheet>
   
           <builtin-logicsheet>
             <parameter name="prefix" value="util"/>
             <parameter name="uri" value="http://apache.org/xsp/util/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/util.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/util.xsl"/>
           </builtin-logicsheet>
           
           <!-- The xsp-formval taglib serves as interface to retrieve validation results 
  @@ -489,8 +307,7 @@
           <builtin-logicsheet>
             <parameter name="prefix" value="xsp-formval"/>
             <parameter name="uri" value="http://apache.org/xsp/form-validator/2.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/form-validator.xsl"/>
           </builtin-logicsheet>
   
           <!-- The sel taglib allows to put multiple pages / view into
  @@ -501,15 +318,13 @@
           <builtin-logicsheet>
             <parameter name="prefix" value="sel"/>
             <parameter name="uri" value="http://apache.org/xsp/sel/1.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/sel.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/sel.xsl"/>
           </builtin-logicsheet>
   
           <builtin-logicsheet>
             <parameter name="prefix" value="action"/>
             <parameter name="uri" value="http://apache.org/cocoon/action/1.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/action.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/action.xsl"/>
           </builtin-logicsheet>
   
           <!-- The capture taglib is for capturing parts of the XSP-generated XML as
  @@ -517,74 +332,32 @@
           <builtin-logicsheet>
             <parameter name="prefix" value="capture"/>
             <parameter name="uri" value="http://apache.org/cocoon/capture/1.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/capture.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/capture.xsl"/>
           </builtin-logicsheet>
   
           <builtin-logicsheet>
             <parameter name="prefix" value="xscript"/>
             <parameter name="uri" value="http://apache.org/xsp/xscript/1.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl"/>
           </builtin-logicsheet>
   
           <builtin-logicsheet>
             <parameter name="prefix" value="soap"/>
             <parameter name="uri" value="http://apache.org/xsp/soap/3.0"/>
  -          <parameter name="href" 
  -value="resource://org/apache/cocoon/components/language/markup/xsp/java/soap.xsl"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/soap.xsl"/>
           </builtin-logicsheet>
   
  -      </target-language>
  -        
  -    </xsp-language>
  -
  -    <!-- Defines Sitemap Core logicsheet for the Java language -->
  -    <sitemap-language name="sitemap" logger="core.markup.sitemap">
  -      <parameter name="prefix" value="map"/>
  -      <parameter name="uri" value="http://apache.org/cocoon/sitemap/1.0"/>
  +        <builtin-logicsheet>
  +          <parameter name="prefix" value="jpath"/>
  +          <parameter name="uri" value="http://apache.org/xsp/jpath/1.0"/>
  +          <parameter name="href" value="resource://org/apache/cocoon/components/language/markup/xsp/java/jpath.xsl"/>
  +        </builtin-logicsheet>
   
  -      <target-language name="java">
  -        <parameter name="core-logicsheet" 
  -value="resource://org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl"/>
         </target-language>
  -    </sitemap-language>
  -  </markup-languages>
  +    
  +</xsp-language>
   
  -  <!-- Datasources example:
  -   <datasources>
  -    <jdbc name="personnel" logger="core.datasources.personnel">
  -      <pool-controller min="5" max="10" oradb="true"/>
  -      <pool-controller min="5" max="10"/>
  -      <auto-commit>false</auto-commit>
  -      <dburl>jdbc:hsqldb:hsql://localhost:9002</dburl>
  -      <user>sa</user>
  -      <password></password>
  -    </jdbc>
  -  </datasources>
  - -->
  - 
  -  <!-- Stream Pipeline:
  -    Either collects a Reader and lets it produce a character stream
  -    or connects an EventPipeline with a Serializer and lets them produce
  -    the character stream. Alternatives to CachingStreamPipeline are:
  -    <stream-pipeline class="org.apache.cocoon.components.pipeline.NonCachingStreamPipeline"/>
  -  -->
  -  <stream-pipeline class="org.apache.cocoon.components.pipeline.CachingStreamPipeline"
  -                   logger="core.stream-pipeline"
  -                   pool-max="32" pool-min="2" pool-grow="4"/>
  -
  -  <!-- Event Pipeline:
  -    Connects the generator and the various transformers and produces a
  -    character stream. Alternatives to CachingEventPipeline are:
  -    <event-pipeline class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
  -    <event-pipeline class="org.apache.cocoon.components.profiler.ProfilingCachingEventPipeline"/>
  -    <event-pipeline 
  -class="org.apache.cocoon.components.profiler.ProfilingNonCachingEventPipeline"/>
  -  -->
  -  <event-pipeline class="org.apache.cocoon.components.pipeline.CachingEventPipeline"
  -                  logger="core.event-pipeline"
  -                  pool-max="32" pool-min="2" pool-grow="4"/>
  +  </markup-languages>
   
     <!-- Compiling xml to byte streams.
       The xml-serializer "compiles" xml sax events into a byte stream
  @@ -593,65 +366,113 @@
       may have to change the other one as well, as they might have
       a dependency.
     -->
  -  <xml-serializer class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"
  -                  logger="core.xml-serializer"/>
  +  <xml-serializer class="org.apache.cocoon.components.sax.XMLByteStreamCompiler" logger="core.xml-serializer" pool-grow="4" pool-max="32" pool-min="8"/>
  +
  +  <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter" logger="core.xml-deserializer" pool-grow="4" pool-max="32" pool-min="8"/>
   
  -  <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
  -                    logger="core.xml-deserializer"/>
   
  -  <!-- SAXConnector:
  -    Connects the various pipeline components.
  -    LoggingSAXConnector logs SAX events between pipeline components
  -    into cocoon's log file.
  -    ProfilingSAXConnector gathers timing information.
  -    Uncomment one of the following lines for using the SAXConnector.
  -  <sax-connector class="org.apache.cocoon.components.saxconnector.LoggingSAXConnector"/>
  -  <sax-connector class="org.apache.cocoon.components.profiler.ProfilingSAXConnector"/>
  -  -->
  -
  -  <!-- Profiler:
  -    The profiler facilitates the gathering of statistics about timings of
  -    different steps of pipelines. Profiler consists of several components:
  -     profiling pipeline, profiling SAX connector, and profiler generator
  -    which are used to generate the profile report. You need to enable all of
  -    these components to use profiler.
  -
  -    Uncomment the following line to use profiler.
  -  <profiler/>
  -  -->
  -
  -  <!-- Resource Monitor:
  -    The Monitor keeps track on changes to a Resource.
  -  <monitor logger="core.monitor">
  -    <thread priority="5" frequency="10000"/>
  -  </monitor>
  -  -->
  -  
   <!-- ======================== The sitemap  ============================== -->
   
  -  <!-- Reloading of the sitemap:
  +  <!--
  +    New implementation of the sitemap. It is interpreted, so load times are super-fast,
  +    and request processing is slightly faster than with the compiled engine thanks to
  +    the HotSpot VM.
  +
  +    Reloading of the sitemap:
       The check-reload attribute determines if the sitemap is reloaded on change.
       Set to "no", the sitemap is generated once at startup.
       Set to "yes", the sitemap is regenerated if it changes.
   
  -    The reload-method specifies the method for the regeneration:
  -    asynchron: If the sitemap changes, the sitemap is regenerated at the
  -               next request in the background and the incoming request is
  -               served with the old sitemap. All subsequent requests are
  -               served with the old sitemap until the regeneration in the
  -               background has finished.
  -    synchron: If the sitemap changes, the sitemap is regenerated at the
  -              next request. When the regeneration is finished, the request
  -              (and all subsequent ones) is served with the new sitemap.
  -
  -    For development environment, set the reload-method to synchron and the
  -    check-reload to yes.
  -    For production environment, it is advisable to set the reload-method to
  -    asynchron and for more safety the check-reload to no.
  +    For development environment, set the check-reload to yes.
  +    For production environment, it is advisable to set the check-reload to no.
  +  -->
  +  <sitemap check-reload="yes" config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml" file="context://sitemap.xmap" logger="sitemap"/>
  +
  +
   
  -  <sitemap file="sitemap.xmap" reload-method="asynchron" check-reload="yes" logger="sitemap"/>
  -  -->  
   
  -  <sitemap class="org.apache.cocoon.treeprocessor.TreeProcessor" logger="sitemap"/>
   
  +  <!-- Entity resolution catalogs: *********************************************
  +    catalog:
  +    The default catalog is distributed at /WEB-INF/entities/catalog
  +    This is the contextual pathname for Cocoon resources.
  +    You can override this path, if necessary, using the "catalog" parameter.
  +   <parameter name="catalog" value="/WEB-INF/entities/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.
  +
  +    There are various ways to do local configuration (see "Entity Catalogs"
  +    documentation). One way is via the CatalogManager.properties file.
  +    As an additional method, you can specify the "local-catalog" parameter here.
  +
  +    local-catalog:
  +    The full filesystem pathname to a single local catalog file.
  +   <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
  +
  +    verbosity:
  +    The level of messages for status/debug (messages go to standard output)
  +    The following messages are provided ...
  +     0 = none
  +     1 = ? (... not sure yet)
  +     2 = 1+, Loading catalog, Resolved public, Resolved system
  +     3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
  +     10 = 3+, List all catalog entries when loading a catalog
  +    (Cocoon also logs the "Resolved public" messages.) 
  +    TODO: determine all messages at each level
  +   <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="verbosity" value="1"/>
  +  </entity-resolver>
  +
  +
  +   <!-- =============== Sitemap In/Out/Database Modules ==================== -->
  +   
  +   <input-modules logger="core.modules.input">
  +	  <component-instance class="org.apache.cocoon.components.modules.input.RequestParameterModule" name="request"/>
  +	  <component-instance class="org.apache.cocoon.components.modules.input.RequestAttributeModule" name="attribute"/>
  +	  <component-instance class="org.apache.cocoon.components.modules.input.RequestURIModule" name="URI"/>
  +	  <component-instance class="org.apache.cocoon.components.modules.input.HeaderAttributeModule" name="header"/>
  +	  <component-instance class="org.apache.cocoon.components.modules.input.SessionAttributeModule" name="session"/>
  +	  <component-instance class="org.apache.cocoon.components.modules.input.StringConstantModule" name="constant"/>
  +	  <component-instance class="org.apache.cocoon.components.modules.input.RandomNumberModule" name="random"/>
  +      <component-instance class="org.apache.cocoon.components.modules.input.CollectionMetaModule" name="collection"/>
  +      <component-instance class="org.apache.cocoon.components.modules.input.DigestMetaModule" name="digest"/>
  +      <component-instance class="org.apache.cocoon.components.modules.input.DateInputModule" name="date"/>
  +      <component-instance class="org.apache.cocoon.components.modules.input.NullInputModule" name="nullinput"/>
  +      <component-instance class="org.apache.cocoon.components.modules.input.DefaultsMetaModule" name="defaults">
  +		 <input-module name="request"/>
  +		 <values>
  +			<skin>defaultSkin</skin>
  +			<base-url>http://localhost:8080/cocoon</base-url>
  +		 </values>
  +	  </component-instance>
  +   </input-modules>
  +
  +   <output-modules logger="core.modules.output">
  +      <component-instance class="org.apache.cocoon.components.modules.output.RequestAttributeOutputModule" name="attribute"/>
  +      <component-instance class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule" name="session"/>
  +   </output-modules>
  +
  +   <autoincrement-modules logger="core.modules.auto">
  +      <component-instance class="org.apache.cocoon.components.modules.database.HsqlIdentityAutoIncrementModule" name="auto"/>
  +<!--
  +      Choose the one suitable for your DBMS. You *can* have more than
  +      one at a time, but they need to have different names. You then
  +      need to specify explicitly, which one to use in your descriptor
  +      file.
  +
  +      <component-instance name="auto" class="org.apache.cocoon.components.modules.database.ManualAutoIncrementModule"/>
  +      <component-instance name="auto" class="org.apache.cocoon.components.modules.database.IfxSerialAutoIncrementModule"/>
  +      <component-instance name="auto" class="org.apache.cocoon.components.modules.database.MysqlAutoIncrementModule"/>
  +-->
  +   </autoincrement-modules>
   </cocoon>
  +
  +
  +
  +
  +
  
  
  
  1.2       +20 -0     xml-forrest/src/resources/conf/logkit.xconf
  
  Index: logkit.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/logkit.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logkit.xconf	29 May 2002 16:44:56 -0000	1.1
  +++ logkit.xconf	22 Jul 2002 14:17:56 -0000	1.2
  @@ -49,6 +49,15 @@
         <append>false</append>
       </cocoon>
      
  +    <!-- The logger for the flow layer -->
  +    <cocoon id="flow">
  +      <filename>${context-root}/WEB-INF/logs/flow.log</filename>
  +      <format type="cocoon">
  +        %7.7{priority} %{time}   [%{category}] (%{uri}) %{thread}/%{class:short}: %{message}\n%{throwable}
  +      </format>
  +      <append>false</append>
  +    </cocoon>
  +
       <!--
         This log file gets only messages with log level ERROR and below.
       -->
  @@ -98,6 +107,12 @@
           <log-target id-ref="error"/>
         </category>
   
  +      <!-- Cocoon source repository logger -->
  +      <category name="repositories" log-level="INFO">
  +        <log-target id-ref="core"/>
  +        <log-target id-ref="error"/>
  +      </category>
  +
         <log-target id-ref="core"/>
         <log-target id-ref="error"/>
       </category>
  @@ -111,5 +126,10 @@
         <log-target id-ref="access"/>
         <log-target id-ref="error"/>
       </category> 
  +
  +    <category name="flow" log-level="DEBUG">
  +      <log-target id-ref="flow"/>
  +      <log-target id-ref="error"/>
  +    </category>
     </categories>
   </logkit>
  
  
  
  1.11      +24 -1     xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sitemap.xmap	11 Jul 2002 08:54:54 -0000	1.10
  +++ sitemap.xmap	22 Jul 2002 14:17:56 -0000	1.11
  @@ -17,12 +17,22 @@
     </map:generators>
   
     <map:transformers default="xslt">
  +  <!--
      <map:transformer     name="xslt"      src="org.apache.cocoon.transformation.TraxTransformer">
       <use-request-parameters>false</use-request-parameters>
       <use-browser-capabilities-db>false</use-browser-capabilities-db>
      </map:transformer>
  +  -->
  +    <map:transformer name="xslt" src="org.apache.cocoon.transformation.TraxTransformer"
  +                        logger="sitemap.transformer.xsltc"
  +                        pool-max="32" pool-min="8" pool-grow="2">
  +      <use-request-parameters>false</use-request-parameters>
  +      <use-browser-capabilities-db>false</use-browser-capabilities-db>
  +      <use-deli>false</use-deli>
  +      <!-- transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory -->
  +    </map:transformer>
     </map:transformers>
  -
  +      
     <map:readers default="resource">
      <map:reader name="resource"       src="org.apache.cocoon.reading.ResourceReader"/>
     </map:readers>
  @@ -61,6 +71,19 @@
   
     </map:selectors>
   -->
  +
  +    <!--
  +     The different pipeline implementations
  +  -->
  +  <map:pipelines default="caching">
  +     <map:pipeline name="caching" src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
  +     <map:pipeline name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
  +     <!-- The following two can be used for profiling:
  +     <map:pipeline name="profile-caching" src="org.apache.cocoon.components.profiler.ProfilingCachingProcessingPipeline"/>
  +     <map:pipeline name="profile-noncaching" src="org.apache.cocoon.components.profiler.ProfilingNonCachingProcessingPipeline"/>
  +     -->
  +  </map:pipelines>
  +  
    </map:components>
   
   <!-- =========================== Views =================================== -->
  
  
  

Mime
View raw message