cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r539120 - in /cocoon/trunk/blocks: cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/ cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/ cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/ cocoon-jcr/cocoon-jc...
Date Thu, 17 May 2007 21:17:33 GMT
Author: felixk
Date: Thu May 17 14:17:32 2007
New Revision: 539120

URL: http://svn.apache.org/viewvc?view=rev&rev=539120
Log:
-use servlet services
-reformatted

Modified:
    cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539120&r1=539119&r2=539120
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 14:17:32 2007
@@ -23,90 +23,92 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html"/>
-    </map:view>
-
-    <map:view from-position="last" name="links">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-<!-- =========================== Pipelines ================================= -->
-
-  <map:pipelines>
-    <map:pipeline type="caching">
-
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-
-      <!-- list of samples -->
-      <map:match pattern="welcome">
-        <map:generate src="samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!-- ================  TIDY  =========================== -->
-
-      <map:match pattern="apache">
-        <map:generate type="html" src="http://cocoon.apache.org/news">
-          <map:parameter name="xpath" value="/html"/>
-        </map:generate>
-        <map:transform src="stylesheets/apache.xsl"/>
-        <map:serialize type="xhtml"/>
-      </map:match>
-
-      <!-- ================  NekoHTML  =========================== -->      
-
-      <map:match pattern="apache-neko">
-        <map:generate type="nekohtml" src="http://cocoon.apache.org/news"/>
-        <map:transform src="stylesheets/apache-no-namespace.xsl"/>
-        <map:serialize type="xhtml"/>
-      </map:match>
-
-      <!-- ================  HTMLTransformer ================= -->
-
-      <map:match pattern="HTMLTransformer/input.xml">
-        <map:generate src="htmltransformer/input.xml"/>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <map:match pattern="HTMLTransformer/parsed.xml">
-        <map:generate src="htmltransformer/input.xml"/>
-        <map:transform type="html">
-          <map:parameter name="tags" value="description,escaped-html"/>
-        </map:transform>
-        <map:transform src="htmltransformer/post-transformer-filter.xsl"/>
-        <map:serialize type="xhtml"/>
-      </map:match>
-
-      <!-- ================  NekoHTMLTransformer ================= -->
-
-      <map:match pattern="NekoHTMLTransformer/input.xml">
-        <map:generate src="htmltransformer/input.xml"/>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <map:match pattern="NekoHTMLTransformer/parsed.xml">
-        <map:generate src="htmltransformer/input.xml"/>
-        <map:transform type="nekohtml">
-          <map:parameter name="tags" value="description,escaped-html"/>
-        </map:transform>
-        <map:transform src="htmltransformer/post-transformer-filter.xsl"/>
-        <map:serialize type="xhtml"/>
-      </map:match>
-    </map:pipeline>
-  </map:pipelines>
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline type="caching">
+
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <!-- list of samples -->
+            <map:match pattern="welcome">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <!-- ================  TIDY  =========================== -->
+
+            <map:match pattern="apache">
+                <map:generate type="html" src="http://cocoon.apache.org/news">
+                    <map:parameter name="xpath" value="/html" />
+                </map:generate>
+                <map:transform src="stylesheets/apache.xsl" />
+                <map:serialize type="xhtml" />
+            </map:match>
+
+            <!-- ================  NekoHTML  =========================== -->
+
+            <map:match pattern="apache-neko">
+                <map:generate type="nekohtml" src="http://cocoon.apache.org/news" />
+                <map:transform src="stylesheets/apache-no-namespace.xsl" />
+                <map:serialize type="xhtml" />
+            </map:match>
+
+            <!-- ================  HTMLTransformer ================= -->
+
+            <map:match pattern="HTMLTransformer/input.xml">
+                <map:generate src="htmltransformer/input.xml" />
+                <map:serialize type="xml" />
+            </map:match>
+
+            <map:match pattern="HTMLTransformer/parsed.xml">
+                <map:generate src="htmltransformer/input.xml" />
+                <map:transform type="html">
+                    <map:parameter name="tags" value="description,escaped-html" />
+                </map:transform>
+                <map:transform src="htmltransformer/post-transformer-filter.xsl" />
+                <map:serialize type="xhtml" />
+            </map:match>
+
+            <!-- ================  NekoHTMLTransformer ================= -->
+
+            <map:match pattern="NekoHTMLTransformer/input.xml">
+                <map:generate src="htmltransformer/input.xml" />
+                <map:serialize type="xml" />
+            </map:match>
+
+            <map:match pattern="NekoHTMLTransformer/parsed.xml">
+                <map:generate src="htmltransformer/input.xml" />
+                <map:transform type="nekohtml">
+                    <map:parameter name="tags" value="description,escaped-html" />
+                </map:transform>
+                <map:transform src="htmltransformer/post-transformer-filter.xsl" />
+                <map:serialize type="xhtml" />
+            </map:match>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539120&r1=539119&r2=539120
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 14:17:32 2007
@@ -18,113 +18,114 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Pipelines ================================= -->
+    <!-- =========================== Pipelines ================================= -->
 
