You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2003/12/06 07:55:35 UTC
cvs commit: cocoon-2.1/src/webapp/samples/test/simpletest-mounted sitemap.xmap
crossley 2003/12/05 22:55:35
Modified: src/webapp/samples/flow/jxcalc sitemap.xmap
src/webapp/samples/test sitemap.xmap
src/webapp/samples/test/simpletest-mounted sitemap.xmap
Log:
Fix some dos2unix.
Revision Changes Path
1.4 +53 -53 cocoon-2.1/src/webapp/samples/flow/jxcalc/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/jxcalc/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sitemap.xmap 22 Oct 2003 16:56:21 -0000 1.3
+++ sitemap.xmap 6 Dec 2003 06:55:34 -0000 1.4
@@ -1,53 +1,53 @@
-<?xml version="1.0"?>
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
- <!-- indicates what flowscript to attach to this sitemap -->
- <map:flow language="javascript">
- <map:script src="../calc/calc.js"/>
- </map:flow>
-
- <map:pipelines>
- <map:pipeline>
- <!--+
- | produces the screens called by the flowscript
- +-->
- <map:match pattern="page/*">
- <map:generate type="jx" src="screens/{1}.xml"/>
- <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="file" value="/samples/flow/jxcalc/screens/{1}.xml"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
- </map:pipeline>
-
- <map:pipeline>
- <!--+
- | matches the page with the continuation ID and calls the flowscript
- | associated to this sitemap with the given continuation ID. The flow
- | engine will then look into the continuation store, retrieve
- | the correct continuation and resume execution of the flowscript
- | with that continuation. This guarantees transparent state
- | resumption between requests without the need for anything else
- | (cookies or URL-encoded session IDs)
- +-->
- <map:match pattern="continue.*">
- <map:call continuation="{1}"/>
- </map:match>
-
- <!--+
- | matches the call to the beginning of the flow and calls the flow
- | from its entry point which, in this case is the 'calculator()'
- | javascript function.
- +-->
- <map:match pattern="">
- <map:call function="calculator"/>
- </map:match>
-
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0"?>
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <!-- indicates what flowscript to attach to this sitemap -->
+ <map:flow language="javascript">
+ <map:script src="../calc/calc.js"/>
+ </map:flow>
+
+ <map:pipelines>
+ <map:pipeline>
+ <!--+
+ | produces the screens called by the flowscript
+ +-->
+ <map:match pattern="page/*">
+ <map:generate type="jx" src="screens/{1}.xml"/>
+ <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
+ <map:parameter name="servletPath" value="{request:servletPath}"/>
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:parameter name="file" value="/samples/flow/jxcalc/screens/{1}.xml"/>
+ <map:parameter name="remove" value="{0}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+ </map:pipeline>
+
+ <map:pipeline>
+ <!--+
+ | matches the page with the continuation ID and calls the flowscript
+ | associated to this sitemap with the given continuation ID. The flow
+ | engine will then look into the continuation store, retrieve
+ | the correct continuation and resume execution of the flowscript
+ | with that continuation. This guarantees transparent state
+ | resumption between requests without the need for anything else
+ | (cookies or URL-encoded session IDs)
+ +-->
+ <map:match pattern="continue.*">
+ <map:call continuation="{1}"/>
+ </map:match>
+
+ <!--+
+ | matches the call to the beginning of the flow and calls the flow
+ | from its entry point which, in this case is the 'calculator()'
+ | javascript function.
+ +-->
+ <map:match pattern="">
+ <map:call function="calculator"/>
+ </map:match>
+
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
1.2 +27 -27 cocoon-2.1/src/webapp/samples/test/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/test/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Oct 2003 18:07:34 -0000 1.1
+++ sitemap.xmap 6 Dec 2003 06:55:34 -0000 1.2
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:selectors default="browser"/>
- <map:matchers default="wildcard"/>
- </map:components>
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="simpletest-content/**">
- <map:generate src="{1}"/>
- <map:serialize type="xml"/>
- </map:match>
- <map:match pattern="simpletest-mounted/**">
- <map:mount src="simpletest-mounted/" uri-prefix="simpletest-mounted"/>
- </map:match>
- <map:match pattern="simpletest">
- <map:generate src="cocoon:/simpletest-content/a.xml"/>
- <map:transform type="cinclude"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:components>
+ <map:generators default="file"/>
+ <map:transformers default="xslt"/>
+ <map:readers default="resource"/>
+ <map:serializers default="html"/>
+ <map:selectors default="browser"/>
+ <map:matchers default="wildcard"/>
+ </map:components>
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="simpletest-content/**">
+ <map:generate src="{1}"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ <map:match pattern="simpletest-mounted/**">
+ <map:mount src="simpletest-mounted/" uri-prefix="simpletest-mounted"/>
+ </map:match>
+ <map:match pattern="simpletest">
+ <map:generate src="cocoon:/simpletest-content/a.xml"/>
+ <map:transform type="cinclude"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
1.2 +19 -19 cocoon-2.1/src/webapp/samples/test/simpletest-mounted/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/test/simpletest-mounted/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 9 Oct 2003 18:07:34 -0000 1.1
+++ sitemap.xmap 6 Dec 2003 06:55:34 -0000 1.2
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- <map:generators default="file"/>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:selectors default="browser"/>
- <map:matchers default="wildcard"/>
- </map:components>
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="includer">
- <map:generate src="c.xml"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:components>
+ <map:generators default="file"/>
+ <map:transformers default="xslt"/>
+ <map:readers default="resource"/>
+ <map:serializers default="html"/>
+ <map:selectors default="browser"/>
+ <map:matchers default="wildcard"/>
+ </map:components>
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="includer">
+ <map:generate src="c.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>