haul        2002/10/18 07:24:08

  Modified:    src/java/org/apache/cocoon/components/modules modules.xconf
                        modules.xroles
  Log:
  
  
  Revision  Changes    Path
  1.8       +6 -14     
xml-cocoon2/src/java/org/apache/cocoon/components/modules/modules.xconf
  
  Index: modules.xconf
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/modules.xconf,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- modules.xconf     8 Oct 2002 09:48:01 -0000       1.7
  +++ modules.xconf     18 Oct 2002 14:24:08 -0000      1.8
  @@ -16,7 +16,6 @@
         <component-instance logger="core.modules.input" name="digest"          
class="org.apache.cocoon.components.modules.input.DigestMetaModule"/>
         <component-instance logger="core.modules.input" name="date"            
class="org.apache.cocoon.components.modules.input.DateInputModule"/>
         <component-instance logger="core.modules.input" name="nullinput"       
class="org.apache.cocoon.components.modules.input.NullInputModule"/>
  -      <component-instance logger="core.modules.input" name="collection"      
class="org.apache.cocoon.components.modules.input.CollectionMetaModule"/>
         <component-instance logger="core.modules.input" name="xmlmeta"         
class="org.apache.cocoon.components.modules.input.XMLMetaModule"/>
         <component-instance logger="core.modules.input" name="mapmeta"         
class="org.apache.cocoon.components.modules.input.MapMetaModule"/>
         <component-instance logger="core.modules.input" name="defaults"        
class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  @@ -26,6 +25,12 @@
                        <base-url>http://localhost:8080/cocoon</base-url>
                 </values>
          </component-instance>
  +      <component-instance logger="core.modules.input" name="chain"           
class="org.apache.cocoon.components.modules.input.ChainMetaModule">
  +          <input-module name="request-param"/>
  +          <input-module name="request-attr"/>
  +          <input-module name="session-attr"/>
  +          <input-module name="defaults"/>
  +       </component-instance>
      </input-modules>
   
      <output-modules>
  @@ -33,17 +38,4 @@
         <component-instance logger="core.modules.output" name="session-attr"   
class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule"/>
      </output-modules>
   
  -   <autoincrement-modules>
  -      <component-instance logger="core.modules.auto" name="auto" 
class="org.apache.cocoon.components.modules.database.HsqlIdentityAutoIncrementModule"/>
  -<!--
  -      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 logger="core.modules.auto" name="auto" 
class="org.apache.cocoon.components.modules.database.ManualAutoIncrementModule"/>
  -      <component-instance logger="core.modules.auto" name="auto" 
class="org.apache.cocoon.components.modules.database.IfxSerialAutoIncrementModule"/>
  -      <component-instance logger="core.modules.auto" name="auto" 
class="org.apache.cocoon.components.modules.database.MysqlAutoIncrementModule"/>
  --->
  -   </autoincrement-modules>
   </xconf>
  
  
  
  1.3       +1 -5      
xml-cocoon2/src/java/org/apache/cocoon/components/modules/modules.xroles
  
  Index: modules.xroles
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/modules.xroles,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- modules.xroles    8 Oct 2002 09:48:01 -0000       1.2
  +++ modules.xroles    18 Oct 2002 14:24:08 -0000      1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <xroles xpath="/role-list" 
unless="role[@name='org.apache.cocoon.components.modules.input.InputModuleSelector']">
  -  <!-- input / output / database modules -->
  +  <!-- input / output modules -->
   
     <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
           shorthand="input-modules"
  @@ -8,10 +8,6 @@
   
     <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"/>
   
     <role name="org.apache.cocoon.components.modules.input.SitemapVariableHolder"
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to