cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From step...@apache.org
Subject cvs commit: xml-cocoon2/src/webapp/WEB-INF cocoon.xconf
Date Wed, 21 Aug 2002 06:15:32 GMT
stephan     2002/08/20 23:15:32

  Modified:    src/java/org/apache/cocoon cocoon.roles
               src/java/org/apache/cocoon/generation velocity.xmap
               src/java/org/apache/cocoon/serialization fop.xmap svg.xmap
               src/webapp sitemap.xmap
               src/webapp/WEB-INF cocoon.xconf
  Added:       src/java/org/apache/cocoon/components/deli deli.xroles
               src/java/org/apache/cocoon/components/flow flow.xroles
               src/java/org/apache/cocoon/components/hsqldb hsqldb.xroles
               src/java/org/apache/cocoon/components/modules modules.xroles
               src/java/org/apache/cocoon/components/profiler
                        profiler.xconf profiler.xmap profiler.xroles
               src/java/org/apache/cocoon/components/sax serializer.xconf
                        serializer.xroles
               src/java/org/apache/cocoon/components/search lucene.xroles
               src/java/org/apache/cocoon/components/store store.xroles
               src/java/org/apache/cocoon/generation ProfilerGenerator.java
                        chaperon.xmap profiler.xmap
               src/java/org/apache/cocoon/transformation chaperon.xmap
  Removed:     src/java/org/apache/cocoon/components/profiler
                        ProfilerGenerator.java
  Log:
  Move some entries of cocoon.roles, sitemap.xmap and cocoon.xconf
  into separate files.
  Prepare the speparation of the 'modules'.
  
  Revision  Changes    Path
  1.35      +0 -55     xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- cocoon.roles	13 Aug 2002 08:30:19 -0000	1.34
  +++ cocoon.roles	21 Aug 2002 06:15:30 -0000	1.35
  @@ -52,9 +52,6 @@
           shorthand="browser"
           default-class="org.apache.cocoon.components.browser.BrowserImpl"/>
   
  -  <role name="org.apache.cocoon.components.deli.Deli"
  -        shorthand="deli"/>
  -
     <role name="org.apache.cocoon.Processor"
           shorthand="sitemap"
           default-class="org.apache.cocoon.components.treeprocessor.TreeProcessor"/>
  @@ -123,14 +120,6 @@
           shorthand="xml-deserializer"
           default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"/>
   
  -  <role name="org.apache.cocoon.components.hsqldb.Server"
  -        shorthand="hsqldb-server"
  -        default-class="org.apache.cocoon.components.hsqldb.ServerImpl"/>
  -
  -  <role name="org.apache.cocoon.components.profiler.Profiler"
  -        shorthand="profiler"
  -        default-class="org.apache.cocoon.components.profiler.SimpleProfiler"/>
  -
     <role name="org.apache.cocoon.components.xscript.XScriptManager"
           shorthand="xscript"
           default-class="org.apache.cocoon.components.xscript.XScriptManagerImpl"/>
  @@ -139,23 +128,6 @@
           shorthand="cache"
           default-class="org.apache.cocoon.caching.impl.CacheImpl"/>
   
  -  <!-- Lucene Components -->
  -  <role name="org.apache.cocoon.components.search.LuceneCocoonIndexer"
  -    shorthand="cocoon-indexer"
  -    default-class="org.apache.cocoon.components.search.SimpleLuceneCocoonIndexerImpl"/>
  -  
  -  <role name="org.apache.cocoon.components.search.LuceneCocoonSearcher"
  -    shorthand="cocoon-searcher"
  -    default-class="org.apache.cocoon.components.search.SimpleLuceneCocoonSearcherImpl"/>
  -  
  -  <role name="org.apache.cocoon.components.search.LuceneXMLIndexer"
  -    shorthand="lucene-xml-indexer"
  -    default-class="org.apache.cocoon.components.search.SimpleLuceneXMLIndexerImpl"/>
  -
  -  <role name="org.apache.cocoon.components.crawler.CocoonCrawler"
  -    shorthand="cocoon-crawler"
  -    default-class="org.apache.cocoon.components.crawler.SimpleCocoonCrawlerImpl"/>
  -
     <!-- Sitemap Roles -->
     <role name="org.apache.cocoon.acting.ActionSelector"
           shorthand="actions"
  @@ -188,33 +160,6 @@
     <role name="org.apache.cocoon.components.pipeline.ProcessingPipelineSelector"
           shorthand="pipelines"
           default-class="org.apache.cocoon.sitemap.DefaultSitemapComponentSelector"/>
  -
  -  <!-- input / output / database modules -->
  -
  -  <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
  -        shorthand="input-modules"
  -        default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  -
  -  <role name="org.apache.cocoon.components.modules.output.OutputModuleSelector"
  -        shorthand="output-modules"
  -        default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  -
  -  <role name="org.apache.cocoon.components.modules.database.AutoIncrementModuleSelector"
  -        shorthand="autoincrement-modules"
  -        default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  -
  -
  -  <!-- Control flow layer: the interpreters selector and continuations
  -       manager
  -    -->
  -
  -  <role name="org.apache.cocoon.components.flow.Interpreter"
  -        default-class="org.apache.cocoon.components.flow.InterpreterSelector"
  -        shorthand="flow-interpreters"/>
  -
  -  <role name="org.apache.cocoon.components.flow.ContinuationsManager"
  -        default-class="org.apache.cocoon.components.flow.ContinuationsManagerImpl"
  -        shorthand="continuations"/>
   
     <!-- DEPRECATED, use the avalon excalibur entity-resolver instead -->
     <role name="org.apache.cocoon.components.resolver.Resolver"
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/deli/deli.xroles
  
  Index: deli.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.deli.Deli']">
  
    <role name="org.apache.cocoon.components.deli.Deli"
          shorthand="deli"
          default-class="org.apache.cocoon.components.deli.DeliImpl"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/flow/flow.xroles
  
  Index: flow.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.flow.Interpreter']">
  
    <!-- Control flow layer: the interpreters selector and continuations
         manager
      -->
    <role name="org.apache.cocoon.components.flow.Interpreter" default-class="org.apache.cocoon.components.flow.InterpreterSelector"
