vgritsenko 02/02/28 13:41:24
Modified: src/java/org/apache/cocoon cocoon.roles
src/webapp sitemap.xmap cocoon.xconf
Log:
Move more components from the sitemap.xmap into the cocoon.xconf
Revision Changes Path
1.13 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cocoon.roles 15 Feb 2002 02:12:30 -0000 1.12
+++ cocoon.roles 28 Feb 2002 21:41:24 -0000 1.13
@@ -172,8 +172,7 @@
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generators"
- default-class="org.apache.cocoon.sitemap.DefaultSitemapComponentSelector">
- </role>
+ default-class="org.apache.cocoon.sitemap.DefaultSitemapComponentSelector"/>
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
1.33 +11 -37 xml-cocoon2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sitemap.xmap 28 Feb 2002 15:18:28 -0000 1.32
+++ sitemap.xmap 28 Feb 2002 21:41:24 -0000 1.33
@@ -55,21 +55,12 @@
also. To simplify this file, some core components are defined there.
-->
<map:generators default="file">
- <map:generator name="directory" logger="sitemap.generator.directory"
label="content,data"
- src="org.apache.cocoon.generation.DirectoryGenerator"/>
-
<map:generator name="imagedirectory" logger="sitemap.generator.imagedirectory"
label="content,data"
src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
- <map:generator name="request" logger="sitemap.generator.request"
label="data"
- src="org.apache.cocoon.generation.RequestGenerator"/>
-
- <map:generator name="status" logger="sitemap.generator.status"
label="data"
- src="org.apache.cocoon.generation.StatusGenerator"/>
-
<map:generator name="extractor" logger="sitemap.generator.extractor"
label="data"
src="org.apache.cocoon.generation.FragmentExtractorGenerator"/>
-</map:generators>
+ </map:generators>
<!--
Transformers can be placed inside the pipeline between the generator
@@ -80,9 +71,6 @@
configuration.
-->
<map:transformers default="xslt">
- <map:transformer name="log" logger="sitemap.transformer.log"
- src="org.apache.cocoon.transformation.LogTransformer"/>
-
<map:transformer name="sql" logger="sitemap.transformer.sql"
src="org.apache.cocoon.transformation.SQLTransformer"/>
@@ -95,12 +83,6 @@
<catalogue-location>translations</catalogue-location>
</map:transformer>
- <map:transformer name="xinclude" logger="sitemap.transformer.xinclude"
- src="org.apache.cocoon.transformation.XIncludeTransformer"/>
-
- <map:transformer name="cinclude" logger="sitemap.transformer.cinclude"
- src="org.apache.cocoon.transformation.CIncludeTransformer"/>
-
<map:transformer name="filter" logger="sitemap.transformer.filter"
src="org.apache.cocoon.transformation.FilterTransformer"/>
@@ -146,11 +128,19 @@
<doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
</map:serializer>
- <map:serializer name="text" mime-type="text/text"
logger="sitemap.serializer.text"
+
+ <map:serializer name="xhtml" mime-type="text/html"
logger="sitemap.serializer.xhtml"
+ src="org.apache.cocoon.serialization.XMLSerializer"
+ pool-max="64" pool-min="2" pool-grow="2">
+ <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+
<doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+ <encoding>UTF-8</encoding>
+ </map:serializer>
+
+ <map:serializer name="text" mime-type="text/text"
logger="sitemap.serializer.text"
src="org.apache.cocoon.serialization.TextSerializer"/>
</map:serializers>
-
<!--
Matchers are executed during pipeline setup. They decide if a
pipeline fragment is used within a pipeline. Usually, the decision
@@ -164,13 +154,6 @@
during pipeline setup.
-->
<map:matchers default="wildcard">
-
- <map:matcher name="wildcard" logger="sitemap.matcher.wildcard"
- src="org.apache.cocoon.matching.WildcardURIMatcher"/>
-
- <map:matcher name="regexp" logger="sitemap.matcher.regexp"
- src="org.apache.cocoon.matching.RegexpURIMatcher"/>
-
<map:matcher name="request-parameter" logger="sitemap.matcher.request-parameter"
src="org.apache.cocoon.matching.RequestParameterMatcher"/>
@@ -265,15 +248,6 @@
during pipeline setup.
-->
<map:actions>
- <map:action name="add-employee" logger="sitemap.action.add-employee"
- src="org.apache.cocoon.acting.DatabaseAddAction"/>
-
- <map:action name="del-employee" logger="sitemap.action.del-employee"
- src="org.apache.cocoon.acting.DatabaseDeleteAction"/>
-
- <map:action name="upd-employee" logger="sitemap.action.upd-employee"
- src="org.apache.cocoon.acting.DatabaseUpdateAction"/>
-
<map:action name="lang-select" logger="sitemap.action.lang-select"
src="org.apache.cocoon.acting.LangSelect"/>
1.32 +63 -20 xml-cocoon2/src/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/cocoon.xconf,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cocoon.xconf 28 Feb 2002 14:53:41 -0000 1.31
+++ cocoon.xconf 28 Feb 2002 21:41:24 -0000 1.32
@@ -506,6 +506,21 @@
label="content,data"
logger="sitemap.generator.serverpages"
pool-max="32" pool-min="4" pool-grow="2"/>
+
+ <component-instance name="directory"
class="org.apache.cocoon.generation.DirectoryGenerator"
+ logger="sitemap.generator.directory"
+ label="content,data"
+ pool-max="16" pool-min="2" pool-grow="2"/>
+
+ <component-instance name="request"
class="org.apache.cocoon.generation.RequestGenerator"
+ logger="sitemap.generator.request"
+ label="data"
+ pool-max="16" pool-min="2" pool-grow="2"/>
+
+ <component-instance name="status"
class="org.apache.cocoon.generation.StatusGenerator"
+ logger="sitemap.generator.status"
+ label="data"
+ pool-max="16" pool-min="2" pool-grow="2"/>
</generators>
<transformers>
@@ -516,34 +531,62 @@
<use-browser-capabilities-db>false</use-browser-capabilities-db>
<use-deli>false</use-deli>
</component-instance>
+
+ <component-instance name="log"
class="org.apache.cocoon.transformation.LogTransformer"
+ logger="sitemap.transformer.log"
+ pool-max="16" pool-min="2" pool-grow="2"/>
+
+ <component-instance name="xinclude"
class="org.apache.cocoon.transformation.XIncludeTransformer"
+ logger="sitemap.transformer.xinclude"
+ pool-max="16" pool-min="2" pool-grow="2"/>
+
+ <component-instance name="cinclude"
class="org.apache.cocoon.transformation.CIncludeTransformer"
+ logger="sitemap.transformer.cinclude"
+ pool-max="16" pool-min="2" pool-grow="2"/>
</transformers>
<serializers>
- <component-instance name="links"
class="org.apache.cocoon.serialization.LinkSerializer"
- logger="sitemap.serializer.links"/>
+ <component-instance name="links"
class="org.apache.cocoon.serialization.LinkSerializer"
+ logger="sitemap.serializer.links"/>
- <component-instance name="xml"
class="org.apache.cocoon.serialization.XMLSerializer"
- mime-type="text/xml"
- logger="sitemap.serializer.xml"/>
-
- <component-instance name="html"
class="org.apache.cocoon.serialization.HTMLSerializer"
- mime-type="text/html"
- logger="sitemap.serializer.html"
- pool-max="32" pool-min="4" pool-grow="4">
- <buffer-size>1024</buffer-size>
- </component-instance>
+ <component-instance name="xml"
class="org.apache.cocoon.serialization.XMLSerializer"
+ mime-type="text/xml"
+ logger="sitemap.serializer.xml"/>
+
+ <component-instance name="html"
class="org.apache.cocoon.serialization.HTMLSerializer"
+ mime-type="text/html"
+ logger="sitemap.serializer.html"
+ pool-max="32" pool-min="4" pool-grow="4">
+ <buffer-size>1024</buffer-size>
+ </component-instance>
</serializers>
<readers>
- <component-instance name="resource"
class="org.apache.cocoon.reading.ResourceReader"
- logger="sitemap.reader.resource"
- pool-max="32"/>
+ <component-instance name="resource"
class="org.apache.cocoon.reading.ResourceReader"
+ logger="sitemap.reader.resource"
+ pool-max="32"/>
</readers>
-<!--
- <matchers/>
- <selectors/>
- <actions/>
--->
+ <matchers>
+ <component-instance name="wildcard"
class="org.apache.cocoon.matching.WildcardURIMatcher"
+ logger="sitemap.matcher.wildcard"/>
+
+ <component-instance name="regexp"
class="org.apache.cocoon.matching.RegexpURIMatcher"
+ logger="sitemap.matcher.regexp"/>
+ </matchers>
+
+ <selectors>
+ </selectors>
+
+ <actions>
+ <component-instance name="add-employee"
class="org.apache.cocoon.acting.DatabaseAddAction"
+ logger="sitemap.action.add-employee"/>
+
+ <component-instance name="del-employee"
class="org.apache.cocoon.acting.DatabaseDeleteAction"
+ logger="sitemap.action.del-employee"/>
+
+ <component-instance name="upd-employee"
class="org.apache.cocoon.acting.DatabaseUpdateAction"
+ logger="sitemap.action.upd-employee"/>
+ </actions>
</cocoon>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