-  <map:pipelines>
-    <map:pipeline>   
- 
-      <map:match pattern="">
-        <map:generate src="samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
- 
-      <map:match pattern="image">
-        <map:read src="logo.jpg"/>
-      </map:match>
-
-      <map:match pattern="*/scale-*-*">
-        <map:read type="image-op-scale" src="{1}" >
-          <map:parameter name="scale-scale" value="{2}"/>
-          <map:parameter name="output-format" value="{3}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/resize-*-*">
-        <map:read type="image-op-resize" src="{1}" >
-          <map:parameter name="size-width" value="{2}"/>
-          <map:parameter name="size-height" value="{3}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/offset-*-*">
-        <map:read type="image-op-offset" src="{1}" >
-          <map:parameter name="offset-up" value="{2}"/>
-          <map:parameter name="offset-left" value="{3}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/mirror-*">
-        <map:read type="image-op-mirror" src="{1}" >
-          <map:parameter name="mirror-along-y" value="{2}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/rotate-*">
-        <map:read type="image-op-rotate" src="{1}" >
-          <map:parameter name="rotate-angle" value="{2}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/grayscale">
-        <map:read type="image-op-grayscale" src="{1}" />
-      </map:match>
-      
-      <map:match pattern="*/crop-*">
-        <map:read type="image-op-crop" src="{1}">
-          <map:parameter name="crop-ratio" value="{2}" />
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/color-*-*-*-*-*-*">
-        <map:read type="image-op-color" src="{1}" >
-          <map:parameter name="color-scale-red" value="{2}"/>
-          <map:parameter name="color-scale-green" value="{3}"/>
-          <map:parameter name="color-scale-blue" value="{4}"/>
-          <map:parameter name="color-offset-red" value="{5}"/>
-          <map:parameter name="color-offset-green" value="{6}"/>
-          <map:parameter name="color-offset-blue" value="{7}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/complex-*-*-*-*-*-*-*-*">
-        <map:read type="image-op-complex" src="{1}" >
-          <map:parameter name="mirror-enabled" value="{2}"/>
-          <map:parameter name="size-width" value="{3}"/>
-          <map:parameter name="size-height" value="{4}"/>
-          <map:parameter name="shear-x" value="{5}"/>
-          <map:parameter name="shear-y" value="{6}"/>
-          <map:parameter name="rotate-angle" value="{7}"/>
-          <map:parameter name="offset-up" value="{8}"/>
-          <map:parameter name="offset-left" value="{9}"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/sharpen">
-        <map:read type="image-op-convolve" src="{1}" >
-          <map:parameter name="convolve-height" value="3" />
-          <map:parameter name="convolve-width" value="3" />
-          <map:parameter name="convolve-data" value="0.0, -1.0, 0.0, -1.0, 5.0, -1.0,
0.0, -1.0, 0.0" />
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/blur">
-        <map:read type="image-op-convolve" src="{1}" >
-          <map:parameter name="convolve-height" value="3" />
-          <map:parameter name="convolve-width" value="3" />
-          <map:parameter name="convolve-data" value="0.1, 0.1, 0.1, 0.1, 0.2, 0.1, 0.1,
0.1, 0.1"/>
-        </map:read>
-      </map:match>
-
-      <map:match pattern="*/overlay/*/*/*">
-        <map:read type="image-op-overlay" src="{1}" >
-          <map:parameter name="overlay-offset-x" value="{3}" />
-          <map:parameter name="overlay-offset-y" value="{4}" />
-          <map:parameter name="overlay-source" value="{2}"/>
-        </map:read>
-      </map:match>
-      
-    </map:pipeline>
-  </map:pipelines>
+    <map:pipelines>
+        <map:pipeline>
+
+            <map:match pattern="">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="image">
+                <map:read src="logo.jpg" />
+            </map:match>
+
+            <map:match pattern="*/scale-*-*">
+                <map:read type="image-op-scale" src="{1}">
+                    <map:parameter name="scale-scale" value="{2}" />
+                    <map:parameter name="output-format" value="{3}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/resize-*-*">
+                <map:read type="image-op-resize" src="{1}">
+                    <map:parameter name="size-width" value="{2}" />
+                    <map:parameter name="size-height" value="{3}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/offset-*-*">
+                <map:read type="image-op-offset" src="{1}">
+                    <map:parameter name="offset-up" value="{2}" />
+                    <map:parameter name="offset-left" value="{3}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/mirror-*">
+                <map:read type="image-op-mirror" src="{1}">
+                    <map:parameter name="mirror-along-y" value="{2}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/rotate-*">
+                <map:read type="image-op-rotate" src="{1}">
+                    <map:parameter name="rotate-angle" value="{2}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/grayscale">
+                <map:read type="image-op-grayscale" src="{1}" />
+            </map:match>
+
+            <map:match pattern="*/crop-*">
+                <map:read type="image-op-crop" src="{1}">
+                    <map:parameter name="crop-ratio" value="{2}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/color-*-*-*-*-*-*">
+                <map:read type="image-op-color" src="{1}">
+                    <map:parameter name="color-scale-red" value="{2}" />
+                    <map:parameter name="color-scale-green" value="{3}" />
+                    <map:parameter name="color-scale-blue" value="{4}" />
+                    <map:parameter name="color-offset-red" value="{5}" />
+                    <map:parameter name="color-offset-green" value="{6}" />
+                    <map:parameter name="color-offset-blue" value="{7}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/complex-*-*-*-*-*-*-*-*">
+                <map:read type="image-op-complex" src="{1}">
+                    <map:parameter name="mirror-enabled" value="{2}" />
+                    <map:parameter name="size-width" value="{3}" />
+                    <map:parameter name="size-height" value="{4}" />
+                    <map:parameter name="shear-x" value="{5}" />
+                    <map:parameter name="shear-y" value="{6}" />
+                    <map:parameter name="rotate-angle" value="{7}" />
+                    <map:parameter name="offset-up" value="{8}" />
+                    <map:parameter name="offset-left" value="{9}" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/sharpen">
+                <map:read type="image-op-convolve" src="{1}">
+                    <map:parameter name="convolve-height" value="3" />
+                    <map:parameter name="convolve-width" value="3" />
+                    <map:parameter name="convolve-data" value="0.0, -1.0, 0.0, -1.0, 5.0,
-1.0, 0.0, -1.0, 0.0" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/blur">
+                <map:read type="image-op-convolve" src="{1}">
+                    <map:parameter name="convolve-height" value="3" />
+                    <map:parameter name="convolve-width" value="3" />
+                    <map:parameter name="convolve-data" value="0.1, 0.1, 0.1, 0.1, 0.2,
0.1, 0.1, 0.1, 0.1" />
+                </map:read>
+            </map:match>
+
+            <map:match pattern="*/overlay/*/*/*">
+                <map:read type="image-op-overlay" src="{1}">
+                    <map:parameter name="overlay-offset-x" value="{3}" />
+                    <map:parameter name="overlay-offset-y" value="{4}" />
+                    <map:parameter name="overlay-source" value="{2}" />
+                </map:read>
+            </map:match>
+
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539120&r1=539119&r2=539120
==============================================================================
--- cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 14:17:32 2007
@@ -24,75 +24,77 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-<!-- =========================== Views =================================== -->
+    <!-- =========================== Views =================================== -->
 
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html"/>
-    </map:view>
-
-    <map:view from-position="last" name="links">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-<!-- =========================== Pipelines ================================= -->
-
-  <map:pipelines>
-    <map:pipeline type="caching">
-
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-
-      <!-- list of samples -->
-      <map:match pattern="welcome">
-        <map:generate src="misc/samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!-- hello world -->
-      <map:match pattern="hello.pdf">
-        <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
-        <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2itext.xsl"/>
-        <map:serialize type="itext2pdf">
-          <map:parameter name="page-size" value="A4"/>
-          <map:parameter name="page-orientation" value="portrait"/>
-        </map:serialize>
-      </map:match>
-
-      <!-- iText document access -->
-      <map:match pattern="**/*.itext.xml">
-        <map:generate src="{1}/{2}.itext.xml"/>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <!-- PDF conversion -->
-      <map:match pattern="**/*.pdf">
-        <map:generate src="cocoon:/{1}/{2}.itext.xml"/>
-        <map:serialize type="itext2pdf"/>
-      </map:match>
-
-      <!-- This would need to add the cocoon-xsp-sample block. Is this dependency desired?
-->
-      <!-- reuse the XSP caching example for our caching test ->
-      <map:match pattern="cache-test-*.pdf">
-        <!- note that caching didn't work when accessing the XSP using the cocoon:/ protocol
->
-        <map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
-        <map:transform src="cache-test/xsp-sample-to-itext.xsl">
-          <map:parameter name="pages" value="{1}"/>
-        </map:transform>
-        <map:serialize type="itext2pdf"/>
-      </map:match>
-      -->
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines ================================= -->
+
+    <map:pipelines>
+        <map:pipeline type="caching">
+
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <!-- list of samples -->
+            <map:match pattern="welcome">
+                <map:generate src="misc/samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <!-- hello world -->
+            <map:match pattern="hello.pdf">
+                <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2itext.xsl"
/>
+                <map:serialize type="itext2pdf">
+                    <map:parameter name="page-size" value="A4" />
+                    <map:parameter name="page-orientation" value="portrait" />
+                </map:serialize>
+            </map:match>
+
+            <!-- iText document access -->
+            <map:match pattern="**/*.itext.xml">
+                <map:generate src="{1}/{2}.itext.xml" />
+                <map:serialize type="xml" />
+            </map:match>
+
+            <!-- PDF conversion -->
+            <map:match pattern="**/*.pdf">
+                <map:generate src="cocoon:/{1}/{2}.itext.xml" />
+                <map:serialize type="itext2pdf" />
+            </map:match>
+
+            <!-- This would need to add the cocoon-xsp-sample block. Is this dependency
desired? -->
+            <!-- reuse the XSP caching example for our caching test ->
+                <map:match pattern="cache-test-*.pdf">
+                <!- note that caching didn't work when accessing the XSP using the cocoon:/
protocol ->
+                <map:generate src="../xsp/java/cacheable.xsp" type="serverpages"/>
+                <map:transform src="cache-test/xsp-sample-to-itext.xsl">
+                <map:parameter name="pages" value="{1}"/>
+                </map:transform>
+                <map:serialize type="itext2pdf"/>
+                </map:match>
+            -->
 