shorthand="flow-interpreters"/>
  
    <role name="org.apache.cocoon.components.flow.ContinuationsManager" default-class="org.apache.cocoon.components.flow.ContinuationsManagerImpl"
shorthand="continuations"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/hsqldb.xroles
  
  Index: hsqldb.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.hsqldb.Server']">
  
    <role name="org.apache.cocoon.components.hsqldb.Server" shorthand="hsqldb-server" default-class="org.apache.cocoon.components.hsqldb.ServerImpl"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/modules/modules.xroles
  
  Index: modules.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.modules.input.InputModuleSelector']">
    <!-- input / output / database modules -->
  
    <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
          shorthand="input-modules"
          default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  
    <role name="org.apache.cocoon.components.modules.output.OutputModuleSelector"
          shorthand="output-modules"
          default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  
    <role name="org.apache.cocoon.components.modules.database.AutoIncrementModuleSelector"
          shorthand="autoincrement-modules"
          default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/profiler/profiler.xconf
  
  Index: profiler.xconf
  ===================================================================
  <?xml version="1.0"?>
  <xconf xpath="/cocoon" unless="profiler">
  
    <!-- Profiler:
      The profiler facilitates the gathering of statistics about timings of
      different steps of pipelines. Profiler consists of several components:
       profiling pipeline and profiler generator
      which are used to generate the profile report. You need to enable all of
      these components to use profiler.
      -->
    <profiler results="10">
      <connector class="org.apache.cocoon.components.profiler.ProfilingSAXBufferConnector"/>
    </profiler>
  </xconf>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/profiler/profiler.xmap
  
  Index: profiler.xmap
  ===================================================================
  <?xml version="1.0"?>
  <xmap xpath="/sitemap/components/pipelines" unless="pipeline[@name='profile-caching']">
       <!-- 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"/>
  </xmap>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/profiler/profiler.xroles
  
  Index: profiler.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.profiler.Profiler']">
  
    <role name="org.apache.cocoon.components.profiler.Profiler"
          shorthand="profiler"
          default-class="org.apache.cocoon.components.profiler.SimpleProfiler"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/sax/serializer.xconf
  
  Index: serializer.xconf
  ===================================================================
  <?xml version="1.0"?>
  <xconf xpath="/cocoon" unless="xml-serializer">
  
    <!-- Compiling xml to byte streams.
      The xml-serializer "compiles" xml sax events into a byte stream
      and the xml-deserializer does the same vice versa.
      Make sure, that if you change one of these components, that you
      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"
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"/>
  </xconf>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/sax/serializer.xroles
  
  Index: serializer.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.sax.XMLSerializer']">
  
    <role name="org.apache.cocoon.components.sax.XMLSerializer" shorthand="xml-serializer"
