cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/source/impl SitemapSource.java
Date Mon, 29 Apr 2002 07:36:03 GMT
cziegeler    02/04/29 00:36:03

  Modified:    .        changes.xml
               src/documentation cocoon.xconf
               src/java/org/apache/cocoon/components/source/impl
                        SitemapSource.java
  Log:
  Fixing documentation xconf and fixing changes
  
  Revision  Changes    Path
  1.152     +2 -2      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- changes.xml	28 Apr 2002 20:57:54 -0000	1.151
  +++ changes.xml	29 Apr 2002 07:36:03 -0000	1.152
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.151 2002/04/28 20:57:54 haul Exp $
  +  $Id: changes.xml,v 1.152 2002/04/29 07:36:03 cziegeler Exp $
   -->
   
   <changes title="History of Changes">
  @@ -43,7 +43,7 @@
     <action dev="CH" type="add">
      Additional input modules: Date, Digest, ConstantString, Random, NullInput, Collection
     </action>
  -  <action dev="CH" type="fix" due-to="Jürgen Ehms">
  +  <action dev="CH" type="fix" due-to="J&#252;rgen Ehms">
      Sendmail logicsheet works again.
     </action>
     <action dev="CH" type="add">
  
  
  
  1.10      +34 -36    xml-cocoon2/src/documentation/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/cocoon.xconf,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- cocoon.xconf	17 Mar 2002 13:32:06 -0000	1.9
  +++ cocoon.xconf	29 Apr 2002 07:36:03 -0000	1.10
  @@ -4,18 +4,18 @@
   <!-- ================ Apache Cocoon configuration file ================== -->
   <!-- For full description of the components and their parameters ...
        - Apache Cocoon User Documentation at /userdocs/
  -     - webapp/cocoon.xconf - describes each core component
  +     - webapp/cocoon.xconf (this file) - describes each core component
        - each optional component/.../*.xconf - these describe the parameters
        for each component and are automatically included at build-time.
   
        This configuration is tuned for the documentation webapp, and is terse.
   -->
   
  -  <!-- ==================== General Components ========================== -->
  +<!-- ===================== General Components =========================== -->
   
  -  <!-- Parser -->
  +  <!-- Parser:  -->
     <xml-parser class="org.apache.avalon.excalibur.xml.JaxpParser"
  -          logger="core.parser">
  +              logger="core.xml-parser">
       <parameter name="validate" value="false"/>
     </xml-parser>
   
  @@ -58,29 +58,35 @@
     </store-janitor>
     <!-- ============================ STORE END ========================= -->
   
  -  <!-- Entity resolution catalogs -->
  -  <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
  -            logger="core.resolver">
  -    <parameter name="catalog" value="/resources/entities/catalog"/>
  -    <parameter name="verbosity" value="1"/>
  -  </entity-resolver>
  -
     <!-- XSLT Processor -->
     <xslt-processor class="org.apache.cocoon.components.xslt.XSLTProcessorImpl"
  -                  logger="core.xslt">
  +                  logger="core.xslt-processor">
        <parameter name="use-store" value="true"/>
     </xslt-processor>
   
  -  <!-- URL Factory -->
  + <!-- URL Factory:
  +    THIS COMPONENT IS DEPRECATED AND SHOULD NOT BE USED ANYMORE 
  +  -->
     <url-factory logger="core.url-factory">
       <protocol name="resource" class="org.apache.cocoon.components.url.ResourceURLFactory"/>
       <protocol name="context"  class="org.apache.cocoon.components.url.ContextURLFactory"/>
     </url-factory>
   
  -  <!-- Source Handler -->
  -  <source-handler logger="core.source-handler">
  -  </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"/>
  +</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 -->
     <program-generator logger="core.program-generator">
       <parameter name="auto-reload" value="true"/>
  @@ -100,32 +106,24 @@
     <classloader class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"
                  logger="core.classloader"/>
   
  -  <!-- Markup Languages -->
  -  <markup-languages>
  -    <!-- xsp-language is not used in documentation webapp -->
  -
  -    <sitemap-language name="sitemap" logger="core.markup.sitemap">
  -      <parameter name="prefix" value="map"/>
  -      <parameter name="uri" value="http://apache.org/cocoon/sitemap/1.0"/>
  -
  -      <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>
  -
     <!-- Stream Pipeline -->
     <stream-pipeline class="org.apache.cocoon.components.pipeline.CachingStreamPipeline"
  -                   pool-max="16" pool-min="4" pool-grow="2"
  -                   logger="core.pipeline.stream"/>
  +                   logger="core.stream-pipeline"
  +                   pool-max="32" pool-min="8" pool-grow="4"/>
   
     <!-- Event Pipeline -->
     <event-pipeline class="org.apache.cocoon.components.pipeline.CachingEventPipeline"
  -                  pool-max="16" pool-min="4" pool-grow="2"
  -                  logger="core.pipeline.event"/>
  +                  logger="core.event-pipeline"
  +                  pool-max="32" pool-min="8" pool-grow="4"/>
   
  +  <!-- Entity resolution catalogs -->
  +  <entity-resolver class="org.apache.cocoon.components.resolver.ResolverImpl"
  +            logger="core.resolver">
  +    <parameter name="catalog" value="/resources/entities/catalog"/>
  +    <parameter name="verbosity" value="1"/>
  +  </entity-resolver>
   <!-- ======================== The sitemap  ============================== -->
              
  -  <sitemap class="org.apache.cocoon.components.treeprocessor.TreeProcessor" logger="sitemap"/>
  +  <sitemap file="sitemap.xmap" check-reload="yes" logger="sitemap"/>
                
   </cocoon>
  
  
  
  1.4       +2 -1      xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
  
  Index: SitemapSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SitemapSource.java	25 Apr 2002 09:30:48 -0000	1.3
  +++ SitemapSource.java	29 Apr 2002 07:36:03 -0000	1.4
  @@ -95,7 +95,7 @@
    * Description of a source which is defined by a pipeline.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: SitemapSource.java,v 1.3 2002/04/25 09:30:48 cziegeler Exp $
  + * @version CVS $Id: SitemapSource.java,v 1.4 2002/04/29 07:36:03 cziegeler Exp $
    */
   
   public final class SitemapSource
  @@ -401,6 +401,7 @@
               // Preserve original exception
               throw e;
           } catch (Exception e) {
  +            e.printStackTrace();
               throw new SAXException("Exception during processing of "
                                             + this.systemId, e);
           } finally {
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message