stephan 2003/05/05 02:09:40
Modified: src/blocks/chaperon/samples sitemap.xmap
Removed: src/blocks/chaperon/conf chaperon-xmlizer.xconf
chaperon-xmlizer.xroles
src/blocks/chaperon/java/org/apache/cocoon/xml
TextXMLizer.java
Log:
Remove text xmlizer, and using the TextGenerator instead.
Revision Changes Path
1.12 +21 -84 cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sitemap.xmap 7 Apr 2003 12:31:12 -0000 1.11
+++ sitemap.xmap 5 May 2003 09:09:40 -0000 1.12
@@ -10,32 +10,14 @@
<map:generators default="file">
- <map:generator label="content,data" logger="sitemap.generator.file"
name="file"
- src="org.apache.cocoon.generation.FileGenerator"/>
+ <map:generator name="text" logger="sitemap.generator.textgenerator"
+ src="org.apache.cocoon.generation.TextGenerator" />
- <map:generator name="serverpages" logger="sitemap.generator.serverpages"
label="content,data"
- src="org.apache.cocoon.generation.ServerPagesGenerator"/>
-
- <map:generator label="content,data" logger="sitemap.generator.directory"
name="directory"
- src="org.apache.cocoon.generation.DirectoryGenerator"/>
-
- <map:generator name="text"
- src="org.apache.cocoon.generation.TextGenerator"
- logger="sitemap.generator.textgenerator"/>
</map:generators>
<!-- =========================== Transformers
================================= -->
<map:transformers default="xslt">
- <map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer"
- logger="sitemap.transformer.xsltc">
- <use-request-parameters>true</use-request-parameters>
- <use-browser-capabilities-db>false</use-browser-capabilities-db>
-
<transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>
- </map:transformer>
-
- <map:transformer logger="sitemap.transformer.log" name="log"
- src="org.apache.cocoon.transformation.LogTransformer"/>
<map:transformer name="pattern"
src="org.apache.cocoon.transformation.PatternTransformer"
@@ -54,46 +36,6 @@
</map:transformers>
-<!-- =========================== Serializers
================================= -->
-
- <map:serializers default="html">
- <map:serializer logger="sitemap.serializer.xml" mime-type="text/xml"
name="xml"
- src="org.apache.cocoon.serialization.XMLSerializer">
- <indent>yes</indent>
- </map:serializer>
-
- <map:serializer logger="sitemap.serializer.html" mime-type="text/html"
name="html"
- src="org.apache.cocoon.serialization.HTMLSerializer">
- <buffer-size>1024</buffer-size>
- </map:serializer>
-
- <map:serializer logger="sitemap.serializer.links" name="links"
- src="org.apache.cocoon.serialization.LinkSerializer"/>
-
- </map:serializers>
-
-<!-- =========================== Readers =================================
-->
-
- <map:readers default="resource">
- <map:reader logger="sitemap.reader.resource" name="resource"
- src="org.apache.cocoon.reading.ResourceReader"/>
- </map:readers>
-
-<!-- =========================== Matchers =================================
-->
-
- <map:matchers default="wildcard">
- <map:matcher logger="sitemap.matcher.wildcard" name="wildcard"
- src="org.apache.cocoon.matching.WildcardURIMatcher"/>
- </map:matchers>
-
-<!-- ====================== Pipelines defintions
============================= -->
-
- <map:pipes default="caching">
- <map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
- <map:pipe name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
-
- </map:pipes>
-
</map:components>
<!-- =========================== Views ===================================
-->
@@ -103,7 +45,7 @@
<map:serialize type="xml"/>
</map:view>
- <map:view from-label="parser-output" name="parser-output">
+ <map:view from-label="ast" name="ast">
<map:serialize type="xml"/>
</map:view>
@@ -127,7 +69,7 @@
the myapp.xlex and myapp.xgrm URLs and then view source.
-->
<map:match pattern="*.xlex">
- <map:generate src="grammars/{1}.grm"/>
+ <map:generate type="text" src="grammars/{1}.grm"/>
<map:transform type="lexer" src="grammars/grm.xlex"/>
<map:transform type="parser" src="grammars/grm.xgrm"/>
<map:transform src="stylesheets/text4regex.xsl"/>
@@ -138,7 +80,7 @@
</map:match>
<map:match pattern="*.xgrm">
- <map:generate src="grammars/{1}.grm"/>
+ <map:generate type="text" src="grammars/{1}.grm"/>
<map:transform type="lexer" src="grammars/grm.xlex"/>
<map:transform type="parser" src="grammars/grm.xgrm"/>
<map:transform src="stylesheets/text4regex.xsl"/>
@@ -150,10 +92,15 @@
<map:match pattern="packages.xml">
- <map:generate type="directory" src="misc/">
+ <map:generate type="directory" src="misc/">
<map:parameter name="depth" value="6"/>
</map:generate>
- <map:transform src="stylesheets/index4java.xsl"/>
+ <map:transform src="stylesheets/index4java.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
+
+ <map:match pattern="**/*.java.xml">
+ <map:generate type="text" src="misc/{1}/{2}.java"/>
<map:serialize type="xml"/>
</map:match>
@@ -165,7 +112,7 @@
</map:match>
<map:match pattern="welcome">
- <map:generate src="misc/samples.xml"/>
+ <map:generate src="misc/samples.xml"/>
<map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
<map:parameter name="contextPath" value="{request:contextPath}"/>
</map:transform>
@@ -193,22 +140,18 @@
</map:match>
<map:match pattern="wikitest/*.html">
- <map:generate src="wikitest/{1}.txt"/>
+ <map:generate type="text" src="wikitest/{1}.txt"/>
<map:transform type="lexer" src="cocoon:/wiki.xlex"/>
- <map:transform type="parser" src="cocoon:/wiki.xgrm"
label="parser-output"/>
+ <map:transform type="parser" src="cocoon:/wiki.xgrm"
label="ast"/>
<map:transform src="stylesheets/wiki2xdoc.xsl"
label="xdoc"/>
<map:transform src="stylesheets/xdoc2html.xsl"/>
<map:serialize type="html"/>
</map:match>
<map:match pattern="quote.html">
- <map:generate type="text" src="misc/quote.txt"/>
-<!--
- <map:transform type="lexer" src="cocoon:/quote.xlex"/>
- <map:transform type="parser" src="cocoon:/quote.xgrm"/>
--->
+ <map:generate type="text" src="misc/quote.txt"/>
<map:transform type="lexer" src="grammars/quote.xlex"/>
- <map:transform type="parser" src="grammars/quote.xgrm"/>
+ <map:transform type="parser" src="grammars/quote.xgrm" label="ast"/>
<map:transform src="stylesheets/quote2html.xsl"/>
<map:serialize type="html"/>
</map:match>
@@ -231,13 +174,11 @@
<map:match pattern="**/*.java.html">
<map:aggregate element="java">
<map:part src="cocoon:/packages.xml"/>
- <map:part src="misc/{1}/{2}.java"/>
+ <map:part src="cocoon:/{1}/{2}.java.xml"/>
</map:aggregate>
- <!--<map:transform type="lexer" src="cocoon:/java.xlex"/>-->
<map:transform type="lexer" src="grammars/java.xlex"/>
<map:transform src="stylesheets/text4javadoc.xsl"/>
- <!--<map:transform type="lexer" src="cocoon:/javadoc.xlex"/>-->
- <map:transform type="lexer" src="grammars/javadoc.xlex"/>
+ <map:transform type="lexer" src="grammars/javadoc.xlex" label="ast"/>
<map:transform src="stylesheets/java2html.xsl">
<map:parameter name="package" value="{1}"/>
<map:parameter name="class" value="{2}"/>
@@ -248,18 +189,14 @@
<map:match pattern="**/*.class.html">
<map:aggregate element="java">
<map:part src="cocoon:/packages.xml"/>
- <map:part src="misc/{1}/{2}.java"/>
+ <map:part src="cocoon:/{1}/{2}.java.xml"/>
</map:aggregate>
- <!--<map:transform type="lexer" src="cocoon:/java.xlex"/>-->
<map:transform type="lexer" src="grammars/java.xlex"/>
<map:transform src="stylesheets/remove4class.xsl"/>
- <!--<map:transform type="parser" src="cocoon:/java.xgrm"/>-->
<map:transform type="parser" src="grammars/java.xgrm"/>
<map:transform src="stylesheets/text4javadoc2.xsl"/>
- <!--<map:transform type="lexer" src="cocoon:/javadoc.xlex"/>-->
<map:transform type="lexer" src="grammars/javadoc.xlex"/>
- <!--<map:transform type="parser" src="cocoon:/javadoc.xgrm"/>-->
- <map:transform type="parser" src="grammars/javadoc.xgrm"/>
+ <map:transform type="parser" src="grammars/javadoc.xgrm" label="ast"/>
<map:transform src="stylesheets/class2html.xsl">
<map:parameter name="package" value="{1}"/>
<map:parameter name="class" value="{2}"/>