default-class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"/>
  
    <role name="org.apache.cocoon.components.sax.XMLDeserializer" shorthand="xml-deserializer"
default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/search/lucene.xroles
  
  Index: lucene.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.cocoon.components.search.LuceneCocoonIndexer']">
  
    <!-- Lucene Components -->
    <role name="org.apache.cocoon.components.search.LuceneCocoonIndexer" shorthand="cocoon-indexer"
  default-class="org.apache.cocoon.components.search.SimpleLuceneCocoonIndexerImpl"/>
  
    <role name="org.apache.cocoon.components.search.LuceneCocoonSearcher" shorthand="cocoon-searcher"
  default-class="org.apache.cocoon.components.search.SimpleLuceneCocoonSearcherImpl"/>
  
    <role name="org.apache.cocoon.components.search.LuceneXMLIndexer" shorthand="lucene-xml-indexer"
  default-class="org.apache.cocoon.components.search.SimpleLuceneXMLIndexerImpl"/>
  
    <role name="org.apache.cocoon.components.crawler.CocoonCrawler" shorthand="cocoon-crawler"
  default-class="org.apache.cocoon.components.crawler.SimpleCocoonCrawlerImpl"/>
  </xroles>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/components/store/store.xroles
  
  Index: store.xroles
  ===================================================================
  <?xml version="1.0"?>
  <xroles xpath="/role-list" unless="role[@name='org.apache.excalibur.store.Store']">
  
    <!-- Stores:
      -->
    <role name="org.apache.excalibur.store.Store" shorthand="persistent-store" default-class="org.apache.cocoon.components.store.impl.FilesystemStore"/>
  
    <role name="org.apache.excalibur.store.Store/TransientStore" shorthand="transient-store"
default-class="org.apache.excalibur.store.impl.MRUMemoryStore"/>
  
    <role name="org.apache.excalibur.store.StoreJanitor" shorthand="store-janitor" default-class="org.apache.excalibur.store.impl.StoreJanitorImpl"/>
  </xroles>
  
  
  
  1.2       +2 -6      xml-cocoon2/src/java/org/apache/cocoon/generation/velocity.xmap
  
  Index: velocity.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/velocity.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- velocity.xmap	9 Mar 2002 06:27:15 -0000	1.1
  +++ velocity.xmap	21 Aug 2002 06:15:31 -0000	1.2
  @@ -1,8 +1,4 @@
   <?xml version="1.0"?>
  -
  -<xmap xpath="/sitemap/components/generators"
  -      unless="generator[@name='velocity']">
  -    <map:generator name="velocity"
  -                   src="org.apache.cocoon.generation.VelocityGenerator"
  -                   label="content,data"/>
  +<xmap xpath="/sitemap/components/generators" unless="generator[@name='velocity']">
  +    <map:generator label="content,data" logger="sitemap.generator.velocity" name="velocity"
