unico 2003/12/28 12:50:02
Modified: src/java/org/apache/cocoon cocoon.roles
src/webapp/WEB-INF cocoon.xconf
Log:
enable entity resolver
Revision Changes Path
1.15 +2 -13 cocoon-2.2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cocoon.roles 27 Dec 2003 15:12:42 -0000 1.14
+++ cocoon.roles 28 Dec 2003 20:50:02 -0000 1.15
@@ -14,7 +14,6 @@
<role-list>
<!-- Parser:
-
Starting with Cocoon 2.1 we have a bunch of different parser:
- a SAX parser (producing SAX events)
- a DOM parser (producint a document)
@@ -22,7 +21,7 @@
...
-->
- <!-- This is the usual SAX parser -->
+ <!-- This is the default SAX parser -->
<role name="org.apache.excalibur.xml.sax.SAXParser">
<component
shorthand="xml-parser"
@@ -31,7 +30,7 @@
/>
</role>
- <!-- This is the usual DOM parser
+ <!-- This is the default DOM parser
<role name="org.apache.excalibur.xml.dom.DOMParser">
<component
shorthand="dom-parser"
@@ -41,7 +40,6 @@
</role>
-->
- <!-- XSLT: -->
<role name="org.apache.excalibur.xml.xslt.XSLTProcessor">
<component
shorthand="xslt-processor"
@@ -62,15 +60,6 @@
<component
shorthand="xpath-processor"
class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
-
handler="org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler"
- />
- </role>
-
- <!-- The entity resolver used by most parsers -->
- <role name="org.apache.excalibur.xml.EntityResolver">
- <component
- shorthand="entity-resolver"
- class="org.apache.cocoon.components.resolver.DefaultResolver"
handler="org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler"
/>
</role>
1.35 +63 -60 cocoon-2.2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cocoon.xconf 27 Dec 2003 15:07:19 -0000 1.34
+++ cocoon.xconf 28 Dec 2003 20:50:02 -0000 1.35
@@ -29,9 +29,10 @@
file="context://sitemap.xmap"
check-reload="yes"
logger="sitemap"
- activation="inline"
/>
+<!-- ================================= XML ================================
-->
+
<!--+
| XML Parser
|
@@ -109,18 +110,15 @@
| * incremental processing is a 'static' thing in Xalan: if
you
| enable it on one xslt-processor, enable it on all.
+-->
- <xslt-processor id="xslt" logger="core.xslt-processor">
+ <xslt-processor id="xslt" logger="core.xslt-processor" default="true">
<parameter name="use-store" value="false"/>
<parameter name="incremental-processing" value="false"/>
</xslt-processor>
<!--+
| XSLT Processor using xsltc from Xalan
- | For Interpreted Xalan use:
- |
<transformer-factory>org.apache.xalan.processor.TransformerFactoryImpl</transformer-factory>
+-->
- <xslt-processor id="xsltc"
- logger="core.xslt-processor">
+ <xslt-processor id="xsltc" logger="core.xslt-processor">
<parameter name="use-store" value="false"/>
<parameter name="transformer-factory"
value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
</xslt-processor>
@@ -128,15 +126,19 @@
<!--+
| Xalan XSLT Processor
+-->
- <xslt-processor id="xalan"
- logger="core.xslt-processor">
+ <xslt-processor id="xalan" logger="core.xslt-processor">
<parameter name="use-store" value="false"/>
<parameter name="incremental-processing" value="false"/>
<parameter name="transformer-factory"
value="org.apache.xalan.processor.TransformerFactoryImpl"/>
</xslt-processor>
+ <!--+
+ | Xpath Processor
+ +-->
+ <xpath-processor id="xpath-processor" logger="core.xpath-processor" />
+
<!-- The XMLizers converts different mime-types to XML -->
- <xmlizer id="xmlizer">
+ <xmlizer id="xmlizer" logger="core.xmlizer">
<parser role="org.apache.excalibur.xml.sax.SAXParser"
mime-type="text/xml" />
</xmlizer>
@@ -158,13 +160,59 @@
|
| Each source factory adds a special uri schemes to the system.
+-->
- <url-source id="url" logger="core.source.url" />
- <context-source id="context" logger="core.source.context" />
- <cocoon-source id="cocoon" logger="core.source.cocoon" />
- <file-source id="file" logger="core.source.file" />
- <resource-source id="resource" logger="core.source.resource" />
+ <url-source id="url" logger="core.source.url" />
+ <context-source id="context" logger="core.source.context" />
+ <cocoon-source id="cocoon" logger="core.source.cocoon" />
+ <file-source id="file" logger="core.source.file" />
+ <resource-source id="resource" logger="core.source.resource" />
- <source-resolver id="cocoon-source-resolver"
logger="core.source-resolver" />
+ <!--+
+ | Source Resolver
+ |
+ | Custom source resolver acting both as Cocoon's own environment
+ | SourceResolver and excalibur SourceResolver.
+ +-->
+ <source-resolver id="cocoon-source-resolver" logger="core.source-resolver"
/>
+
+ <!--+
+ | 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:
+ |
+ | <parameter name="catalog" value="WEB-INF/entities/catalog"/>
+ |
+ | However, it is probably 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.
+ |
+ | <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
+ |
+ | verbosity:
+ | The level of messages for status/debug (messages go to standard
output)
+ | The following messages are provided ...
+ | 0 = none
+ | 1 = ? (... not sure yet)
+ | 2 = 1+, Loading catalog, Resolved public, Resolved system
+ | 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 id="entity-resolver" logger="core.entity-resolver">
+ <parameter name="catalog" value="WEB-INF/entities/catalog"/>
+ <parameter name="verbosity" value="1"/>
+ </entity-resolver>
<!-- TODO: entries below are still 2.1 configuration -->
@@ -356,51 +404,6 @@
<component-instance logger="core.modules.output" name="request-attr-map"
class="org.apache.cocoon.components.modules.output.RequestAttributeMap"/>
<component-instance logger="core.modules.output" name="session-attr"
class="org.apache.cocoon.components.modules.output.SessionAttributeOutputModule"/>
</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:
- |
- | <parameter name="catalog" value="WEB-INF/entities/catalog"/>
- |
- | However, it is probably 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.
- |
- | <parameter name="local-catalog" value="/usr/local/sgml/mycatalog"/>
- |
- | verbosity:
- | The level of messages for status/debug (messages go to standard
output)
- | The following messages are provided ...
- | 0 = none
- | 1 = ? (... not sure yet)
- | 2 = 1+, Loading catalog, Resolved public, Resolved system
- | 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="WEB-INF/entities/catalog"/>
- <parameter name="verbosity" value="1"/>
- </entity-resolver>
-
- <!-- Xpath Processor: -->
- <xpath-processor class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"
logger="core.xpath-processor"/>
<!-- ============================ Object Stores ===========================
-->