-    </map:pipeline>
-  </map:pipelines>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539120&r1=539119&r2=539120
==============================================================================
--- cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 14:17:32 2007
@@ -20,75 +20,106 @@
   - $Id$
   -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  <map:components>
-    <map:generators default="file">
-      <map:generator name="traversable"
-                     logger="sitemap.generator.traversable"
-                     src="org.apache.cocoon.generation.TraversableGenerator"/>
-    </map:generators>
-  </map:components>
-
-  <map:pipelines>
-    <map:pipeline>
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-   
-      <map:match pattern="welcome">
-        <map:generate src="samples.xml"/>
-        <map:transform src="servlet:style-default:/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="populate">
-        <map:generate src="populate.xml"/>
-        <map:transform type="cinclude"/>
-        <map:transform type="write-source"/>
-        <map:serialize/>
-      </map:match>
-
-      <!-- WildcardURISelector would be just perfect here -->
-      <map:match pattern="browse/">
-        <map:generate type="traversable" src="jcr://"/>
-        <map:transform src="dir2samples.xsl"/>
-        <map:transform src="servlet_style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-      <map:match pattern="browse/**/">
-        <map:generate type="traversable" src="jcr://{1}/"/>
-        <map:transform src="dir2samples.xsl"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-      <map:match pattern="browse/**">
-        <map:generate src="jcr://{1}"/>
-        <map:transform src="dir2samples.xsl"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="repository/">
-        <map:generate type="traversable" src="jcr://"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      <map:match pattern="repository/**/">
-        <map:generate type="traversable" src="jcr://{1}/"/>
-        <map:serialize type="xml"/>
-      </map:match>
-      <map:match pattern="repository/**">
-        <map:generate src="jcr://{1}"/>
-        <map:serialize type="xml"/>
-      </map:match>
-
-      <!-- Mount sitemap from repository -->
-      <map:match pattern="mount/**">
-        <map:mount uri-prefix="mount" src="jcr://cocoon/sitemap"/>
-      </map:match>
 