src="org.apache.cocoon.generation.VelocityGenerator"/>
   </xmap>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/generation/ProfilerGenerator.java
  
  Index: ProfilerGenerator.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.generation;
  
  import org.apache.avalon.framework.component.ComponentException;
  import org.apache.avalon.framework.component.ComponentManager;
  
  import org.apache.cocoon.components.profiler.Profiler;
  import org.apache.cocoon.components.profiler.ProfilerResult;
  
  import org.xml.sax.ContentHandler;
  import org.xml.sax.SAXException;
  import org.xml.sax.helpers.AttributesImpl;
  
  import java.text.DateFormat;
  import java.util.Collection;
  import java.util.Date;
  import java.util.Iterator;
  
  /**
   * Generates an XML representation of the current status of Profiler.
   *
   * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
   * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
   * @version CVS $Id: ProfilerGenerator.java,v 1.1 2002/08/21 06:15:31 stephan Exp $
   */
  public class ProfilerGenerator extends ComposerGenerator {
  
      /**
       * The XML namespace for the output document.
       */
      protected static final String namespace = "http://apache.org/cocoon/profiler/1.0";
  
      private Profiler profiler;
  
      /**
       * Composable
       */
      public void compose(ComponentManager manager)
      throws ComponentException {
          super.compose(manager);
          this.profiler = (Profiler)super.manager.lookup(Profiler.ROLE);
      }
  
      /**
       * Disposable
       */
      public void dispose() {
          if (this.profiler != null){
              super.manager.release(this.profiler);
              this.profiler = null;
          }
          super.dispose();
      }
  
      /**
       * Generate the status information in XML format.
       * @throws SAXException
       *         when there is a problem creating the output SAX events.
       */
      public void generate() throws SAXException {
  
          // Start the document and set the namespace.
          this.contentHandler.startDocument();
          this.contentHandler.startPrefixMapping("", namespace);
  
          generate(this.contentHandler);
  
          // End the document.
          this.contentHandler.endPrefixMapping("");
          this.contentHandler.endDocument();
      }
  
      /** Generate the main status document. */
      private void generate(ContentHandler ch) throws SAXException {
          // Root element.
  
          // The current date and time.
          String dateTime = DateFormat.getDateTimeInstance().format(new Date());
  
          AttributesImpl atts = new AttributesImpl();
          atts.addAttribute(namespace, "date", "date", "CDATA", dateTime);
          ch.startElement(namespace, "profilerinfo", "profilerinfo", atts);
  
          Collection results = profiler.getResults();
          for(Iterator i = results.iterator(); i.hasNext();)
              generateResult(ch, (ProfilerResult)i.next());
  
          // End root element.
          ch.endElement(namespace, "profilerinfo", "profilerinfo");
      }
  
      private void generateResult(ContentHandler ch, ProfilerResult result) throws SAXException
{
          AttributesImpl atts = new AttributesImpl();
  
          int count = result.getCount();
          String[] roles = result.getRoles(); // Roles of the components
          String[] source = result.getSources(); // Source of the components
          long[] totalTime = result.getTotalTime(); // Total time of the requests
          long totalTimeSum = 0; // Total time of all requests
          for(int i=0; i < count; i++)
              totalTimeSum += totalTime[i];
  
          atts.addAttribute(namespace, "uri", "uri", "CDATA", result.getURI());
          atts.addAttribute(namespace, "count", "count", "CDATA", Integer.toString(result.getCount()));
          atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(totalTimeSum));
          ch.startElement(namespace, "pipeline", "pipeline", atts);
          atts.clear();
  
          if(count > 0){
              atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(totalTimeSum
/ count));
              ch.startElement(namespace, "average", "average", atts);
              atts.clear();
  
              long[][] timeOfComponents = result.getLastTimes(); // Time of each component
              long[] totalTimeOfComponents = new long[roles.length]; // Time of each component
for all requests
            
              for(int j=0; j<count; j++){
                  for(int i=0; i<roles.length; i++){
                      totalTimeOfComponents[i] += timeOfComponents[j][i];
                  }
              }
  
              for(int i=0; i<roles.length; i++){
                  if(roles[i] != null)
                      atts.addAttribute(namespace, "role", "role", "CDATA", roles[i]);
                  if(source[i] != null)
                      atts.addAttribute(namespace, "source", "source", "CDATA", source[i]);
                  atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(totalTimeOfComponents[i]
/ count));
                  ch.startElement(namespace, "element", "element", atts);
                  atts.clear();
                  ch.endElement(namespace, "element", "element");
              }
              ch.endElement(namespace, "average", "average");
  
              for(int j=0; j<count; j++){
                  atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(totalTime[j]));
                  ch.startElement(namespace, "result", "result", atts);
                  atts.clear();
                  for(int i=0; i<roles.length; i++){
                      if(roles[i] != null)
                          atts.addAttribute(namespace, "role", "role", "CDATA", roles[i]);
                      if(source[i] != null)
                          atts.addAttribute(namespace, "source", "source", "CDATA", source[i]);
                      atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(timeOfComponents[j][i]));
                      ch.startElement(namespace, "element", "element", atts);
                      atts.clear();
                      ch.endElement(namespace, "element", "element");
                  }
                  ch.endElement(namespace, "result", "result");
              }
          }
  
          ch.endElement(namespace, "pipeline", "pipeline");
      }
  }
  
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/generation/chaperon.xmap
  
  Index: chaperon.xmap
  ===================================================================
  <?xml version="1.0"?>
  <xmap xpath="/sitemap/components/generators" unless="generator[@name='textparser']">
      <map:generator label="content,data" logger="sitemap.generator.textparser" name="textparser"
