stefano 2003/03/25 08:13:45
Modified: src/blocks/profiler/samples sitemap.xmap
src/webapp/samples sitemap.xmap
src/blocks/databases/samples sitemap.xmap
src/blocks/web3/samples sitemap.xmap
src/blocks/slide/samples sitemap.xmap
src/webapp/samples/simpleform sitemap.xmap
Removed: src/webapp/samples/common/style/xsl/html directory2html.xsl
error2html.xsl simple-sitemap2html.xsl
simple-xml2html.xsl
Log:
incremental (pain free, hopefully) refactor of samples: trying to reduce duplication
of stylesheets
Revision Changes Path
1.3 +2 -16 cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 21 Mar 2003 17:31:28 -0000 1.2
+++ sitemap.xmap 25 Mar 2003 16:13:43 -0000 1.3
@@ -39,7 +39,7 @@
</map:view>
<map:view name="pretty-content" from-label="data">
- <map:transform
src="context://samples/common/style/xsl/html/simple-xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xsl"/>
<map:serialize type="html"/>
</map:view>
@@ -64,11 +64,6 @@
<map:serialize type="html"/>
</map:match>
- <map:handle-errors>
- <map:transform src="context://samples/common/style/xsl/html/error2html.xsl"/>
- <map:serialize type="html" status-code="500"/>
- </map:handle-errors>
-
</map:pipeline>
<!-- =========================== Noncacheable ================================= -->
@@ -82,11 +77,6 @@
<map:serialize type="html"/>
</map:match>
- <map:handle-errors>
- <map:transform src="context://samples/common/style/xsl/html/error2html.xsl"/>
- <map:serialize type="html" status-code="500"/>
- </map:handle-errors>
-
</map:pipeline>
<!-- =========================== Profiler ================================= -->
@@ -135,12 +125,8 @@
<map:read src="{1}.js" mime-type="text/javascript"/>
</map:match>
- <map:handle-errors>
- <map:transform src="context://samples/common/style/xsl/html/error2html.xsl"/>
- <map:serialize type="html" status-code="500"/>
- </map:handle-errors>
-
</map:pipeline>
+
</map:pipelines>
</map:sitemap>
1.7 +2 -2 cocoon-2.1/src/webapp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 17 Mar 2003 00:47:43 -0000 1.6
+++ sitemap.xmap 25 Mar 2003 16:13:44 -0000 1.7
@@ -29,7 +29,7 @@
</map:view>
<map:view name="pretty-content" from-label="data">
- <map:transform src="common/style/xsl/html/simple-xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xsl"/>
<map:serialize type="html"/>
</map:view>
1.3 +1 -1 cocoon-2.1/src/blocks/databases/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/samples/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 21 Mar 2003 05:27:32 -0000 1.2
+++ sitemap.xmap 25 Mar 2003 16:13:44 -0000 1.3
@@ -30,7 +30,7 @@
</map:view>
<map:view name="pretty-content" from-label="data">
- <map:transform
src="context://samples/common/style/xsl/html/simple-xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xsl"/>
<map:serialize type="html"/>
</map:view>
1.2 +78 -78 cocoon-2.1/src/blocks/web3/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/samples/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Mar 2003 00:06:41 -0000 1.1
+++ sitemap.xmap 25 Mar 2003 16:13:45 -0000 1.2
@@ -1,78 +1,78 @@
-<?xml version="1.0"?>
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <!-- =========================== Components ================================
-->
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt">
- <!-- include the transformer like this:
- -->
- <map:transformer name="rfc"
src="org.apache.cocoon.transformation.Web3RfcTransformer" logger="web3.transformation">
- <system>indy</system>
- </map:transformer>
- </map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:selectors default="browser"/>
- <map:matchers default="wildcard"/>
- </map:components>
-
- <!-- =========================== Views =================================== -->
-
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view name="pretty-content" from-label="data">
- <map:transform
src="context://samples/common/style/xsl/html/simple-xml2html.xsl"/>
- <map:serialize type="html"/>
- </map:view>
-
- <map:view name="links" from-position="last">
- <map:serialize type="links"/>
- </map:view>
-
- <map:view from-label="generic" name="generic">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view from-label="source" name="source">
- <map:serialize type="xml"/>
- </map:view>
-
- </map:views>
-
- <!-- =========================== Pipelines =================================
-->
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="">
- <map:redirect-to uri="samples"/>
- </map:match>
-
- <map:match pattern="samples">
- <map:generate src="samples.xml"/>
- <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
- <map:match pattern="">
- <map:redirect-to uri="info.html"/>
- </map:match>
- <map:match pattern="*.html">
- <map:generate src="resources/{1}.xml"/>
- <map:transform type="rfc"/>
- <map:transform src="stylesheets/rfc2html.xsl"/>
- <map:serialize/>
- </map:match>
- <map:match pattern="*.xml">
- <map:generate src="resources/{1}.xml" label="source"/>
- <map:transform type="rfc" label="generic"/>
- <map:transform src="stylesheets/proper.xsl"/>
- <map:transform src="stylesheets/pretty.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0"?>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
+ <!-- =========================== Components ================================
-->
+ <map:components>
+ <map:generators default="file"/>
+ <map:transformers default="xslt">
+ <!-- include the transformer like this:
+ -->
+ <map:transformer name="rfc"
src="org.apache.cocoon.transformation.Web3RfcTransformer" logger="web3.transformation">
+ <system>indy</system>
+ </map:transformer>
+ </map:transformers>
+ <map:readers default="resource"/>
+ <map:serializers default="html"/>
+ <map:selectors default="browser"/>
+ <map:matchers default="wildcard"/>
+ </map:components>
+
+ <!-- =========================== Views =================================== -->
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view name="pretty-content" from-label="data">
+ <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:serialize type="html"/>
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links"/>
+ </map:view>
+
+ <map:view from-label="generic" name="generic">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view from-label="source" name="source">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ </map:views>
+
+ <!-- =========================== Pipelines =================================
-->
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="">
+ <map:redirect-to uri="samples"/>
+ </map:match>
+
+ <map:match pattern="samples">
+ <map:generate src="samples.xml"/>
+ <map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="">
+ <map:redirect-to uri="info.html"/>
+ </map:match>
+ <map:match pattern="*.html">
+ <map:generate src="resources/{1}.xml"/>
+ <map:transform type="rfc"/>
+ <map:transform src="stylesheets/rfc2html.xsl"/>
+ <map:serialize/>
+ </map:match>
+ <map:match pattern="*.xml">
+ <map:generate src="resources/{1}.xml" label="source"/>
+ <map:transform type="rfc" label="generic"/>
+ <map:transform src="stylesheets/proper.xsl"/>
+ <map:transform src="stylesheets/pretty.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
1.2 +14 -22 cocoon-2.1/src/blocks/slide/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Mar 2003 00:06:26 -0000 1.1
+++ sitemap.xmap 25 Mar 2003 16:13:45 -0000 1.2
@@ -63,18 +63,20 @@
<!-- =========================== Views =================================== -->
<map:views>
- <map:view name="content" from-label="content">
- <map:transform
src="context://samples/common/style/xsl/html/simple-xml2html.xsl"/>
- <map:serialize type="html">
- <encoding>ASCII</encoding>
- </map:serialize>
- </map:view>
-
- <map:view name="xml" from-label="content">
- <map:serialize type="xml">
- <encoding>ASCII</encoding>
- </map:serialize>
- </map:view>
+
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view name="pretty-content" from-label="data">
+ <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:serialize type="html"/>
+ </map:view>
+
+ <map:view name="xml" from-label="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
</map:views>
<!-- =========================== Resources =================================== -->
@@ -140,11 +142,6 @@
<map:serialize type="xml"/>
</map:match>
-<!-- <map:handle-errors>
- <map:transform src="context://samples/common/style/xsl/html/error2html.xsl"/>
- <map:serialize status-code="500"/>
- </map:handle-errors>-->
-
</map:pipeline>
<map:pipeline>
@@ -268,11 +265,6 @@
</map:act>
</map:match>
-
- <map:handle-errors>
- <map:transform src="context://samples/common/style/xsl/html/error2html.xsl"/>
- <map:serialize status-code="500"/>
- </map:handle-errors>
</map:pipeline>
1.2 +1 -1 cocoon-2.1/src/webapp/samples/simpleform/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/simpleform/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Mar 2003 00:11:20 -0000 1.1
+++ sitemap.xmap 25 Mar 2003 16:13:45 -0000 1.2
@@ -96,7 +96,7 @@
</map:view>
<map:view name="pretty-content" from-label="data">
- <map:transform
src="context://samples/common/style/xsl/html/simple-xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xsl"/>
<map:serialize type="html"/>
</map:view>