-    </map:pipeline>
-  </map:pipelines>
+    <!-- =========================== Componenets =================================== -->
+
+    <map:components>
+
+        <!-- =========================== Generators ===================================
-->
+
+        <map:generators default="file">
+            <map:generator name="traversable" logger="sitemap.generator.traversable" src="org.apache.cocoon.generation.TraversableGenerator"
/>
+        </map:generators>
+
+    </map:components>
+
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines =================================== -->
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <map:match pattern="welcome">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+                <map:serialize />
+            </map:match>
+
+            <map:match pattern="populate">
+                <map:generate src="populate.xml" />
+                <map:transform type="cinclude" />
+                <map:transform type="write-source" />
+                <map:serialize />
+            </map:match>
+
+            <!-- WildcardURISelector would be just perfect here -->
+            <map:match pattern="browse/">
+                <map:generate type="traversable" src="jcr://" />
+                <map:transform src="dir2samples.xsl" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+            <map:match pattern="browse/**/">
+                <map:generate type="traversable" src="jcr://{1}/" />
+                <map:transform src="dir2samples.xsl" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+            <map:match pattern="browse/**">
+                <map:generate src="jcr://{1}" />
+                <map:transform src="dir2samples.xsl" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="repository/">
+                <map:generate type="traversable" src="jcr://" />
+                <map:serialize type="xml" />
+            </map:match>
+            <map:match pattern="repository/**/">
+                <map:generate type="traversable" src="jcr://{1}/" />
+                <map:serialize type="xml" />
+            </map:match>
+            <map:match pattern="repository/**">
+                <map:generate src="jcr://{1}" />
+                <map:serialize type="xml" />
+            </map:match>
+
+            <!-- Mount sitemap from repository -->
+            <map:match pattern="mount/**">
+                <map:mount uri-prefix="mount" src="jcr://cocoon/sitemap" />
+            </map:match>
+
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539120&r1=539119&r2=539120
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 14:17:32 2007
@@ -20,49 +20,70 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
- <map:pipelines>
+    <!-- =========================== Views =================================== -->
 
