You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/17 19:25:37 UTC

svn commit: r539031 - /cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap

Author: felixk
Date: Thu May 17 10:25:36 2007
New Revision: 539031

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

Modified:
    cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=539031&r1=539030&r2=539031
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap Thu May 17 10:25:36 2007
@@ -1,76 +1,84 @@
 <?xml version="1.0"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <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>   
- 
-      <map:match pattern="">
-        <map:redirect-to uri="welcome"/>
-      </map:match>
-
-      <map:match pattern="welcome">
-        <map:generate type="directory" src="data">
-          <map:parameter name="include" value="\.txt$"/>
-        </map:generate>
-        <map:transform src="dir2html.xsl"/>
-        <map:transform src="servlet:style-default:/common/style/xsl/html/simple-samples2html.xsl" />
-        <map:transform type="servletLinkRewriter" />
-        <map:serialize/>
-      </map:match>
-
-      <!-- expects format xxxyyyzzt.txt.png -->
-      <map:match pattern="*.jpg">
-        <map:generate type="asciiart-svg" src="data/{1}"/>
-        <map:serialize type="svg2jpeg"/>
-      </map:match>
-
-      <!-- expects format xxxyyyzzt.txt.png -->
-      <map:match pattern="*.png">
-        <map:generate type="asciiart-svg" src="data/{1}"/>
-        <map:serialize type="svg2png"/>
-      </map:match>
-
-      <map:match pattern="*.txt">
-        <map:read src="data/{1}.txt" mime-type="text/plain"/>
-      </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>
+
+            <map:match pattern="">
+                <map:redirect-to uri="welcome" />
+            </map:match>
+
+            <map:match pattern="welcome">
+                <map:generate type="directory" src="data">
+                    <map:parameter name="include" value="\.txt$" />
+                </map:generate>
+                <map:transform src="dir2html.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="sitemap.xmap">
+                <map:read src="sitemap.xmap" mime-type="text/xml" />
+            </map:match>
+
+            <!-- =========================== Asciiart ================================= -->
+
+            <!-- expects format xxxyyyzzt.txt.png -->
+            <map:match pattern="*.jpg">
+                <map:generate type="asciiart-svg" src="data/{1}" />
+                <map:serialize type="svg2jpeg" />
+            </map:match>
+
+            <!-- expects format xxxyyyzzt.txt.png -->
+            <map:match pattern="*.png">
+                <map:generate type="asciiart-svg" src="data/{1}" />
+                <map:serialize type="svg2png" />
+            </map:match>
+
+            <map:match pattern="*.txt">
+                <map:read src="data/{1}.txt" mime-type="text/plain" />
+            </map:match>
 
-    </map:pipeline>
-  </map:pipelines>
+        </map:pipeline>
+    </map:pipelines>
 </map:sitemap>



Re: svn commit: r539031 - /cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap

Posted by Vadim Gritsenko <va...@reverycodes.com>.
felixk@apache.org wrote:
> -reformatted

Felix,

All XML files in Cocoon SVN are using same indenting standard - 2 spaces, no 
tabs. Please revert your changes.

Thanks,
Vadim

Re: svn commit: r539031 - /cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/src/main/resources/COB-INF/sitemap.xmap

Posted by Vadim Gritsenko <va...@reverycodes.com>.
felixk@apache.org wrote:
> -reformatted

Felix,

All XML files in Cocoon SVN are using same indenting standard - 2 spaces, no 
tabs. Please revert your changes.

Thanks,
Vadim