forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/resources/conf cocoon.xconf
Date Tue, 26 Nov 2002 08:28:44 GMT
nicolaken    2002/11/26 00:28:44

  Modified:    src/resources/conf cocoon.xconf
  Log:
        <action dev="NKB" type="fix" context="shbat">
          Now error reporting in shbat CLI runs should work and show the cause of the error;
          before it was just reporting [broken link].
        </action>
        <action dev="NKB" type="update" context="code">
          Updated latest Cocoon jars: chain metamodule name set to "forrest", and it's
          used instead of the default one.
        </action>
  
  Revision  Changes    Path
  1.7       +35 -36    xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cocoon.xconf	21 Nov 2002 04:17:43 -0000	1.6
  +++ cocoon.xconf	26 Nov 2002 08:28:44 -0000	1.7
  @@ -434,50 +434,49 @@
      <parameter name="verbosity" value="@catalog-verbosity@"/>
     </entity-resolver>
   
  -
  -   <!-- =============== Sitemap In/Out/Database Modules ==================== -->
  +  <!-- =============== 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.RequestContextPathModule"
name="context"/>
  -    <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>@skin@</skin>
  -      <base-url>/forrest</base-url>
  -     </values>
  -    </component-instance>
  +      <component-instance name="context"          class="org.apache.cocoon.components.modules.input.RequestContextPathModule"
/>
  +      <component-instance name="global"           class="org.apache.cocoon.components.modules.input.GlobalInputModule"/>
  +      <component-instance name="request"        	class="org.apache.cocoon.components.modules.input.RequestModule"/>
  +      <component-instance name="session"         	class="org.apache.cocoon.components.modules.input.SessionModule"/>
  +      <component-instance name="request-param"   	class="org.apache.cocoon.components.modules.input.RequestParameterModule"/>
  +      <component-instance name="request-attr" 	  class="org.apache.cocoon.components.modules.input.RequestAttributeModule"/>
  +      <component-instance name="request-header"  	class="org.apache.cocoon.components.modules.input.HeaderAttributeModule"/>
  +      <component-instance name="session-attr"   	class="org.apache.cocoon.components.modules.input.SessionAttributeModule"/>
  +      <component-instance name="system-property" 	class="org.apache.cocoon.components.modules.input.SystemPropertyModule"/>
  +      <component-instance name="constant"  		    class="org.apache.cocoon.components.modules.input.StringConstantModule"/>
  +      <component-instance name="random"    		    class="org.apache.cocoon.components.modules.input.RandomNumberModule"/>
  +      <component-instance name="digest"         	class="org.apache.cocoon.components.modules.input.DigestMetaModule"/>
  +      <component-instance name="date"           	class="org.apache.cocoon.components.modules.input.DateInputModule"/>
  +      <component-instance name="nullinput"      	class="org.apache.cocoon.components.modules.input.NullInputModule"/>
  +      <component-instance name="xmlmeta"        	class="org.apache.cocoon.components.modules.input.XMLMetaModule"/>
  +      <component-instance name="mapmeta"    	    class="org.apache.cocoon.components.modules.input.MapMetaModule"/>
  +      <component-instance name="defaults"      	class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  +		    <values>
  +         <skin>@skin@</skin>
  +         <base-url>/forrest</base-url>
  +		   </values>
  +     </component-instance>
  +	  
  +      <component-instance logger="core.modules.input" name="forrest"   	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 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>
  +      <component-instance logger="core.modules.output" name="request-attr" class="org.apache.cocoon.components.modules.output.RequestAttributeOutputModule"/>
  +      <component-instance logger="core.modules.output" name="session-attr"   class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule"/>
      </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>
   </cocoon>
  +
   
   
   
  
  
  

Mime
View raw message