-  <map:pipeline type="caching">  
-   <map:match pattern="">
-    <map:redirect-to uri="welcome"/>
-   </map:match>
-   
-   <map:match pattern="welcome">
-    <map:generate src="misc/samples.xml"/>
-    <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-    <map:transform type="servletLinkRewriter" />
-    <map:serialize/>
-   </map:match>
-
-   <!-- ========================= jfor ================================ -->
-
-   <!-- hello world -->
-   <map:match pattern="hello.rtf">
-    <map:generate src="servlet:main-sample:/hello-world/hello.xml"/>
-    <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"/>
-    <map:serialize type="fo2rtf"/>
-   </map:match>
-
-   <map:match pattern="*.fo.xml">
-    <map:generate src="misc/{1}.fo.xml"/>
-    <map:serialize type="xml"/>
-   </map:match>
-
-   <map:match pattern="*.rtf">
-    <map:generate src="cocoon:/{1}.fo.xml"/>
-    <map:serialize type="fo2rtf"/>
-   </map:match>
-
-   <map:match pattern="*.css">
-    <map:read src="misc/{1}.css"/>
-   </map:match>
-
-   <map:match pattern="**/*.css">
-    <map:read src="misc/{2}.css"/>
-   </map:match>
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- =========================== Pipelines =================================== -->
+
+    <map:pipelines>
+        <map:pipeline type="caching">
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <map:match pattern="welcome">
+                <map:generate src="misc/samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <!-- ========================= jfor ================================ -->
+
+            <!-- hello world -->
+            <map:match pattern="hello.rtf">
+                <map:generate src="servlet:main-sample:/hello-world/hello.xml" />
+                <map:transform src="servlet:main-sample:/hello-world/style/xsl/page2fo.xsl"
/>
+                <map:serialize type="fo2rtf" />
+            </map:match>
+
+            <map:match pattern="*.fo.xml">
+                <map:generate src="misc/{1}.fo.xml" />
+                <map:serialize type="xml" />
+            </map:match>
+
+            <map:match pattern="*.rtf">
+                <map:generate src="cocoon:/{1}.fo.xml" />
+                <map:serialize type="fo2rtf" />
+            </map:match>
+
+            <map:match pattern="*.css">
+                <map:read src="misc/{1}.css" />
+            </map:match>
+
+            <map:match pattern="**/*.css">
+                <map:read src="misc/{2}.css" />
+            </map:match>
 
