Author: crossley
Date: Thu Aug 21 22:06:04 2008
New Revision: 687944
URL: http://svn.apache.org/viewvc?rev=687944&view=rev
Log:
Only formatting changes. Synchronise comments and order of attributes with
cocoon-2.1 xconf. Helps with diffs.
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Modified:
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=687944&r1=687943&r2=687944&view=diff
==============================================================================
---
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
(original)
+++
forrest/branches/update_cocoon_2.1.12-dev/main/webapp/WEB-INF/xconf/forrest-core.xconf
Thu Aug 21 22:06:04 2008
@@ -131,7 +131,7 @@
+-->
<flow-interpreters default="javascript" logger="flow">
<!-- FOM (Flow Object Model) -->
- <component-instance exported="false" name="javascript"
class="org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptInterpreter">
+ <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>true</reload-scripts>
@@ -175,14 +175,14 @@
| indirection, other components can be more generic and changes
| to the application logic are easier.
|
- | A number of components already use InputModules: the sitemap
processor,
+ | A number of components already use InputModules: the sitemap processor,
| flow, some matchers, the linkrewriting transformer, database actions
| and more.
|
| For example the sitemap processor allows to obtain a value
| named "foo" from an the InputModule for request parameters by
| writing {request-param:foo} wherever a sitemap variable is
- | allowed.
+ | allowed.
|
| Some InputModules need the help of other InputModules to
| obtain values and only apply a function to the obtained value
@@ -190,7 +190,7 @@
| carry "Meta" in their name. An example is the ChainMetaModule
| which tries several other modules in turn until a non-null
| value is obtained or all modules are tied.
- |
+ |
| For details and optional configuration parameters refer to the
| accompanying javadocs.
+-->
@@ -219,16 +219,15 @@
<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 logger="core.modules.input" name="forrest"
class="org.apache.cocoon.components.modules.input.ChainMetaModule">
+
+ <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>
@@ -312,7 +311,7 @@
| Each source factory adds a special uri schemes to the system.
+-->
<source-factories>
- <component-instance name="file"
class="org.apache.excalibur.source.impl.FileSourceFactory"/>
+ <component-instance
class="org.apache.excalibur.source.impl.FileSourceFactory" name="file"/>
<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"/>
@@ -323,6 +322,7 @@
(can be written to) and traversable (directory structures can be
crawled). -->
<component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
</source-factories>
+
<!--+
| Entity resolution catalogs
|
@@ -371,11 +371,10 @@
<!--+
| XML Parser
|
- | The default parser used in Apache Cocoon is
- | org.apache.excalibur.xml.impl.JaxpParser. Apache Cocoon requires a
- | JAXP 1.1 parser.
- | If you have problems because your servlet environment uses its own
- | parser not conforming to JAXP 1.1 try using the alternative
+ | Apache Cocoon requires a JAXP 1.1 parser. The default parser is
+ | org.apache.excalibur.xml.impl.JaxpParser.
+ | Note: If you have problems because your servlet environment uses its
+ | own parser not conforming to JAXP 1.1 try using the alternative
| XercesParser instead of the JaxpParser. To activate the XercesParser,
| change the class attribute to
| class="org.apache.excalibur.xml.impl.XercesParser"
@@ -383,16 +382,16 @@
| probably on the startup of your servlet engine like this:
|
-Dorg.apache.excalibur.xml.sax.SAXParser=org.apache.excalibur.xml.impl.XercesParser
|
- | Configuration for the JaxpParser (not the XercesParser!):
- | - validate (boolean, default = false): This parameter causes the parser
- | to be a validating parser.
- | XML validation is only being used for the documentation build.
+ | Configuration parameters for the JaxpParser (not the XercesParser!):
+ | - validate (boolean, default = false): should the parser validate
+ | parsed documents?
+ | Note: XML validation is only being used for the documentation
build.
| (If you are going to use it elsewhere, then do so with caution.)
| You really should have validated all of your XML documents already,
| according to their proper DTD or schema. Do not expect Cocoon
| to do it.
| - namespace-prefixes (boolean, default = false) : do we want
- | namespaces declarations also as 'xmlns:' attributes ?
+ | namespaces declarations also as 'xmlns:' attributes?
| Note : setting this to true confuses some XSL processors
| (e.g. Saxon).
| - stop-on-warning (boolean, default = true) : should the parser
@@ -404,14 +403,19 @@
| Note : even if this parameter is true, parsers are not recycled
| in case of parsing errors : some parsers (e.g. Xerces) do not like
| to be reused after failure.
- | - sax-parser-factory (string) : the name of the SAXParserFactory
- | implementation class to be used instead of using the standard
- | JAXP mechanism (SAXParserFactory.newInstance()). This allows to
- | choose unambiguously the JAXP implementation to be used when
- | several of them are available in the classpath.
- | - document-builder-factory (string) : the name of the
+ | - sax-parser-factory (string, optional) : the name of the
+ | SAXParserFactory implementation class to be used instead of using
+ | the standard JAXP mechanism (SAXParserFactory.newInstance()). This
+ | allows to choose unambiguously the JAXP implementation to be used
+ | when several of them are available in the classpath.
+ | - document-builder-factory (string, optional) : the name of the
| DocumentBuilderFactory implementation to be used (similar to
| sax-parser-factory for DOM).
+ | - drop-dtd-comments : should comment() events from DTD's be dropped?
+ | Note: Since this implementation does not support the DeclHandler
+ | interface anyway, it is quite useless to only have the comments
+ | 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-grow="4" pool-max="32" pool-min="8">
<parameter name="validate" value="false"/>
@@ -475,19 +479,23 @@
| <parameter name="transformer-factory"
value="net.sf.saxon.TransformerFactoryImpl"/>
+-->
<component logger="core.xslt-processor"
- role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
- class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl">
+ role="org.apache.excalibur.xml.xslt.XSLTProcessor/saxon"
+ 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: -->
+ <!--+
+ | Xpath Processor (Based on Xalan)
+ +-->
<xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
logger="core.xpath-processor"/>
- <!-- The XMLizers converts different mime-types to XML -->
+ <!--+
+ | The XMLizers converts different mime-types to XML
+ +-->
<xmlizer>
- <parser mime-type="text/xml"
role="org.apache.excalibur.xml.sax.SAXParser"/>
+ <parser mime-type="text/xml"
role="org.apache.excalibur.xml.sax.SAXParser"/>
<!--..... Start configuration from 'tidy' -->
