joerg 2004/02/16 16:04:38
Modified: src/blocks/scratchpad/samples/garbage/calc/screens
displayResult.gt getOperator.gt getNumberA.gt
getNumberB.gt
src/blocks/scratchpad/samples/garbage sitemap.xmap
src/blocks/session-fw/conf xsp-session-fw.xconf
modules.xconf session-sel.xmap
src/blocks/scratchpad/samples/garbage/calc sitemap.xmap
calc.js
src/blocks/scratchpad/samples/jelly sitemap.xmap
src/blocks/scratchpad/samples/castor sitemap.xmap
src/blocks/scratchpad/samples sitemap.xmap
Log:
these files were wrongly committed as binary; this prevents their line
endings to be converted plattform specific on checkout
Revision Changes Path
1.4 +0 -0
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/displayResult.gt
Index: displayResult.gt
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/displayResult.gt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +0 -0
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getOperator.gt
Index: getOperator.gt
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getOperator.gt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +0 -0
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberA.gt
Index: getNumberA.gt
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberA.gt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +0 -0
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberB.gt
Index: getNumberB.gt
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/screens/getNumberB.gt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.4 +0 -0
cocoon-2.1/src/blocks/scratchpad/samples/garbage/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/sitemap.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.2 +0 -0
cocoon-2.1/src/blocks/session-fw/conf/xsp-session-fw.xconf
Index: xsp-session-fw.xconf
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/conf/xsp-session-fw.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.2 +0 -0 cocoon-2.1/src/blocks/session-fw/conf/modules.xconf
Index: modules.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/conf/modules.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
1.4 +0 -0 cocoon-2.1/src/blocks/session-fw/conf/session-sel.xmap
Index: session-sel.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/conf/session-sel.xmap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
1.3 +63 -63
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 22 Oct 2003 16:56:21 -0000 1.2
+++ sitemap.xmap 17 Feb 2004 00:04:38 -0000 1.3
@@ -1,63 +1,63 @@
-<?xml version="1.0"?>
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
- <map:components>
- <map:generators>
- <map:generator name="garbage" logger="garbage.sitemap.generator"
- src="org.apache.cocoon.generation.GarbageGenerator"/>
- </map:generators>
- </map:components>
-
- <!-- indicates what flowscript to attach to this sitemap -->
- <map:flow language="javascript">
- <map:script src="calc.js"/>
- </map:flow>
-
- <map:pipelines>
- <map:pipeline>
-
- <map:match pattern="calc.js">
- <map:read src="{0}" mime-type="text/plain"/>
- </map:match>
-
- <!--+
- | produces the screens called by the flowscript
- +-->
- <map:match pattern="page/*">
- <map:generate type="garbage" src="screens/{1}.gt"/>
- <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/garbage/calc/screens/{1}.gt"/>
- <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";>
+ <map:components>
+ <map:generators>
+ <map:generator name="garbage" logger="garbage.sitemap.generator"
+ src="org.apache.cocoon.generation.GarbageGenerator"/>
+ </map:generators>
+ </map:components>
+
+ <!-- indicates what flowscript to attach to this sitemap -->
+ <map:flow language="javascript">
+ <map:script src="calc.js"/>
+ </map:flow>
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="calc.js">
+ <map:read src="{0}" mime-type="text/plain"/>
+ </map:match>
+
+ <!--+
+ | produces the screens called by the flowscript
+ +-->
+ <map:match pattern="page/*">
+ <map:generate type="garbage" src="screens/{1}.gt"/>
+ <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/garbage/calc/screens/{1}.gt"/>
+ <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.3 +0 -0
cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/calc.js
Index: calc.js
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/samples/garbage/calc/calc.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
1.3 +0 -0 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