-  </map:pipeline>
+        </map:pipeline>
 
- </map:pipelines>
+    </map:pipelines>
 
 </map:sitemap>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539120&r1=539119&r2=539120
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/src/main/resources/COB-INF/sitemap.xmap
Thu May 17 14:17:32 2007
@@ -21,91 +21,92 @@
     +-->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-  <!-- ========================== Components =============================== -->
-  <map:components>
-    <map:generators default="file">
-      <!--+
-          | JSPGenerator is used to get output of a JSP page 
-          | and parse as XML SAX events.
-          +-->
-      <map:generator name="jsp"
-                     label="content"
-                     logger="sitemap.generator.jsp"
-                     src="org.apache.cocoon.generation.JSPGenerator"/>
-    </map:generators>
-
-    <map:readers default="resource">
-      <!--+
-          | JSPReader is used to send output of a JSP page
-          | directly into the response stream. Note, that JSP
-          | can produce non XML, or even binary, result.
-          +-->
-      <map:reader name="jsp" 
-                  logger="sitemap.reader.jsp"
-                  src="org.apache.cocoon.reading.JSPReader">
-        <!--+
-            | The configuration for the JSPReader with its default values:
-        <buffer-size>8192</buffer-size>
-        <output-encoding>UTF-8</output-encoding>
-            +-->
-      </map:reader>
-    </map:readers>
-  </map:components>
-
-  <!-- =========================== Views =================================== -->
-
-  <map:views>
-    <map:view from-label="content" name="content">
-      <map:serialize type="xml"/>
-    </map:view>
-
-    <map:view from-label="content" name="pretty-content">
-      <map:transform src="servlet:style-default:/stylesheets/system/xml2html.xslt"/>
-      <map:transform type="servletLinkRewriter" />
-      <map:serialize type="html"/>
-    </map:view>
-
-    <map:view from-position="last" name="links">
-      <map:serialize type="links"/>
-    </map:view>
-  </map:views>
-
-  <!-- ========================== Pipelines ================================ -->
-  <map:pipelines>
-    <map:pipeline>
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-   
-      <map:match pattern="welcome">
-        <map:generate src="samples.xml"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl"
/>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <map:match pattern="*.htm">
-        <map:read type="jsp" src="{1}.jsp" mime-type="text/html"/>
-      </map:match>
-
-      <!-- Use this to debug your JSPs -->
-      <map:match pattern="*.xml">
-        <map:generate type="jsp" src="{1}.jsp"/>
-        <map:serialize type="xml" mime-type="text/xml"/>
-      </map:match>
-
-      <map:match pattern="*.jsp">
-        <map:generate type="jsp" src="{1}.jsp"/>
-     	<map:transform src="servlet:style-default:/blocks/dynamic-page2html.xsl">
-     	   <map:parameter name="servletPath" value="{request:servletPath}"/>
-     	   <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
-     	   <map:parameter name="file" value="{1}.jsp"/>
-     	</map:transform>
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize type="html"/>
-      </map:match>
+    <!-- ========================== Components =============================== -->
 