src="org.apache.cocoon.generation.TextParserGenerator"/>
  </xmap>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/generation/profiler.xmap
  
  Index: profiler.xmap
  ===================================================================
  <?xml version="1.0"?>
  <xmap xpath="/sitemap/components/generators" unless="generator[@name='profiler']">
  
      <map:generator label="content,data" logger="sitemap.generator.profiler" name="profiler"
src="org.apache.cocoon.components.profiler.ProfilerGenerator"/>
  </xmap>
  
  
  
  1.2       +5 -5      xml-cocoon2/src/java/org/apache/cocoon/serialization/fop.xmap
  
  Index: fop.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/fop.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fop.xmap	9 Mar 2002 06:28:26 -0000	1.1
  +++ fop.xmap	21 Aug 2002 06:15:31 -0000	1.2
  @@ -1,8 +1,8 @@
   <?xml version="1.0"?>
  +<xmap xpath="/sitemap/components/serializers" unless="serializer[@name='fo2pdf']">
  +    <map:serializer logger="sitemap.serializer.fo2pdf" name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf"/>
   
  -<xmap xpath="/sitemap/components/serializers"
  -      unless="serializer[@name='fo2pdf']">
  -    <map:serializer name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf"/>
  -    <map:serializer name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/postscript"/>
  -    <map:serializer name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="vnd.hp-PCL"/>
  +    <map:serializer logger="sitemap.serializer.fo2ps" name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/postscript"/>
  +
  +    <map:serializer logger="sitemap.serializer.fo2pcl" name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="vnd.hp-PCL"/>
   </xmap>
  
  
  
  1.4       +8 -4      xml-cocoon2/src/java/org/apache/cocoon/serialization/svg.xmap
  
  Index: svg.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/svg.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- svg.xmap	21 Aug 2002 05:17:46 -0000	1.3
  +++ svg.xmap	21 Aug 2002 06:15:31 -0000	1.4
  @@ -1,10 +1,14 @@
   <?xml version="1.0"?>
   
  -<xmap xpath="/sitemap/components/serializers"
  -      unless="serializer[@name='svg2jpeg']">
  -    <map:serializer name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer"
mime-type="image/jpeg">
  +<xmap xpath="/sitemap/components/serializers" unless="serializer[@name='svg2jpeg']">
  +   <map:serializer logger="sitemap.serializer.svgxml" name="svgxml" src="org.apache.cocoon.serialization.XMLSerializer"
mime-type="image/svg-xml">
  +    <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
  +    <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
  +   </map:serializer>
  +
  +    <map:serializer logger="sitemap.serializer.svg2png" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer"
mime-type="image/jpeg">
         <parameter name="quality" type="float" value="0.9"/>
       </map:serializer>
   
  -    <map:serializer name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"
mime-type="image/png"/>
  +    <map:serializer logger="sitemap.serializer.svg2png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"
