You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/07/03 02:44:55 UTC

cvs commit: cocoon-2.0/src/webapp/WEB-INF cocoon.xconf

vgritsenko    2003/07/02 17:44:55

  Modified:    src/webapp/WEB-INF cocoon.xconf
  Log:
  Add back removed context URL factory. URL factory is still in use by:
   * AbstractMarkupLanguage.java
   * AbstractSitemap.java
   * FOPSerializer.java
   * HTMLGenerator.java
   * TreeProcessor.java
   * XScriptObjectFromURL.java
   * XSPUtil.java
   * XTTransformer.java
  and some other files.
  
  Revision  Changes    Path
  1.5       +27 -21    cocoon-2.0/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cocoon.xconf	6 Jun 2003 20:23:03 -0000	1.4
  +++ cocoon.xconf	3 Jul 2003 00:44:55 -0000	1.5
  @@ -183,30 +183,36 @@
        <parameter name="use-store" value="false"/>
        <parameter name="transformer-factory" value="com.icl.saxon.TransformerFactoryImpl"/>
     </component>
  -  +-->
  +      +-->
   
  -  <!-- Xpath Processor:
  -  -->
  +  <!--+
  +      | Xpath Processor:
  +      +-->
     <xpath-processor class="org.apache.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.
  -  -->
  +  <!--+
  +      | 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.
  +      +-->
     <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"/>
  +    <!-- Allows access to resources available from the servlet context,
  +         using getResource() method. -->
  +    <protocol name="context" class="org.apache.cocoon.components.url.ContextURLFactory"/>
       <!-- 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.
  -  -->
  +  <!--+ 
  +      | 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"/>
  @@ -216,13 +222,14 @@
   
     </source-handler>
   
  -  <!-- Program Generator:
  -    The ProgamGenerator builds programs from a XML document written in a
  -    MarkupLanguage.
  -       auto-reload:
  -       root-package: persistent code repository.
  -       preload:
  -  -->
  +  <!--+
  +      | Program Generator.
  +      | The ProgamGenerator builds programs from an XML document written in a
  +      | MarkupLanguage.
  +      | auto-reload: reload program on source change.
  +      | root-package: persistent code repository.
  +      | preload:
  +      +-->
     <program-generator logger="core.program-generator">
       <parameter name="auto-reload" value="true"/>
       <parameter name="root-package" value="org.apache.cocoon.www"/>
  @@ -543,6 +550,5 @@
     <sitemap class="org.apache.cocoon.sitemap.SitemapManager"
              file="sitemap.xmap" reload-method="synchron" check-reload="yes" logger="sitemap"/>
     -->
  -
   
   </cocoon>