-    </map:pipeline>
-  </map:pipelines>
+    <map:components>
+
+        <!-- ========================== Generators =============================== -->
+
+        <map:generators default="file">
+            <!--+
+                | JSPGenerator is used to get output of a JSP page 
+                | and parse as XML SAX events.
+                +-->
+            <map:generator name="jsp" label="content" logger="sitemap.generator.jsp" src="org.apache.cocoon.generation.JSPGenerator"
/>
+        </map:generators>
+
+        <!-- ========================== Readers =============================== -->
+
+        <map:readers default="resource">
+            <!--+
+                | JSPReader is used to send output of a JSP page
+                | directly into the response stream. Note, that JSP
+                | can produce non XML, or even binary, result.
+                +-->
+            <map:reader name="jsp" logger="sitemap.reader.jsp" src="org.apache.cocoon.reading.JSPReader">
+                <!--+
+                    | The configuration for the JSPReader with its default values:
+                    <buffer-size>8192</buffer-size>
+                    <output-encoding>UTF-8</output-encoding>
+                    +-->
+            </map:reader>
+        </map:readers>
+    </map:components>
+
+    <!-- =========================== Views =================================== -->
+
+    <map:views>
+        <map:view from-label="content" name="content">
+            <map:serialize type="xml" />
+        </map:view>
+
+        <map:view from-label="content" name="pretty-content">
+            <!-- Make use of servlet services -->
+            <map:serialize type="servletService">
+                <map:parameter name="service" value="servlet:style-default:/service/system/xml2html"
/>
+            </map:serialize>
+        </map:view>
+
+        <map:view from-position="last" name="links">
+            <map:serialize type="links" />
+        </map:view>
+    </map:views>
+
+    <!-- ========================== Pipelines ================================ -->
+
+    <map:pipelines>
+        <map:pipeline>
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <map:match pattern="welcome">
+                <map:generate src="samples.xml" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/common/simple-samples2html"
/>
+                </map:serialize>
+            </map:match>
+
+            <map:match pattern="*.htm">
+                <map:read type="jsp" src="{1}.jsp" mime-type="text/html" />
+            </map:match>
+
+            <!-- Use this to debug your JSPs -->
+            <map:match pattern="*.xml">
+                <map:generate type="jsp" src="{1}.jsp" />
+                <map:serialize type="xml" mime-type="text/xml" />
+            </map:match>
+
+            <map:match pattern="*.jsp">
+                <map:generate type="jsp" src="{1}.jsp" />
+                <!-- Make use of servlet services -->
+                <map:serialize type="servletService">
+                    <map:parameter name="service" value="servlet:style-default:/service/blocks/dynamic-page2html"
/>
+                </map:serialize>
+            </map:match>
+
+        </map:pipeline>
+    </map:pipelines>
 
 </map:sitemap>



Mime
View raw message