Author: cziegeler
Date: Wed Oct 20 05:49:01 2004
New Revision: 55148
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Log:
Snycing xconf :(
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Wed Oct
20 05:49:01 2004
@@ -43,7 +43,6 @@
<sitemap
file="context://sitemap.xmap"
check-reload="yes"
-
config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml"
logger="sitemap"
/>
@@ -146,6 +145,12 @@
| accompanying javadocs.
+-->
<input-modules>
+ <component-instance logger="core.modules.input" name="url-encode"
class="org.apache.cocoon.components.modules.input.URLEncodeModule">
+ <encoding>UTF-8</encoding>
+ </component-instance>
+ <component-instance logger="core.modules.input" name="url-decode"
class="org.apache.cocoon.components.modules.input.URLDecodeModule">
+ <encoding>UTF-8</encoding>
+ </component-instance>
<component-instance logger="core.modules.input" name="global"
class="org.apache.cocoon.components.modules.input.GlobalInputModule"/>
<component-instance logger="core.modules.input" name="request"
class="org.apache.cocoon.components.modules.input.RequestModule"/>
<component-instance logger="core.modules.input" name="baselink"
class="org.apache.cocoon.components.modules.input.BaseLinkModule" />
@@ -165,6 +170,14 @@
</component-instance>
<component-instance logger="core.modules.input" name="nullinput"
class="org.apache.cocoon.components.modules.input.NullInputModule"/>
<component-instance logger="core.modules.input" name="realpath"
class="org.apache.cocoon.components.modules.input.RealPathModule"/>
+ <component-instance logger="core.modules.input" name="naming"
class="org.apache.cocoon.components.modules.input.NamingInputModule">
+ </component-instance>
+ <component-instance logger="core.modules.input" name="cocoon-properties"
class="org.apache.cocoon.components.modules.input.PropertiesFileModule">
+ <file src="resource://org/apache/cocoon/cocoon.properties" />
+ </component-instance>
+ <component-instance logger="core.modules.input" name="flow-attribute"
class="org.apache.cocoon.components.modules.input.FlowAttributeModule"/>
+ <component-instance logger="core.modules.input" name="flow-continuation"
class="org.apache.cocoon.components.modules.input.FlowContinuationModule"/>
+
<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="datemeta"
class="org.apache.cocoon.components.modules.input.DateMetaInputModule"/>
@@ -177,9 +190,6 @@
<input-module name="session-attr"/>
<input-module name="defaults"/>
</component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.PropertiesFileModule"
logger="core.modules.input" name="cocoon-properties">
- <file src="resource://org/apache/cocoon/cocoon.properties" />
- </component-instance>
<!-- The 'defaults', 'myxml' and 'slashdot' input modules are used
in the samples -->
@@ -191,15 +201,12 @@
</component-instance>
<component-instance
class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.xml" name="myxml">
- <file src="context:///samples/modules/forrestconf.xml"/>
+ <file src="context://samples/modules/forrestconf.xml"/>
</component-instance>
<component-instance
class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.xml" name="slashdot">
<file src="http://slashdot.org/slashdot.rss"/>
</component-instance>
- <component-instance logger="core.modules.input" name="flow-attribute"
class="org.apache.cocoon.components.modules.input.FlowAttributeModule"/>
- <component-instance logger="core.modules.input" name="flow-continuation"
class="org.apache.cocoon.components.modules.input.FlowContinuationModule"/>
-
</input-modules>
<!--+
@@ -238,15 +245,22 @@
<component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
<component-instance
class="org.apache.cocoon.components.source.impl.ContextSourceFactory"
name="context"/>
<component-instance
class="org.apache.cocoon.components.source.impl.SitemapSourceFactory"
name="cocoon"/>
- <!-- The "file:" protocol is modifiable (can be written to) and
traversable (directory structures
- can be crawled). -->
+ <!--+
+ | The "file:" source protocol is modifiable (can be written to) and
+ | traversable (directory structures can be crawled).
+ +-->
<component-instance
class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/>
<component-instance
class="org.apache.cocoon.components.source.impl.PartSourceFactory"
name="upload"/>
- <!-- the "*" protocol handles all uri schemes that are not explicitely
specified. This includes all
- JDK standard protocols. -->
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
<component-instance
class="org.apache.cocoon.components.source.impl.ModuleSourceFactory"
name="module"/>
+ <component-instance
class="org.apache.cocoon.components.source.impl.XModuleSourceFactory"
name="xmodule"/>
+
+ <!--+
+ | The "*" protocol handles all uri schemes that are not explicitely
+ | specified. This includes all JDK standard protocols.
+ +-->
+ <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
</source-factories>
+
<!--+
| Entity resolution catalogs
|
@@ -355,7 +369,7 @@
| transformation to deliver the output.
| WARNING: * if you enable incremental-processing, you should be aware of
| the following bug:
- | http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13186
+ | http://issues.apache.org/bugzilla/show_bug.cgi?id=13186
| * incremental-processing creates an additional, non-pooled
thread.
| * using incremental-processing does not save memory, the input
| tree will still be build completely.
@@ -394,7 +408,7 @@
| Saxon XSLT Processor
| For old (6.5.2) Saxon use:
| <parameter name="transformer-factory"
value="com.icl.saxon.TransformerFactoryImpl"/>
- | For new (7.x?) Saxon use:
+ | For new (7+) Saxon use:
| <parameter name="transformer-factory"
value="net.sf.saxon.TransformerFactoryImpl"/>
<component logger="core.xslt-processor"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
@@ -418,7 +432,7 @@
| Transient Store: holds objects that don't have to survive shutdown
|
| Common configuration parameters:
- | maxobjects: Indicates how many objects will be hold in the cache.
+ | maxobjects: Indicates how many objects will be held in the cache.
| When the number of maxobjects has been reached. The last object
| in the cache will be thrown out.
+-->
