joerg 2003/10/22 09:59:49
Modified: src/webapp/samples/flow/calc sitemap.xmap
src/webapp/samples/flow/calc/screens displayResult.xsp
getNumberA.xsp getNumberB.xsp getOperator.xsp
src/webapp/samples/flow/jxcalc sitemap.xmap
src/webapp/samples/flow/jxcalc/screens displayResult.xml
getNumberA.xml getNumberB.xml getOperator.xml
src/webapp/samples/flow/prefs/screens login.xsp
registrationSuccessful.xsp userInfo.xsp welcome.xsp
src/webapp/samples/flow/test sitemap.xmap
src/webapp/samples/flow/test/screens showString.xsp
src/webapp/samples/protected sitemap.xmap
src/webapp/samples/protected/docs protected.xsp
src/webapp/samples/simpleform sitemap.xmap
src/webapp/samples/simpleform/four sitemap.xmap
src/webapp/samples/simpleform/one ERROR.xsp OK.xsp
sitemap.xmap
src/webapp/samples/simpleform/three sitemap.xmap
src/webapp/samples/simpleform/two sitemap.xmap
Log:
fixing view-source by adding explicite matches to the sitemaps, added views
where missing
Revision Changes Path
1.7 +4 -0 cocoon-2.2/src/webapp/samples/flow/calc/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/flow/calc/sitemap.xmap,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xmap 11 Oct 2003 16:14:52 -0000 1.6
+++ sitemap.xmap 22 Oct 2003 16:59:48 -0000 1.7
@@ -48,6 +48,10 @@
<map:call function="calculator"/>
</map:match>
+ <map:match pattern="calc.js">
+ <map:read src="{0}" mime-type="text/plain"/>
+ </map:match>
+
</map:pipeline>
</map:pipelines>
</map:sitemap>
1.4 +2 -2
cocoon-2.2/src/webapp/samples/flow/calc/screens/displayResult.xsp
Index: displayResult.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/calc/screens/displayResult.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- displayResult.xsp 20 May 2003 00:54:12 -0000 1.3
+++ displayResult.xsp 22 Oct 2003 16:59:48 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.4 +2 -2
cocoon-2.2/src/webapp/samples/flow/calc/screens/getNumberA.xsp
Index: getNumberA.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/calc/screens/getNumberA.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getNumberA.xsp 20 May 2003 00:54:12 -0000 1.3
+++ getNumberA.xsp 22 Oct 2003 16:59:48 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.4 +2 -2
cocoon-2.2/src/webapp/samples/flow/calc/screens/getNumberB.xsp
Index: getNumberB.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/calc/screens/getNumberB.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getNumberB.xsp 20 May 2003 00:54:12 -0000 1.3
+++ getNumberB.xsp 22 Oct 2003 16:59:48 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.4 +2 -2
cocoon-2.2/src/webapp/samples/flow/calc/screens/getOperator.xsp
Index: getOperator.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/calc/screens/getOperator.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getOperator.xsp 20 May 2003 00:54:12 -0000 1.3
+++ getOperator.xsp 22 Oct 2003 16:59:48 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.2 +1 -1 cocoon-2.2/src/webapp/samples/flow/jxcalc/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 15 Oct 2003 14:18:39 -0000 1.1
+++ sitemap.xmap 22 Oct 2003 16:59:48 -0000 1.2
@@ -4,7 +4,7 @@
<!-- indicates what flowscript to attach to this sitemap -->
<map:flow language="javascript">
- <map:script src="calc.js"/>
+ <map:script src="../calc/calc.js"/>
</map:flow>
<map:pipelines>
1.2 +2 -2
cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/displayResult.xml
Index: displayResult.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/displayResult.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- displayResult.xml 15 Oct 2003 14:18:40 -0000 1.1
+++ displayResult.xml 22 Oct 2003 16:59:48 -0000 1.2
@@ -8,7 +8,7 @@
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="../calc/calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.2 +2 -2
cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
Index: getNumberA.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getNumberA.xml 15 Oct 2003 14:18:40 -0000 1.1
+++ getNumberA.xml 22 Oct 2003 16:59:48 -0000 1.2
@@ -8,7 +8,7 @@
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="../calc/calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.2 +2 -2
cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml
Index: getNumberB.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getNumberB.xml 15 Oct 2003 14:18:40 -0000 1.1
+++ getNumberB.xml 22 Oct 2003 16:59:48 -0000 1.2
@@ -8,7 +8,7 @@
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="../calc/calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.2 +2 -2
cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/getOperator.xml
Index: getOperator.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/jxcalc/screens/getOperator.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- getOperator.xml 15 Oct 2003 14:18:40 -0000 1.1
+++ getOperator.xml 22 Oct 2003 16:59:48 -0000 1.2
@@ -8,7 +8,7 @@
<page>
<resources>
- <resource type="file"
href="/samples/flow/calc/calc.js">Flowscript</resource>
+ <resource type="file" href="../calc/calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
<content>
1.5 +2 -2
cocoon-2.2/src/webapp/samples/flow/prefs/screens/login.xsp
Index: login.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/prefs/screens/login.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- login.xsp 14 Jul 2003 09:30:46 -0000 1.4
+++ login.xsp 22 Oct 2003 16:59:49 -0000 1.5
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
+ <resource type="file" href="prefs.js">Flowscript</resource>
</resources>
<title>Login</title>
<content>
1.4 +2 -2
cocoon-2.2/src/webapp/samples/flow/prefs/screens/registrationSuccessful.xsp
Index: registrationSuccessful.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/prefs/screens/registrationSuccessful.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- registrationSuccessful.xsp 14 Jul 2003 09:30:46 -0000 1.3
+++ registrationSuccessful.xsp 22 Oct 2003 16:59:49 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
+ <resource type="file" href="prefs.js">Flowscript</resource>
</resources>
<title>Registration successful!</title>
<content>
1.5 +2 -2
cocoon-2.2/src/webapp/samples/flow/prefs/screens/userInfo.xsp
Index: userInfo.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/prefs/screens/userInfo.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- userInfo.xsp 14 Jul 2003 09:30:46 -0000 1.4
+++ userInfo.xsp 22 Oct 2003 16:59:49 -0000 1.5
@@ -16,7 +16,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
+ <resource type="file" href="prefs.js">Flowscript</resource>
</resources>
<title><jpath:value-of select="title"/></title>
<content>
1.4 +2 -2
cocoon-2.2/src/webapp/samples/flow/prefs/screens/welcome.xsp
Index: welcome.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/prefs/screens/welcome.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- welcome.xsp 14 Jul 2003 09:30:46 -0000 1.3
+++ welcome.xsp 22 Oct 2003 16:59:49 -0000 1.4
@@ -11,7 +11,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/prefs/prefs.js">Flowscript</resource>
+ <resource type="file" href="prefs.js">Flowscript</resource>
</resources>
<title>Welcome!</title>
<content>
1.5 +4 -0 cocoon-2.2/src/webapp/samples/flow/test/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/flow/test/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 31 Aug 2003 16:32:34 -0000 1.4
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.5
@@ -8,6 +8,10 @@
<map:pipelines>
<map:pipeline>
+ <map:match pattern="sendpage.js">
+ <map:read src="{0}" mime-type="text/plain"/>
+ </map:match>
+
<map:match pattern="">
<map:redirect-to uri="showString"/>
</map:match>
1.3 +2 -2
cocoon-2.2/src/webapp/samples/flow/test/screens/showString.xsp
Index: showString.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/flow/test/screens/showString.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- showString.xsp 20 May 2003 00:54:12 -0000 1.2
+++ showString.xsp 22 Oct 2003 16:59:49 -0000 1.3
@@ -13,7 +13,7 @@
xmlns:jpath="http://apache.org/xsp/jpath/1.0";>
<page>
<resources>
- <resource type="file"
href="/samples/flow/test/sendpage.js">Flowscript</resource>
+ <resource type="file" href="sendpage.js">Flowscript</resource>
</resources>
<title>Show String</title>
<content>
1.5 +15 -1 cocoon-2.2/src/webapp/samples/protected/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/protected/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap.xmap 22 May 2003 13:37:46 -0000 1.4
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.5
@@ -22,11 +22,25 @@
<map:view name="content" from-label="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 name="links" from-position="last">
+ <map:serialize type="links"/>
+ </map:view>
</map:views>
<!-- ======================= Pipelines =================================
-->
<map:pipelines>
<map:pipeline>
+
+ <map:match pattern="descriptors/*.xml">
+ <map:generate src="{0}"/>
+ <map:serialize type="xml"/>
+ </map:match>
<map:match pattern="">
<map:redirect-to uri="page"/>
1.3 +3 -3
cocoon-2.2/src/webapp/samples/protected/docs/protected.xsp
Index: protected.xsp
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/protected/docs/protected.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- protected.xsp 22 May 2003 13:37:46 -0000 1.2
+++ protected.xsp 22 Oct 2003 16:59:49 -0000 1.3
@@ -7,8 +7,8 @@
xmlns:session="http://apache.org/xsp/session/2.0";>
<page>
<resources>
- <resource type="file"
href="descriptors/auth.xml">Authenticator</resource>
- <resource type="file"
href="descriptors/params.xml">Validator</resource>
+ <resource type="file"
href="descriptors/auth.xml?cocoon-view=pretty-content">Authenticator</resource>
+ <resource type="file"
href="descriptors/params.xml?cocoon-view=pretty-content">Validator</resource>
<resource type="doc"
href="userdocs/actions/database-actions.html">Actions</resource>
</resources>
<title>Protected area</title>
1.6 +1 -1 cocoon-2.2/src/webapp/samples/simpleform/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/simpleform/sitemap.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.xmap 15 Aug 2003 15:57:32 -0000 1.5
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.6
@@ -10,7 +10,7 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize type="html"/>
</map:view>
1.2 +1 -1
cocoon-2.2/src/webapp/samples/simpleform/four/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/simpleform/four/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 15 Aug 2003 15:57:33 -0000 1.1
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.2
@@ -151,7 +151,7 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize type="html"/>
</map:view>
1.2 +1 -1 cocoon-2.2/src/webapp/samples/simpleform/one/ERROR.xsp
Index: ERROR.xsp
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/simpleform/one/ERROR.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ERROR.xsp 15 Aug 2003 15:57:33 -0000 1.1
+++ ERROR.xsp 22 Oct 2003 16:59:49 -0000 1.2
@@ -8,7 +8,7 @@
<page>
<resources>
- <resource type="file" href="descriptor.xml">Descriptor</resource>
+ <resource type="file"
href="descriptor.xml?cocoon-view=pretty-content">Descriptor</resource>
<resource type="doc" href="userdocs/xsp/logicsheet-forms.html">Action
& Logicsheet</resource>
</resources>
1.2 +1 -1 cocoon-2.2/src/webapp/samples/simpleform/one/OK.xsp
Index: OK.xsp
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/simpleform/one/OK.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OK.xsp 15 Aug 2003 15:57:33 -0000 1.1
+++ OK.xsp 22 Oct 2003 16:59:49 -0000 1.2
@@ -8,7 +8,7 @@
<page>
<resources>
- <resource type="file" href="descriptor.xml">Descriptor</resource>
+ <resource type="file"
href="descriptor.xml?cocoon-view=pretty-content">Descriptor</resource>
<resource type="doc" href="userdocs/xsp/logicsheet-forms.html">Action
& Logicsheet</resource>
</resources>
1.2 +5 -2 cocoon-2.2/src/webapp/samples/simpleform/one/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/simpleform/one/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 15 Aug 2003 15:57:33 -0000 1.1
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.2
@@ -54,7 +54,7 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize type="html"/>
</map:view>
@@ -105,7 +105,10 @@
</map:call>
</map:match>
-
+ <map:match pattern="descriptor.xml">
+ <map:generate src="{0}"/>
+ <map:serialize type="xml"/>
+ </map:match>
<!-- some redirections -->
<map:match pattern="*">
1.2 +1 -1
cocoon-2.2/src/webapp/samples/simpleform/three/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/simpleform/three/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 15 Aug 2003 15:57:32 -0000 1.1
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.2
@@ -100,7 +100,7 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize type="html"/>
</map:view>
1.2 +1 -1 cocoon-2.2/src/webapp/samples/simpleform/two/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/webapp/samples/simpleform/two/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 15 Aug 2003 15:57:32 -0000 1.1
+++ sitemap.xmap 22 Oct 2003 16:59:49 -0000 1.2
@@ -85,7 +85,7 @@
</map:view>
<map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xsl"/>
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize type="html"/>
</map:view>
