Return-Path: <bloritsch@apache.org>
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 48719 invoked by uid 1152); 15 Jan 2001 04:55:31 -0000
Date: 15 Jan 2001 04:55:31 -0000
Message-ID: <20010115045531.48718.qmail@apache.org>
From: bloritsch@apache.org
To: xml-cocoon-cvs@apache.org
Subject: cvs commit: xml-cocoon/webapp cocoon.xconf

bloritsch    01/01/14 20:55:31

  Modified:    webapp   Tag: xml-cocoon2 cocoon.xconf
  Log:
  First step is complete.  Much easier on the eyes.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.15  +8 -8      xml-cocoon/webapp/Attic/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
  retrieving revision 1.1.2.14
  retrieving revision 1.1.2.15
  diff -u -r1.1.2.14 -r1.1.2.15
  --- cocoon.xconf	2001/01/15 04:18:02	1.1.2.14
  +++ cocoon.xconf	2001/01/15 04:55:31	1.1.2.15
  @@ -3,10 +3,10 @@
   
   <!-- ===================== General Components =========================== -->
   
  -  <component role="org.apache.cocoon.components.parser.Parser" class="org.apache.cocoon.components.parser.XercesParser"/>
  -  <component role="org.apache.cocoon.components.store.Store"  class="org.apache.cocoon.components.store.MemoryStore"/>
  +  <component type="parser" class="org.apache.cocoon.components.parser.XercesParser"/>
  +  <component type="store" class="org.apache.cocoon.components.store.MemoryStore"/>
   
  -  <component role="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector" class="org.apache.cocoon.CocoonComponentSelector">
  +  <component type="programming-language" class="org.apache.cocoon.CocoonComponentSelector">
       <component-instance name="java" class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
         <parameter name="compiler" value="org.apache.cocoon.components.language.programming.java.Javac"/>
         <parameter name="code-formatter" value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/>
  @@ -14,9 +14,9 @@
       </component-instance>
     </component>
   
  -  <component role="org.apache.cocoon.components.classloader.ClassLoaderManager" class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
  +  <component type="classloader" class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
   
  -  <component role="org.apache.cocoon.components.language.markup.MarkupLanguageSelector" class="org.apache.cocoon.CocoonComponentSelector">
  +  <component type="markup-language" class="org.apache.cocoon.CocoonComponentSelector">
       <component-instance name="xsp" class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage">
         <parameter name="prefix" value="xsp"/>
         <parameter name="uri" value="http://apache.org/xsp"/>
  @@ -60,11 +60,11 @@
       </component-instance>
     </component>
   
  -  <component role="org.apache.cocoon.components.language.generator.ProgramGenerator" class="org.apache.cocoon.components.language.generator.ProgramGeneratorImpl">
  +  <component type="program-generator" class="org.apache.cocoon.components.language.generator.ProgramGeneratorImpl">
       <parameter name="auto-reload" value="true"/>
     </component>
   
  -  <component role="org.apache.cocoon.components.datasource.DataSourceComponentSelector" class="org.apache.cocoon.CocoonComponentSelector">
  +  <component type="datasource" class="org.apache.cocoon.CocoonComponentSelector">
       <component-instance name="personnel" class="org.apache.cocoon.components.datasource.JdbcDataSource">
         <pool-controller min="5" max="10"/>
         <dburl>jdbc:postgresql://localhost/test</dburl>
  @@ -74,7 +74,7 @@
     </component>
   
     <!-- these components is used as a PoolController for the sitemap component pools  -->
  -  <component role="org.apache.avalon.util.pool.PoolController" class="org.apache.cocoon.util.ComponentPoolController"/>
  +  <component type="pool-controller" class="org.apache.cocoon.util.ComponentPoolController"/>
   
     <sitemap file="sitemap.xmap"/> 
   </cocoon>