Author: crossley
Date: Fri Aug 22 03:48:25 2008
New Revision: 688047
URL: http://svn.apache.org/viewvc?rev=688047&view=rev
Log:
Replace temporary cocoon.xconf which had been copied directly from Cocoon-2.1
xconf.
This one is based on our old Forrest xconf/forrest-core.xconf and manually
synchronised with that generated when we build cocoon configured for our blocks.
Cocoon uses a properties system to supply default values for some parameters.
At the moment we still use the hard-coded values from our old xconf.
Added:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/README.txt
(with props)
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf?rev=688047&r1=688046&r2=688047&view=diff
==============================================================================
--- forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
(original)
+++ forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/cocoon.xconf
Fri Aug 22 03:48:25 2008
@@ -15,19 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- CVS $Id: cocoon.xconf 123675 2004-12-29 20:39:50Z sylvain $ -->
<cocoon version="2.1">
<!--+
- | This is the main Apache Cocoon configuration file.
- | It contains includes for the core components and for
- | each of the blocks that are to be loaded.
- |
- | You can add your own components here or include some
- | additional external files.
+ | This file defines the Cocoon core components.
+-->
-
+ <!-- Include the core roles definitions. This is for the sake of clarity,
+ as they are implicitely loaded at startup, but we may want to remove
+ this implicit behaviour in the future now that we have the include
+ mechanism. -->
+ <include src="resource://org/apache/cocoon/cocoon.roles"/>
+
<!--+
| This is the Apache Cocoon configuration file. This is the place
| where you configure the components that Cocoon uses internally (stuff
@@ -52,8 +51,8 @@
| For production environment, it is advisable to set check-reload to no.
+-->
<sitemap check-reload="yes" file="context://sitemap.xmap" logger="sitemap"/>
-
-<!-- ========================= Sitemap Flowscript ==========================
-->
+ <!--
config="resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml"
-->
+ <!-- ========================= Sitemap Flowscript ==========================
-->
<!--+
| The <flow-interpreters> element is used to describe the flowscript
@@ -83,10 +82,13 @@
| 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
+ | assumed to be "false" (if no property is overriding this). 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).
+ | The default for this function is determined by the value of the
+ | reloading property 'org.apache.cocoon.reloading.flow'.
|
| check-time (long value, default 1000):
| time in miliseconds between the checks for the last modification
@@ -98,10 +100,12 @@
+-->
<flow-interpreters default="javascript" logger="flow">
<!-- FOM (Flow Object Model) -->
- <component-instance
class="org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptInterpreter"
name="javascript">
+ <component-instance
class="org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptInterpreter"
exported="false" name="javascript">
<load-on-startup>resource://org/apache/cocoon/components/flow/javascript/fom/fom_system.js</load-on-startup>
- <reload-scripts>${javascript.reload-scripts}</reload-scripts>
- <check-time>${javascript.check-time}</check-time>
+ <!--
+ <reload-scripts>true</reload-scripts>
+ <check-time>4000</check-time>
+ -->
<!-- <debugger>enabled</debugger> --> <!-- JavaScript Debugger support
-->
</component-instance>
</flow-interpreters>
@@ -113,15 +117,6 @@
| in miliseconds using the "time-to-live" attribute of
| the <continuations-manager> element.
|
- | If your site is sharing continuations between sitemaps you
- | should refactor your application to keep a continuation bound to
- | a single sitemap. The log will contain warnings which indicate
- | where a continuation from a different sitemap is used.
- |
- | When you cannot do the refactoring in one blow you can turn on
- | compatibility with shared continuations by setting the
- | "continuation-sharing-bug-compatible" attribute to "true".
- |
| The <expirations-check> element specifies different policies for
| expiring continuations. Currently only the "periodic" type is
| supported.
@@ -133,10 +128,11 @@
| Enable this feature for web applications by setting
| 'session-bound-continuations' to true.
+-->
- <continuations-manager continuation-sharing-bug-compatible="false"
logger="flow.manager" session-bound-continuations="false"
time-to-live="${continuations-manager.time-to-live}">
+ <continuations-manager logger="flow.manager" time-to-live="3600000"
+ session-bound-continuations="false">
<expirations-check type="periodic">
- <offset>${continuations-manager.expirations-check.offset}</offset>
- <period>${continuations-manager.expirations-check.period}</period>
+ <offset>180000</offset>
+ <period>180000</period>
</expirations-check>
</continuations-manager>
@@ -168,12 +164,6 @@
| accompanying javadocs.
+-->
<input-modules>
- <component-instance
class="org.apache.cocoon.components.modules.input.URLEncodeModule"
logger="core.modules.input" name="url-encode">
- <encoding>UTF-8</encoding>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.URLDecodeModule"
logger="core.modules.input" name="url-decode">
- <encoding>UTF-8</encoding>
- </component-instance>
<component-instance
class="org.apache.cocoon.components.modules.input.GlobalInputModule"
logger="core.modules.input" name="global"/>
<component-instance
class="org.apache.cocoon.components.modules.input.RequestModule"
logger="core.modules.input" name="request"/>
<component-instance
class="org.apache.cocoon.components.modules.input.BaseLinkModule"
logger="core.modules.input" name="baselink"/>
@@ -183,7 +173,6 @@
<component-instance
class="org.apache.cocoon.components.modules.input.RequestAttributeModule"
logger="core.modules.input" name="request-attr"/>
<component-instance
class="org.apache.cocoon.components.modules.input.HeaderAttributeModule"
logger="core.modules.input" name="request-header"/>
<component-instance
class="org.apache.cocoon.components.modules.input.SessionAttributeModule"
logger="core.modules.input" name="session-attr"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.CookieModule"
logger="core.modules.input" name="cookie"/>
<component-instance
class="org.apache.cocoon.components.modules.input.SystemPropertyModule"
logger="core.modules.input" name="system-property"/>
<component-instance
class="org.apache.cocoon.components.modules.input.StringConstantModule"
logger="core.modules.input" name="constant"/>
<component-instance
class="org.apache.cocoon.components.modules.input.RandomNumberModule"
logger="core.modules.input" name="random"/>
@@ -193,30 +182,21 @@
<!--Eg: Mon, 28 Oct 2002 03:08:49 +1100 -->
</component-instance>
<component-instance
class="org.apache.cocoon.components.modules.input.NullInputModule"
logger="core.modules.input" name="nullinput"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.RealPathModule"
logger="core.modules.input" name="realpath"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.ContextPathModule"
logger="core.modules.input" name="contextpath"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.NamingInputModule"
logger="core.modules.input" name="naming">
- </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>
- <component-instance
class="org.apache.cocoon.components.modules.input.FlowAttributeModule"
logger="core.modules.input" name="flow-attribute"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.FlowAttributeModule"
logger="core.modules.input" name="flow-attr"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.FlowContinuationModule"
logger="core.modules.input" name="flow-continuation"/>
-
+ <component-instance
class="org.apache.cocoon.components.modules.input.RealPathModule"
logger="core.modules.input" name="realpath"/>
<component-instance
class="org.apache.cocoon.components.modules.input.XMLMetaModule"
logger="core.modules.input" name="xmlmeta"/>
<component-instance
class="org.apache.cocoon.components.modules.input.MapMetaModule"
logger="core.modules.input" name="mapmeta"/>
<component-instance
class="org.apache.cocoon.components.modules.input.DateMetaInputModule"
logger="core.modules.input" name="datemeta"/>
<component-instance
class="org.apache.cocoon.components.modules.input.JXPathMetaModule"
logger="core.modules.input" name="jxpath"/>
<component-instance
class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
logger="core.modules.input" name="simplemap"/>
- <component-instance
class="org.apache.cocoon.components.modules.input.LocateResource"
logger="core.modules.input" name="locate"/>
+
<component-instance
class="org.apache.cocoon.components.modules.input.ChainMetaModule"
logger="core.modules.input" name="forrest">
<input-module name="request-param"/>
<input-module name="request-attr"/>
<input-module name="session-attr"/>
<input-module name="properties"/>
</component-instance>
-<component-instance name="properties"
class="org.apache.forrest.conf.ForrestConfModule">
+
+ <component-instance class="org.apache.forrest.conf.ForrestConfModule"
name="properties">
<values>
<forrest.skin>@project.skin@</forrest.skin>
<forrest.menu-scheme>@project.menu-scheme@</forrest.menu-scheme>
@@ -262,64 +242,14 @@
</input-module>
<prefix>/skinconfig/</prefix>
</component-instance>
- <!--+
- | Following five modules definitions, 'defaults', 'myxml',
- | 'slashdot' 'random-100-to-500' and 'random-5000-to-10000',
- | are used only in the samples.
- +-->
- <component-instance
class="org.apache.cocoon.components.modules.input.DefaultsModule"
logger="core.modules.input" name="defaults">
- <values>
- <skin>defaultSkin</skin>
- <base-url>http://localhost:8080/cocoon</base-url>
- </values>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.input" name="myxml">
- <file src="context://samples/modules/forrestconf.xml"/>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.input" name="slashdot">
- <file src="http://slashdot.org/slashdot.rss"/>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.XPathXMLFileModule"
logger="core.modules.input" name="xmyxml">
- <file src="context://samples/modules/forrestconf.xml"/>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.XPathXMLFileModule"
logger="core.modules.input" name="varxml">
- <file
src="context://samples/modules/{request-param:dir}/forrestconf.xml"/>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.RandomNumberModule"
logger="core.modules.input" name="random-100-to-500">
- <min>100</min>
- <max>500</max>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.RandomNumberModule"
logger="core.modules.input" name="random-5000-to-10000">
- <min>5000</min>
- <max>10000</max>
- </component-instance>
- <!--..... Start configuration from 'linkrewriter' -->
+ <!-- For the site: scheme -->
+ <component-instance
+ class="org.apache.cocoon.components.modules.input.XMLFileModule"
+ logger="core.modules.mapper.link" name="linkmap">
+ </component-instance>
- <!-- For the sitedemo sample -->
- <component-instance
class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.xml" name="linkmap">
- <file src="cocoon://samples/linkrewriter/sitedemo/linkmap"/>
- <!-- Shouldn't this be the default? -->
- <reloadable>true</reloadable>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
logger="core.modules.mapper" name="site">
- <input-module name="linkmap"/>
- <prefix>/site/</prefix>
- <suffix>/@href</suffix>
- </component-instance>
-
- <!-- For the bookdemo sample -->
- <component-instance
class="org.apache.cocoon.components.modules.input.XMLFileModule"
logger="core.modules.xml" name="book-raw">
- <!-- Shouldn't this be the default? -->
- <file src="cocoon://samples/linkrewriter/bookdemo/linkmap"/>
- <reloadable>true</reloadable>
- </component-instance>
- <component-instance
class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
logger="core.modules.mapper" name="book">
- <input-module name="book-raw"/>
- </component-instance>
-
-
- <!-- Links to URIs within the site -->
+ <!-- Links to URIs within the site -->
<component-instance
class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
logger="core.modules.mapper.link" name="site"/>
@@ -337,56 +267,37 @@
<cacheable>true</cacheable>
<cache-lifespan>100000</cache-lifespan>
</component-instance>
-<!--..... End configuration from 'linkrewriter' -->
+
</input-modules>
- <!--+
- | OutputModules are companion modules for InputModules.
- |
- | The same principles apply here, only that OutputModules allow
- | writing data to places. Apparently, there are a lot less
- | places to write to than to read data from, thus there are only
- | a few OutputModules coming with Apache Cocoon.
- |
- | One special feature of OutputModules is, that they expose some
- | limited transactional behaviour. Hence it does not suffice to
- | write a value, but it is required to confirm this at the
- | end. Until then, the value could not be read from the
- | corresponding InputModule. This behaviour is not enfored but
- | it should be expected. Omitting a commit or rollback is an
- | error.
- |
- | OutputModules are currently used by flow, a number of actions
- | and transformers.
- +-->
- <output-modules>
- <component-instance
class="org.apache.cocoon.components.modules.output.RequestAttributeOutputModule"
logger="core.modules.output" name="request-attr"/>
- <component-instance
class="org.apache.cocoon.components.modules.output.RequestAttributeMap"
logger="core.modules.output" name="request-attr-map"/>
- <component-instance
class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule"
logger="core.modules.output" name="session-attr"/>
- </output-modules>
+
<!-- ================================= XML ================================ -->
<!--+
| Entity resolution catalogs
|
- | The default catalog is distributed at WEB-INF/entities/catalog
- | This is the contextual pathname for Cocoon resources.
- | You can override this path, if necessary, using the "catalog"
parameter:
+ | The following parameters are the system-wide configuration for Forrest.
+ |
+ | There are various ways to do local project-based configuration.
+ | See the Apache Forrest documentation:
+ | http://forrest.apache.org/docs/your-project.html
+ | http://forrest.apache.org/docs/validation.html
+ |
+ | Parameters:
|
- | <parameter name="catalog" value="WEB-INF/entities/catalog"/>
+ | catalog:
+ | The default catalog for DTDs etc. that are shipped with Forrest.
|
- | However, it is probably desirable to leave this default catalog config
+ | <parameter name="catalog" value="resources/schema/catalog.xcat"/>
+ |
+ | However, it is desirable to leave this default catalog config
| and declare your own local catalogs, which are loaded in addition to
| the system catalog.
|
- | There are various ways to do local configuration (see "Entity Catalogs"
- | documentation). One way is via the CatalogManager.properties file.
- | As an additional method, you can specify the "local-catalog"
- | parameter here.
- |
| local-catalog:
| The full filesystem pathname to a single local catalog file.
+ | This catalog could also include nextCatalog instructions.
|
| <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
|
@@ -399,12 +310,13 @@
| 3 = 2+, Catalog does not exist, resolvePublic, resolveSystem
| 10 = 3+, List all catalog entries when loading a catalog
| (Cocoon also logs the "Resolved public" messages.)
- |
- | <parameter name="verbosity" value="2"/>
+-->
<entity-resolver logger="core.resolver">
<parameter name="catalog" value="resources/schema/catalog.xcat"/>
+<!-- See FOR-917 testing new Cocoon "running modes"
<parameter name="verbosity" value="1"/>
+-->
+ <parameter name="verbosity" value="${org.apache.xml.resolver.verbosity}"/>
</entity-resolver>
<!--+
@@ -456,15 +368,20 @@
| from DTD. And the comment events from the internal DTD subset
| would appear in the serialized output again.
+-->
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
logger="core.xml-parser" pool-max="${xml-parser.pool-max}">
+ <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
logger="core.xml-parser" pool-grow="4" pool-max="32" pool-min="8">
<parameter name="validate" value="false"/>
<parameter name="namespace-prefixes" value="false"/>
<parameter name="stop-on-warning" value="true"/>
<parameter name="stop-on-recoverable-error" value="true"/>
<parameter name="reuse-parsers" value="false"/>
+ <!--parameter name="sax-parser-factory" value="???"/-->
+ <!--parameter name="document-builder-factory" value="???"/-->
+ <!-- drop-dtd-comments: causes all comment events originating from DTD
+ comments to be dropped right after parsing -->
<parameter name="drop-dtd-comments" value="true"/>
</xml-parser>
+
<!--+
| XSLT Processor
|
@@ -481,7 +398,7 @@
| * incremental processing is a 'static' thing in Xalan: if you
| enable it on one xslt-processor, enable it on all.
+-->
- <xslt-processor logger="core.xslt">
+ <xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
<parameter name="incremental-processing" value="false"/>
</xslt-processor>
@@ -491,16 +408,16 @@
| For Interpreted Xalan use:
|
<transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
+-->
- <component class="org.apache.cocoon.components.xslt.TraxProcessor"
logger="core.xslt" role="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc">
- <parameter name="use-store" value="true"/>
+ <component class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"
logger="core.xslt-processor"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/xsltc">
+ <parameter name="use-store" value="false"/>
<parameter name="transformer-factory"
value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
</component>
-
+
<!--+
| Xalan XSLT Processor
+-->
- <component class="org.apache.cocoon.components.xslt.TraxProcessor"
logger="core.xslt" role="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan">
- <parameter name="use-store" value="true"/>
+ <component class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"
logger="core.xslt-processor"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/xalan">
+ <parameter name="use-store" value="false"/>
<parameter name="incremental-processing" value="false"/>
<parameter name="transformer-factory"
value="org.apache.xalan.processor.TransformerFactoryImpl"/>
</component>
@@ -511,23 +428,24 @@
| <parameter name="transformer-factory"
value="com.icl.saxon.TransformerFactoryImpl"/>
| For new (7+) Saxon use:
| <parameter name="transformer-factory"
value="net.sf.saxon.TransformerFactoryImpl"/>
- <component logger="core.xslt"
+ +-->
+ <component logger="core.xslt-processor"
role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
- class="org.apache.cocoon.components.xslt.TraxProcessor">
- <parameter name="use-store" value="true"/>
- <parameter name="transformer-factory"
value="com.icl.saxon.TransformerFactoryImpl"/>
+ class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl">
+ <parameter name="use-store" value="false"/>
+ <parameter name="incremental-processing" value="false"/>
+ <parameter name="transformer-factory"
value="net.sf.saxon.TransformerFactoryImpl"/>
</component>
- +-->
<!--+
| Xpath Processor (Based on Xalan)
+-->
- <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
logger="core.xpath"/>
+ <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
logger="core.xpath-processor"/>
<!--+
| The XMLizers converts different mime-types to XML
+-->
- <xmlizer logger="core.xmlizer">
+ <xmlizer>
<parser mime-type="text/xml"
role="org.apache.excalibur.xml.sax.SAXParser"/>
<!--..... Start configuration from 'tidy' -->
@@ -548,22 +466,9 @@
| in the cache will be thrown out.
+-->
<transient-store logger="core.store.transient">
- <parameter name="maxobjects" value="${transient-store.maxobjects}"/>
+ <parameter name="maxobjects" value="100"/>
</transient-store>
-
- <!--+
- | Transient Store: holds objects that don't have to survive shutdown
- |
- | Common configuration parameters:
- | 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.
- +-->
- <xmlfile-store logger="core.store.transient">
- <parameter name="maxobjects" value="${xmlfile-store.maxobjects}"/>
- </xmlfile-store>
-
<!--+
| Store: generic store. The default implementation is an in-memory store
| backed by a disk store (based on EHCache). This forms a two-stage
@@ -576,7 +481,7 @@
| in the cache will be thrown out.
+-->
<store logger="core.store">
- <parameter name="maxobjects" value="${store.maxobjects}"/>
+ <parameter name="maxobjects" value="1000"/>
<parameter name="use-cache-directory" value="true"/>
</store>
@@ -607,19 +512,19 @@
| How much free memory shall be available in the jvm?
| If not specified, defaults to 1Mb.
+-->
- <parameter name="freememory" value="${store-janitor.freememory}"/>
+ <parameter name="freememory" value="1000000"/>
<!--+
| How much memory at max jvm can consume?
| The default max heapsize for Sun's JVM is (almost) 64Mb,
| can be increased by specifying -Xmx command line parameter.
| If not specified, defaults to 66600000 bytes.
+-->
- <parameter name="heapsize" value="${store-janitor.heapsize}"/>
+ <parameter name="heapsize" value="67108864"/>
<!--+
| How often shall the cleanup thread check memory?
| If not specified, defaults to 10 seconds.
+-->
- <parameter name="cleanupthreadinterval"
value="${store-janitor.cleanup-thread-interval}"/>
+ <parameter name="cleanupthreadinterval" value="10"/>
<!--+
| Experimental adaptive algorithm for cleanup interval
<parameter name="adaptivethreadinterval" value="true"/>
@@ -628,7 +533,7 @@
| What percent of the store elements shall be dropped on low memory?
| If not specified, defaults to 10%
+-->
- <parameter name="percent_to_free"
value="${store-janitor.percent-to-free}"/>
+ <parameter name="percent_to_free" value="10"/>
<!--+
| Shall garbage collector be invoked on low memory?
| If not specified, defaults to false.
@@ -676,16 +581,9 @@
| 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"/>
- <component-instance
class="org.apache.cocoon.components.source.impl.ModuleSourceFactory"
name="module"/>
- <component-instance
class="org.apache.cocoon.components.source.impl.XModuleSourceFactory"
name="xmodule"/>
<component-instance
class="org.apache.cocoon.components.source.impl.ZipSourceFactory" name="zip"/>
- <component-instance
class="org.apache.cocoon.components.source.impl.EmptySourceFactory"
name="empty"/>
-<component-instance
class="org.apache.forrest.locationmap.source.impl.LocationmapSourceFactory"
name="lm"/>
- <!-- the "*" protocol handles all uri schemes that are not explicitely
specified. This includes all
- JDK standard protocols, with special handling of the "file:" protocol
which is modifiable
- (can be written to) and traversable (directory structures can be
crawled). -->
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
+ <component-instance
class="org.apache.forrest.locationmap.source.impl.LocationmapSourceFactory"
name="lm"/>
+
<!--+
| The "*" protocol handles all uri schemes that are not explicitely
| specified. This includes all JDK standard protocols.
@@ -699,22 +597,14 @@
| I18n Bundle Factory
|
| BundleFactory loads Bundles with i18n resources for the given locale.
- | Default location for bundles specified with the 'catalogue-location'.
- +-->
- <i18n-bundles logger="core.i18n">
- <!--+
- | Role of the store component to be used for caching loaded bundles.
- +-->
- <store-role>org.apache.excalibur.store.Store/TransientStore</store-role>
- <!--+
- | Reload check delay. Default 60000 (1 minute), 0 means no delay
- | (check always), -1 means no reload.
- +-->
- <reload-interval>${i18n-bundles.reload-interval}</reload-interval>
- <!--+
- | Location of the default message catalogue. Optional.
- +-->
-
<catalogue-location>context://samples/i18n/translations</catalogue-location>
+ | Bundles are loaded from the 'catalogue_location'. Bundle base name is
+ | 'catalogue_name' value.
+ | If 'cache-at-startup' is true then BundleFactory preloads bundles.
+ +-->
+ <i18n-bundles logger="core.i18n-bundles">
+ <catalogue-name>messages</catalogue-name>
+ <catalogue-location>i18n/translations</catalogue-location>
+ <cache-at-startup>true</cache-at-startup>
</i18n-bundles>
<!-- ====================== System Components =========================== -->
@@ -733,8 +623,8 @@
| the intermediate results of the pipeline stages reducing the overhead
| of xml parsing/serialization.
+-->
- <xml-serializer
class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"
logger="core.xml.serializer" pool-max="${xml-serializer.pool-max}"/>
- <xml-deserializer
class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml.deserializer" pool-max="${xml-deserializer.pool-max}"/>
+ <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"/>
<!--+
| The Cache Manager is a component that can be used to cache content.
@@ -856,7 +746,8 @@
</thread-pool>
</thread-pools>
</runnable-manager>
-<!--..... Start configuration from 'xsp-markup' -->
+
+<!-- ================ XSP (eXtensible Server Pages) ===================== -->
<!--+
| Logicsheets
@@ -1022,8 +913,6 @@
</target-language>
</xsp-language>
</markup-languages>
-<!--..... End configuration from 'xsp-markup' -->
-<!--..... Start configuration from 'xsp-program-generator' -->
<!--+
| Program Generator
@@ -1041,8 +930,6 @@
<parameter name="root-package" value="org.apache.cocoon.www"/>
<parameter name="preload" value="true"/>
</program-generator>
-<!--..... End configuration from 'xsp-program-generator' -->
-<!--..... Start configuration from 'xsp-program-language' -->
<!--+
| Programming Languages for the XSP pages
@@ -1098,17 +985,16 @@
<!-- Interpreted JavaScript language -->
<js-language logger="core.language.js" name="js"/>
</programming-languages>
-<!--..... End configuration from 'xsp-program-language' -->
-<!--..... Start configuration from 'xsp-xscript' -->
<!-- Xscript -->
<xscript logger="core.xscript">
<parameter name="xscript:copy-of"
value="resource://org/apache/cocoon/components/xscript/xslt/copy-of.xsl"/>
<parameter name="xscript:value-of"
value="resource://org/apache/cocoon/components/xscript/xslt/value-of.xsl"/>
</xscript>
-<!--..... End configuration from 'xsp-xscript' -->
-<!--..... Start configuration from 'lucene' -->
+<!-- ========== Components used for Lucene-based searching ========== -->
+
+ <include src="resource://org/apache/cocoon/components/search/lucene.roles"/>
<!-- Search:
These are the components that handle the search.
@@ -1122,18 +1008,33 @@
<cocoon-searcher logger="core.search.searcher"/>
<cocoon-crawler logger="core.search.crawler"/>
<lucene-xml-indexer logger="core.search.lucene"/>
-<!--..... End configuration from 'lucene' -->
-<!--..... Start configuration from 'profiler' -->
+<!-- ========== Components used for profiling ========== -->
+
+ <include
src="resource://org/apache/cocoon/components/profiler/profiler.roles"/>
<!--+
| Profiler:
| The profiler facilitates the gathering of statistics about timings of
| different steps of pipelines.
+-->
- <profiler results="10"/>
-<!--..... End configuration from 'profiler' -->
-<!--..... Start configuration from 'cocoon-template-expression' -->
+ <profiler results="20"/><!-- default is 10 -->
+
+<!-- ========== Components used for debugging ========== -->
+<!--+
+ | Send sitemap execution messages to the debug log category.
+ | Warning: It is very verbose. Off by default.
+ +-->
+<!--
+<component role="org.apache.cocoon.sitemap.SitemapExecutor"
+ class="org.apache.cocoon.profiler.debugging.SimpleSitemapExecutor"
+ logger="debug"/>
+-->
+
+<!-- ========== Components used for template ========== -->
+
+ <include
src="resource://org/apache/cocoon/components/expression/expression.roles"/>
+ <include
src="resource://org/apache/cocoon/components/accessor/accessor.roles"/>
<expression-factory/>
<expression-compilers>
@@ -1146,16 +1047,13 @@
<component-instance
class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"
name="jxtg"/>
<component-instance
class="org.apache.cocoon.template.expression.DefaultStringTemplateParser"
name="default"/>
</string-template-parsers>
-<!--..... End configuration from 'cocoon-template-expression' -->
-<!--..... Start configuration from 'cocoon-template' -->
<component class="org.apache.cocoon.template.script.DefaultScriptManager"
role="org.apache.cocoon.template.script.ScriptManager"/>
<component
class="org.apache.cocoon.template.script.DefaultInstructionFactory"
role="org.apache.cocoon.template.script.InstructionFactory"/>
<component
class="org.apache.cocoon.template.expression.JXTGStringTemplateParser"
role="org.apache.cocoon.template.expression.StringTemplateParser"/>
-<!--..... End configuration from 'cocoon-template' -->
-<!--..... Start configuration from 'validation' -->
-
+<!-- ========== Components used for xml validation ========== -->
+ <include
src="resource://org/apache/cocoon/components/validation/validation.roles"/>
<!--+
| The shared Validator instance in Cocoon.
|
@@ -1170,7 +1068,6 @@
<factory-class>org.apache.xerces.jaxp.validation.XMLSchemaFactory</factory-class>
</schema-parser>
</validator>
-
-<!--..... End configuration from 'validation' -->
+
</cocoon>
Added:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/README.txt
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/README.txt?rev=688047&view=auto
==============================================================================
---
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/README.txt
(added)
+++
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/README.txt
Fri Aug 22 03:48:25 2008
@@ -0,0 +1,2 @@
+These files are not used by Forrest Cocoon-2.1
+The content of xconf/forrest-core.xconf has been copied to ../cocoon.xconf
Propchange:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
