crossley 2003/12/05 22:47:40
Modified: src/blocks/scratchpad/samples sitemap.xmap
src/blocks/scratchpad/samples/castor sitemap.xmap
src/blocks/scratchpad/samples/jelly sitemap.xmap
Log:
Fix some more dos2unix.
Revision Changes Path
1.2 +51 -51 cocoon-2.1/src/blocks/scratchpad/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 4 Sep 2003 12:42:46 -0000 1.1
+++ sitemap.xmap 6 Dec 2003 06:47:40 -0000 1.2
@@ -1,51 +1,51 @@
-<?xml version="1.0"?>
-
-<!--+
- | FOP block samples sitemap
- | CVS $Id$
- +-->
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-
-<!-- =========================== 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="context://stylesheets/system/xml2html.xslt"/>
- <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="scratchpad-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>
-
- <!-- ======================== Automount ===============================
-->
-
- <map:match pattern="*/**">
- <map:mount check-reload="yes" src="{1}/" uri-prefix="{1}"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0"?>
+
+<!--+
+ | FOP block samples sitemap
+ | CVS $Id$
+ +-->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
+
+<!-- =========================== 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="context://stylesheets/system/xml2html.xslt"/>
+ <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="scratchpad-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>
+
+ <!-- ======================== Automount ===============================
-->
+
+ <map:match pattern="*/**">
+ <map:mount check-reload="yes" src="{1}/" uri-prefix="{1}"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
1.2 +35 -35
cocoon-2.1/src/blocks/scratchpad/samples/castor/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/castor/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 4 Sep 2003 12:42:42 -0000 1.1
+++ sitemap.xmap 6 Dec 2003 06:47:40 -0000 1.2
@@ -1,35 +1,35 @@
-<?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">
- <map:transformer name="castor"
src="org.apache.cocoon.transformation.CastorTransformer">
- <mapping>castor-mappings/test-mapping.xml</mapping>
- </map:transformer>
- </map:transformers>
- <map:readers default="resource"/>
- <map:serializers default="xml"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- <map:actions>
- <map:action name="TestBeanAction"
src="org.apache.cocoon.samples.castor.TestBeanAction"/>
- </map:actions>
- </map:components>
-
- <!-- =========================== Pipelines
================================= -->
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="*">
- <map:act type="TestBeanAction"/>
- <map:generate src="test.xml"/>
- <map:transform type="castor"/>
- <map:serialize/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
-
-<!-- End of File -->
+<?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">
+ <map:transformer name="castor"
src="org.apache.cocoon.transformation.CastorTransformer">
+ <mapping>castor-mappings/test-mapping.xml</mapping>
+ </map:transformer>
+ </map:transformers>
+ <map:readers default="resource"/>
+ <map:serializers default="xml"/>
+ <map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
+ <map:actions>
+ <map:action name="TestBeanAction"
src="org.apache.cocoon.samples.castor.TestBeanAction"/>
+ </map:actions>
+ </map:components>
+
+ <!-- =========================== Pipelines
================================= -->
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="*">
+ <map:act type="TestBeanAction"/>
+ <map:generate src="test.xml"/>
+ <map:transform type="castor"/>
+ <map:serialize/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
+
+<!-- End of File -->
1.2 +38 -38
cocoon-2.1/src/blocks/scratchpad/samples/jelly/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/jelly/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 4 Sep 2003 12:42:46 -0000 1.1
+++ sitemap.xmap 6 Dec 2003 06:47:40 -0000 1.2
@@ -1,38 +1,38 @@
-<?xml version="1.0"?>
-
-<!--
- CVS $Id$
-
- Jelly Sample
--->
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
- <map:generators default="file">
- <map:generator name="jelly"
src="org.apache.cocoon.generation.JellyGenerator"/>
- </map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
- </map:components>
-
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="">
- <map:redirect-to uri="test1"/>
- </map:match>
-
- <map:match pattern="*">
- <map:generate src="{1}.xml" type="jelly">
- <map:parameter name="name" value="Cocoon Jelly"/>
- <map:parameter name="background" value="#003366"/>
- <map:parameter name="hobbies" value="Reading"/>
- </map:generate>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
-
+<?xml version="1.0"?>
+
+<!--
+ CVS $Id$
+
+ Jelly Sample
+-->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
+ <map:components>
+ <map:generators default="file">
+ <map:generator name="jelly"
src="org.apache.cocoon.generation.JellyGenerator"/>
+ </map:generators>
+ <map:transformers default="xslt"/>
+ <map:readers default="resource"/>
+ <map:serializers default="html"/>
+ <map:matchers default="wildcard"/>
+ <map:selectors default="browser"/>
+ </map:components>
+
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="">
+ <map:redirect-to uri="test1"/>
+ </map:match>
+
+ <map:match pattern="*">
+ <map:generate src="{1}.xml" type="jelly">
+ <map:parameter name="name" value="Cocoon Jelly"/>
+ <map:parameter name="background" value="#003366"/>
+ <map:parameter name="hobbies" value="Reading"/>
+ </map:generate>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
+