mime-type="image/png"/>
   </xmap>
  
  
  
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/transformation/chaperon.xmap
  
  Index: chaperon.xmap
  ===================================================================
  <?xml version="1.0"?>
  <xmap xpath="/sitemap/components/transformers" unless="transformer[@name='textparser']">
      <map:transformer logger="sitemap.transformer.textparser" name="textparser" src="org.apache.cocoon.transformation.TextFragmentParserTransformer"/>
  </xmap>
  
  
  
  1.74      +0 -24     xml-cocoon2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- sitemap.xmap	20 Aug 2002 06:41:03 -0000	1.73
  +++ sitemap.xmap	21 Aug 2002 06:15:31 -0000	1.74
  @@ -64,16 +64,12 @@
   
      <map:generator label="content,data" logger="sitemap.generator.imagedirectory" name="imagedirectory"
src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
   
  -   <map:generator label="data" logger="sitemap.generator.extractor" name="extractor"
src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
  -  
       <map:generator label="content,data" name="html" src="org.apache.cocoon.generation.HTMLGenerator"/>
   
       <map:generator label="content,data" name="jsp" src="org.apache.cocoon.generation.JspGenerator"/>
       <map:generator label="content,data" name="stream" src="org.apache.cocoon.generation.StreamGenerator"/>
   
       <map:generator label="content,data" name="script" src="org.apache.cocoon.generation.ScriptGenerator"/>
  -
  -    <map:generator label="content,data" name="velocity" src="org.apache.cocoon.generation.VelocityGenerator"/>
   </map:generators>
   
   <!--
  @@ -113,8 +109,6 @@
   
      <map:transformer logger="sitemap.transformer.sql" name="sql" src="org.apache.cocoon.transformation.SQLTransformer"/>
   
  -   <map:transformer logger="sitemap.transformer.extractor" name="extractor" src="org.apache.cocoon.transformation.FragmentExtractorTransformer"/>
  -
      <map:transformer logger="sitemap.transformer.filter" name="filter" src="org.apache.cocoon.transformation.FilterTransformer"/>
   
      <map:transformer logger="sitemap.transformer.writeDOMsession" name="writeDOMsession"
src="org.apache.cocoon.transformation.WriteDOMSessionTransformer"/>
  @@ -162,11 +156,6 @@
       <omit-xml-declaration>yes</omit-xml-declaration>
      </map:serializer>
   
  -   <map:serializer logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" name="svgxml"
src="org.apache.cocoon.serialization.XMLSerializer">
  -    <doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
  -    <doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
  -   </map:serializer>
  -
      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" name="xhtml"
pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
        <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
        <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
  @@ -174,15 +163,6 @@
      </map:serializer>
   
      <map:serializer logger="sitemap.serializer.text" mime-type="text/text" name="text"
src="org.apache.cocoon.serialization.TextSerializer"/>
  -  
  -    <map:serializer mime-type="application/pdf" name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"/>
  -    <map:serializer mime-type="application/postscript" name="fo2ps" src="org.apache.cocoon.serialization.FOPSerializer"/>
  -    <map:serializer mime-type="vnd.hp-PCL" name="fo2pcl" src="org.apache.cocoon.serialization.FOPSerializer"/>
  -
  -    <map:serializer mime-type="image/jpeg" name="svg2jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
  -      <parameter name="quality" type="float" value="0.9"/>
  -    </map:serializer>
  -    <map:serializer mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"/>
   </map:serializers>
   
   <!--
  @@ -318,10 +298,6 @@
          <autoCachingPoint>On</autoCachingPoint>
        </map:pipeline>
        <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>
  
  
  
  1.37      +0 -139    xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- cocoon.xconf	20 Aug 2002 16:15:27 -0000	1.36
  +++ cocoon.xconf	21 Aug 2002 06:15:32 -0000	1.37
  @@ -429,19 +429,6 @@
   
     <xml-deserializer class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml-deserializer" pool-grow="4" pool-max="32" pool-min="8"/>
   
  -  <!-- Profiler:
  -    The profiler facilitates the gathering of statistics about timings of
  -    different steps of pipelines. Profiler consists of several components:
  -     profiling pipeline 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 lines to use profiler.
  -  <profiler results="10">
  -    <connector class="org.apache.cocoon.components.profiler.ProfilingSAXBufferConnector"/>
  -  </profiler>
  -  -->
  -
     <!-- Resource Monitor:
       The Monitor keeps track on changes to a Resource.
     -->
  @@ -466,22 +453,6 @@
     -->
     <sitemap check-reload="yes" config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml"
file="context://sitemap.xmap" logger="sitemap"/>
   
  -
  -
  -  <!-- Search:
  -    These are the components that handle the search. 
  -    
  -    Cocoon indexer write into an index.
  -    Cocoon searcher reads form an index, returning matched hits.
  -    Cocoon crawler crawls all links starting from a given base URI.
  -    Lucene xml indexer build a lucene document from XML content.
  -   -->
  -  <cocoon-indexer logger="core.search.indexer"/>
  -  <cocoon-searcher logger="core.search.searcher"/>  
  -  <cocoon-crawler logger="core.search.crawler"/>
  -  <lucene-xml-indexer logger="core.search.lucene"/>
  -
  -
     <!-- Entity resolution catalogs: *********************************************
       catalog:
       The default catalog is distributed at /WEB-INF/entities/catalog
  @@ -517,115 +488,5 @@
      <parameter name="catalog" value="/WEB-INF/entities/catalog"/>
      <parameter name="verbosity" value="1"/>
     </entity-resolver>
  -
  -  <!-- Deli support -->
  -  <!-- Uncomment this section to enable DELI
  -  <deli class="org.apache.cocoon.components.deli.DeliImpl">
  -    <parameter name="deli-config-file" value="WEB-INF/deli/config/deliConfig.xml"/>
  -  </deli>
  -  -->
  -
  -   <!-- =============== 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>
  -
  -
  -  <!-- Flow interpreter support.
  -
  -    The attributes recognized by the <flow-interpreters> element are:
  -
  -      default (string value):
  -
  -         the default interpreted language assumed for <map:script>
  -         elements which do not specify a "language" attribute. If not
  -         present, the first language that's described within the
  -         <flow-interpreters> element is assumed to be the default
  -         language.
  -
  -      reload-scripts (boolean value, default false):
  -
  -         whether to check if the scripts source files are
  -         modified. Checking for modification is an expensive
  -         operation, so leave it disabled in a production
  -         environment. If not present it is assumed to be "false". When
  -         "true" *all* script files are checked for modification on
  -         each function invocation done using <map:call
  -         function="...">, but not more frequent than the value of
  -         "check-time" (see below).
  -
  -      check-time (long value, default 1000):
  -
  -         time in miliseconds between the checks for the last
  -         modification date of script files.
  -
  -    Within <flow-interpreters> only <component-instance> elements are
  -    recognized. The attributes recognized by this element are "name"
  -    and "class". "name" specifies the name of a scripting language,
  -    and "class" defines the Java class that implements it. See
  -    org.apache.cocoon.components.flow.Interpreter for the Cocoon
  -    interface with an scripting language interpreter.
  -
  -  -->
  -
  -  <flow-interpreters check-time="2000" default="JavaScript" logger="flow" reload-scripts="true">
  -
  -    <component-instance class="org.apache.cocoon.components.flow.javascript.JavaScriptInterpreter"
name="JavaScript">
  -      <load-on-startup>resource://org/apache/cocoon/components/flow/javascript/system.js</load-on-startup>
  -    </component-instance>
  -
  -<!--
  -  Temporarily disable Scheme, until full support is completed
  --->
  -
  -<!--
  -    <component-instance name="Scheme"
  -                        class="org.apache.cocoon.components.flow.scheme.SchemeInterpreter">
  -      <load-on-startup>resource://org/apache/cocoon/components/flow/scheme/system.scm</load-on-startup>
  -      <heap>/WEB-INF/sisc.heap</heap>
  -    </component-instance>
  --->
  -
  -  </flow-interpreters>
  -
  -  <continuations time-to-live="3600"/>
  -
   
   </cocoon>
  
  
  

----------------------------------------------------------------------
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