vgritsenko 2003/05/06 21:57:16
Modified: src/webapp/samples block-samples.xml error-giving-page.xml samples.xml src/webapp/samples/aggregation aggregate.xsp src/webapp/samples/catalog catalog-demo.xml samples.xml sdocbook2body.xsl sitemap.xmap style.xsl src/webapp/samples/common/style/xsl/html simple-samples2html.xsl src/webapp/samples/flow samples.xml src/webapp/samples/hello-world samples.xml sitemap.xmap src/webapp/samples/hello-world/content hello.xml src/webapp/samples/hello-world/style/xsl page2fo.xsl page2html.xsl page2itext.xsl page2svg.xsl page2swf.xsl page2vml.xsl page2vrml.xsl page2wml.xsl page2xls.xsl src/webapp/samples/hello-world/webservice HelloWorld.wsdl src/webapp/samples/myapp readme.html sitemap.xmap src/webapp/samples/myapp/xml page.xml src/webapp/samples/myapp/xsl style.xsl src/webapp/samples/myapp/xsp page.xsp src/webapp/samples/sites samples.xml src/webapp/samples/slides sitemap.xmap src/webapp/samples/soap samples.xml sitemap.xmap src/webapp/samples/soap/pages/xscript getquote1.xsp getquote2.xsp getquote3.xsp simple.xsp test.xsp src/webapp/samples/stream sitemap.xmap src/webapp/samples/xsp samples.xml src/webapp/samples/xsp/xsp cookie.xsp hello.xsp logicsheet.xsp request.xsp response.xsp session.xsp sessionpage.xsp simple.xsp upload.xsp src/webapp/samples/xsp/xsp-js hello.xsp request.xsp response.xsp session.xsp simple.xsp Added: src/webapp/samples/sources samples.xml sitemap.xmap src/webapp/samples/sources/content dynamic.xsp simple.xml simple.xsp src/webapp/samples/sources/style dynamic-xsp2xsp.xsl simple-page2html.xsp Removed: src/webapp/samples/catalog sdocbook-demo.html Log: Reorganize sample page. Add 'Back' navigation. Resuscitate sitemap sources samples. Improve some comments (XScript ain't SOAP) Revision Changes Path 1.5 +2 -2 cocoon-2.1/src/webapp/samples/block-samples.xml Index: block-samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/block-samples.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- block-samples.xml 24 Apr 2003 12:54:13 -0000 1.4 +++ block-samples.xml 7 May 2003 04:57:12 -0000 1.5 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> -<samples xmlns:xlink="http://www.w3.org/1999/xlink" name="blocks"> +<samples xmlns:xlink="http://www.w3.org/1999/xlink" name="Blocks Samples"> <group name="Main examples page"> <sample name="Back" href="../samples/">to Cocoon examples main page</sample> 1.2 +1 -1 cocoon-2.1/src/webapp/samples/error-giving-page.xml Index: error-giving-page.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/error-giving-page.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- error-giving-page.xml 26 Mar 2003 21:21:37 -0000 1.1 +++ error-giving-page.xml 7 May 2003 04:57:12 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <!DOCTYPE page [ <!ELEMENT page (title?, content)> 1.14 +42 -45 cocoon-2.1/src/webapp/samples/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/samples.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- samples.xml 6 May 2003 19:23:51 -0000 1.13 +++ samples.xml 7 May 2003 04:57:12 -0000 1.14 @@ -13,7 +13,10 @@ </sample> <sample name="XML-ized web sites" href="sites/"> A couple of existing web sites have been xml-ized to show you - how easier it is to handle content-pure markup. + how easier it is to handle pure-content markup. + </sample> + <sample name="Presentation Slides" href="slides/slides"> + An example of more complex use of XSLT for navigation and content filtering. </sample> <sample name="Internationalization (i18n) & Localization (l10n)" href="i18n/"> Since XML is based on Unicode, it can be used to encode all types of @@ -25,9 +28,6 @@ in different ways, but also to syndicate, aggregate or otherwise transform content provided by other web sites. </sample> - <sample name="Slides" href="slides/slides"> - An example of more complex use of XSLT for navigation and content filtering. - </sample> <sample name="Resource Catalog" href="catalog/"> XML is handy but also very complex. Cocoon integrates a number of facilities to help you during your journey thru XML-land. One of these @@ -37,12 +37,15 @@ </sample> </group> - <group name="Web Services"> + <group name="Web Services and B2B"> <sample name="SOAP" href="soap/"> Cocoon ships with facilities for immediate connection to SOAP resources. These examples show you how to connect to any web service with a few lines of XML markup. </sample> + <sample name="Order Page" href="stream/order" xlink:role="dynamic"> + An example of B2B processing. + </sample> </group> <!-- @@ -66,10 +69,13 @@ --> - <group name="Input Modules"> + <group name="The Power of Sitemap"> <sample name="Input Modules" href="modules/"> This example shows the usage of Input Modules in sitemap attribute expressions. </sample> + <sample name="Sources" href="sources/"> + This example shows the usage of sources in the sitemap. + </sample> </group> <group name="Flowscript"> @@ -78,45 +84,12 @@ </sample> </group> - <group name="System Tools And Pages"> - <sample name="Status Page" href="status.html"> - This page shows the current internal status of cocoon, along with - information on the cache and the object stores. - </sample> - <sample name="Clear Cache" href="clearcache.html"> - Empties the Cocoon cache. - </sample> - <sample name="Clear Persistent Store" href="clearpersistentstore.html"> - Empties the Cocoon persistent store. - </sample> - <sample name="Request Page" href="request.html"> - This example shows the usage of the RequestGenerator. - </sample> - <sample name="Error Page" href="generror.html"> - This example shows what happens if an error is triggered in the pipeline. - </sample> - <sample name="Link Status" href="linkstatus"> - Verify that there are no broken hyperlinks in the local Cocoon - documentation. This sample will start at the home page of the local - documentation webapp and traverse each internal link, reporting its status - in a colour-coded table. Be patient - this process will take a while. - NOTE: this will work only if you have included the documentation when - you built the web application - </sample> - </group> - <group name="Extensible Server Pages"> <sample name="XSP" href="xsp/"> Extensible Server Pages. </sample> </group> - <group name="B2B"> - <sample name="Order Page" href="stream/order" xlink:role="dynamic"> - An example - </sample> - </group> - <group name="Web Applications"> <sample name="Protected Area" href="protected/login"> An example web-application built around db-authenticator, @@ -150,11 +123,35 @@ </sample> </group> - <group name="Error handling"> - <sample name="Error handling" href="errorhandling/main"> - An example page producing exceptions and handling them. Demonstrates the - handler hierarchy and the exception selectors. - </sample> + <group name="System Tools And Pages"> + <sample name="Status Page" href="status.html"> + This page shows the current internal status of cocoon, along with + information on the cache and the object stores. + </sample> + <sample name="Clear Cache" href="clearcache.html"> + Empties the Cocoon cache. + </sample> + <sample name="Clear Persistent Store" href="clearpersistentstore.html"> + Empties the Cocoon persistent store. + </sample> + <sample name="Request Page" href="request.html"> + This example shows the usage of the RequestGenerator. + </sample> + <sample name="Error Page" href="generror.html"> + This example shows what happens if an error is triggered in the pipeline. + </sample> + <sample name="Error handling" href="errorhandling/main"> + An example page producing exceptions and handling them. Demonstrates the + handler hierarchy and the exception selectors. + </sample> + <sample name="Link Status" href="linkstatus"> + Verify that there are no broken hyperlinks in the local Cocoon + documentation. This sample will start at the home page of the local + documentation webapp and traverse each internal link, reporting its status + in a colour-coded table. Be patient - this process will take a while. + NOTE: this will work only if you have included the documentation when + you built the web application + </sample> </group> </samples> 1.2 +1 -1 cocoon-2.1/src/webapp/samples/aggregation/aggregate.xsp Index: aggregate.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/aggregation/aggregate.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aggregate.xsp 26 Mar 2003 21:21:30 -0000 1.1 +++ aggregate.xsp 7 May 2003 04:57:12 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.3 +1 -0 cocoon-2.1/src/webapp/samples/catalog/catalog-demo.xml Index: catalog-demo.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/catalog/catalog-demo.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- catalog-demo.xml 14 Mar 2003 03:41:49 -0000 1.2 +++ catalog-demo.xml 7 May 2003 04:57:12 -0000 1.3 @@ -1,4 +1,5 @@ <?xml version="1.0"?> + <!DOCTYPE catalog-demo PUBLIC "-//Indexgeo//DTD Catalog Demo v1.0//EN" "http://www.indexgeo.com.au/dtd/catalog-demo-v10.dtd" [ 1.5 +21 -3 cocoon-2.1/src/webapp/samples/catalog/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/catalog/samples.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- samples.xml 26 Mar 2003 21:21:48 -0000 1.4 +++ samples.xml 7 May 2003 04:57:13 -0000 1.5 @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<samples xmlns:xlink="http://www.w3.org/1999/xlink"> + +<!-- CVS $Id$ --> + +<samples name="Catalogs and DocBook" xmlns:xlink="http://www.w3.org/1999/xlink"> + + <group name="Back"> + <sample name="Back" href="../"> + Back to the samples home page. + </sample> + </group> <group name="XML Entity Catalogs"> <sample name="Entity Resolution Using Catalogs" href="catalog-demo"> @@ -11,9 +20,18 @@ </group> <group name="DocBook"> - <sample name="Simplified DocBook" href="sdocbook-demo.html"> + <sample name="Entity Resolution With Catalogs" + href="../../docs/userdocs/concepts/catalog.html#config"> + The Apache Cocoon documentation "Entity + resolution with catalogs" has a section "Example local configuration + for Simplified DocBook". Do that and then ... + </sample> + <sample name="DocBook Demo" + href="sdocbook-demo"> + Demonstration of Catalog Entity Resolver and Simplified DocBook. You will need the DocBook DTDs installed locally and the catalog - properly configured. We show you how to set up a quick minimal test. + properly configured. If you get a FileNotFoundException, then you + have not configured the OASIS catalog properly. </sample> </group> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/catalog/sdocbook2body.xsl Index: sdocbook2body.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/catalog/sdocbook2body.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sdocbook2body.xsl 9 Mar 2003 00:10:50 -0000 1.1 +++ sdocbook2body.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> 1.2 +4 -18 cocoon-2.1/src/webapp/samples/catalog/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/catalog/sitemap.xmap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sitemap.xmap 9 Mar 2003 00:10:50 -0000 1.1 +++ sitemap.xmap 7 May 2003 04:57:13 -0000 1.2 @@ -1,14 +1,8 @@ <?xml version="1.0"?> -<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:matchers default="wildcard"/> - <map:selectors default="browser"/> - </map:components> +<!-- CVS $Id$ --> + +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> <map:pipelines> <map:pipeline> @@ -20,7 +14,7 @@ <map:match pattern="welcome"> <map:generate src="samples.xml"/> <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl"> - <map:parameter name="contextPath" value="{request:contextPath}"/> + <map:parameter name="contextPath" value="{request:contextPath}"/> </map:transform> <map:serialize/> </map:match> @@ -39,10 +33,6 @@ <map:serialize type="html"/> </map:match> - <map:match pattern="sdocbook-demo.html"> - <map:read src="sdocbook-demo.html"/> - </map:match> - <map:match pattern="sdocbook-demo"> <map:generate src="article.xml"/> <map:transform src="sdocbook2body.xsl"/> @@ -71,12 +61,8 @@ <map:handle-errors/> --> </map:pipeline> - </map:pipelines> </map:sitemap> - - <!-- end of file --> - 1.2 +1 -0 cocoon-2.1/src/webapp/samples/catalog/style.xsl Index: style.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/catalog/style.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- style.xsl 9 Mar 2003 00:10:50 -0000 1.1 +++ style.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,4 +1,5 @@ <?xml version='1.0'?> + <!DOCTYPE xsl:stylesheet [ <!ENTITY % ISOnum PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" 1.5 +2 -2 cocoon-2.1/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl Index: simple-samples2html.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/common/style/xsl/html/simple-samples2html.xsl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- simple-samples2html.xsl 6 May 2003 19:23:51 -0000 1.4 +++ simple-samples2html.xsl 7 May 2003 04:57:13 -0000 1.5 @@ -16,7 +16,7 @@ <xsl:template match="/"> <html> <head> - <title>Apache Cocoon 2.1-M2-dev</title> + <title>Apache Cocoon @version@</title> <link rel="SHORTCUT ICON" href="favicon.ico"/> <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/> </head> 1.3 +7 -1 cocoon-2.1/src/webapp/samples/flow/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/samples.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- samples.xml 26 Mar 2003 21:21:43 -0000 1.2 +++ samples.xml 7 May 2003 04:57:13 -0000 1.3 @@ -4,6 +4,12 @@ <samples> + <group name="Back"> + <sample name="Back" href="../"> + Back to the samples home page. + </sample> + </group> + <group name="Flowscript"> <sample name="Calculator" href="calc/"> A simple web-based calculator that uses javascript on the server side 1.3 +17 -2 cocoon-2.1/src/webapp/samples/hello-world/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/samples.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- samples.xml 30 Mar 2003 12:48:57 -0000 1.2 +++ samples.xml 7 May 2003 04:57:13 -0000 1.3 @@ -2,7 +2,22 @@ <!-- CVS $Id$ --> -<samples> +<samples name="Hello, World!"> + + <group name="Back"> + <sample name="Back" href="../"> + Back to the samples home page. + </sample> + </group> + + <group name="About"> + <note>All examples on this page has been created using single data source, + hello.xml file. + </note> + <sample name="XML" href="hello.xml"> + Hello world XML document. + </sample> + </group> <group name="Multichannel Hello World!"> <sample name="HTML" href="hello.html"> 1.6 +7 -2 cocoon-2.1/src/webapp/samples/hello-world/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/sitemap.xmap,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sitemap.xmap 30 Apr 2003 10:19:18 -0000 1.5 +++ sitemap.xmap 7 May 2003 04:57:13 -0000 1.6 @@ -1,9 +1,10 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> <map:pipelines> - <map:pipeline> <map:match pattern=""> @@ -14,6 +15,11 @@ <map:serialize/> </map:match> + <map:match pattern="hello.xml"> + <map:generate src="content/hello.xml"/> + <map:serialize type="xml"/> + </map:match> + <map:match pattern="hello.html"> <map:generate src="content/hello.xml"/> <map:transform src="style/xsl/page2html.xsl"/> @@ -67,7 +73,6 @@ </map:match> </map:pipeline> - </map:pipelines> </map:sitemap> 1.3 +1 -1 cocoon-2.1/src/webapp/samples/hello-world/content/hello.xml Index: hello.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/content/hello.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hello.xml 27 Mar 2003 14:10:25 -0000 1.2 +++ hello.xml 7 May 2003 04:57:13 -0000 1.3 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <page> <title>Hello</title> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2fo.xsl Index: page2fo.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2fo.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2fo.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2fo.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2html.xsl Index: page2html.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2html.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2html.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2html.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:template match="page"> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2itext.xsl Index: page2itext.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2itext.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2itext.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2itext.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:param name="view-source"/> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2svg.xsl Index: page2svg.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2svg.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2svg.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2svg.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:template match="page"> 1.4 +3 -2 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2swf.xsl Index: page2swf.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2swf.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- page2swf.xsl 5 May 2003 08:22:11 -0000 1.3 +++ page2swf.xsl 7 May 2003 04:57:13 -0000 1.4 @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!-- - convert a page so that is is usable as input for the SWFSerializer - $Id$ + Convert a page so that is is usable as input for the SWFSerializer Bugzilla 19619 note: ([EMAIL PROTECTED]): the value of some Glyph.char attributes in this file seems to have been corrupted in CVS, @@ -11,6 +10,8 @@ Most probably, the font definition below is not correct over the whole character set. + + CVS $Id$ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 1.2 +3 -2 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2vml.xsl Index: page2vml.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2vml.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2vml.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2vml.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,7 +1,5 @@ <?xml version="1.0"?> -<!-- Written by Theodore B. Achacoso, MD 991122 [EMAIL PROTECTED] --> - <!-- The code is based on Motorola's VoxML (Version 1.2) implementation of the emerging VoiceXML standard (version 0.9 as of 17 August '99). @@ -14,6 +12,9 @@ If user says "repeat" then the computer repeats the prompt. If the user says "goodbye" then the computer says "Goodbye" and ends the session. + + Written by Theodore B. Achacoso, MD 991122 [EMAIL PROTECTED] + CVS $Id$ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 1.2 +35 -34 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2vrml.xsl Index: page2vrml.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2vrml.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2vrml.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2vrml.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,42 +1,43 @@ <?xml version="1.0"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> +<!-- CVS $Id$ --> - <xsl:template match="page"> - <!-- - due to a DOM limitation, you must wrap your generated VRML - with a fake tag, here uses <vrml>, that is stripped out by the - text formatter - --> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - <vrml><xsl:text>#VRML V2.0 utf8</xsl:text> - <xsl:apply-templates select="content"/> - </vrml> - </xsl:template> + <xsl:template match="page"> + <!-- + due to a DOM limitation, you must wrap your generated VRML + with a fake tag, here uses <vrml>, that is stripped out by the + text formatter + --> + <vrml><xsl:text>#VRML V2.0 utf8</xsl:text> + <xsl:apply-templates select="content"/> + </vrml> + </xsl:template> - <xsl:template match="content"> - <xsl:text> - Transform { - translation 0 0 9 - rotation 0 0 1 0.0 - children Shape { - appearance DEF WHITE Appearance { - material Material { - diffuseColor 1 1 1 - } - } - geometry Text { - string [ " </xsl:text><xsl:value-of select="para"/><xsl:text> " ] - fontStyle DEF MFS FontStyle { - size 0.1 - family "SERIF" - style "BOLD" - justify "MIDDLE" - } - } - } - } - </xsl:text> + <xsl:template match="content"> + <xsl:text> + Transform { + translation 0 0 9 + rotation 0 0 1 0.0 + children Shape { + appearance DEF WHITE Appearance { + material Material { + diffuseColor 1 1 1 + } + } + geometry Text { + string [ " </xsl:text><xsl:value-of select="para"/><xsl:text> " ] + fontStyle DEF MFS FontStyle { + size 0.1 + family "SERIF" + style "BOLD" + justify "MIDDLE" + } + } + } + } + </xsl:text> </xsl:template> </xsl:stylesheet> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2wml.xsl Index: page2wml.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2wml.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2wml.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2wml.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:template match="page"> 1.2 +2 -0 cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2xls.xsl Index: page2xls.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/style/xsl/page2xls.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2xls.xsl 27 Mar 2003 14:10:25 -0000 1.1 +++ page2xls.xsl 7 May 2003 04:57:13 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0"?> +<!-- CVS $Id$ --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sql="http://apache.org/cocoon/SQL/2.0" xmlns:gmr="http://www.gnome.org/gnumeric/v7" > 1.3 +1 -0 cocoon-2.1/src/webapp/samples/hello-world/webservice/HelloWorld.wsdl Index: HelloWorld.wsdl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/hello-world/webservice/HelloWorld.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HelloWorld.wsdl 27 Mar 2003 14:10:25 -0000 1.2 +++ HelloWorld.wsdl 7 May 2003 04:57:14 -0000 1.3 @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:s0="http://www.cocoonhive.org/cocoonbook/2002/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://www.cocoonhive.org/cocoonbook/2002/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/"> <message name="HelloWorldHttpGetIn"/> 1.2 +2 -2 cocoon-2.1/src/webapp/samples/myapp/readme.html Index: readme.html =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/myapp/readme.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- readme.html 9 Mar 2003 00:11:16 -0000 1.1 +++ readme.html 7 May 2003 04:57:14 -0000 1.2 @@ -1,4 +1,4 @@ -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <html> <head> 1.2 +3 -1 cocoon-2.1/src/webapp/samples/myapp/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/myapp/sitemap.xmap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sitemap.xmap 9 Mar 2003 00:11:16 -0000 1.1 +++ sitemap.xmap 7 May 2003 04:57:14 -0000 1.2 @@ -1,6 +1,8 @@ <?xml version="1.0"?> + +<!-- CVS $Id$ --> + <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> -<!-- CVS: $Id$ --> <!-- Minimal sitemap to start making XML/XSP/XSLT transformations. 1.2 +3 -1 cocoon-2.1/src/webapp/samples/myapp/xml/page.xml Index: page.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/myapp/xml/page.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page.xml 9 Mar 2003 00:11:16 -0000 1.1 +++ page.xml 7 May 2003 04:57:14 -0000 1.2 @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- CVS: $Id$ --> + +<!-- CVS $Id$ --> + <page> <title>My App page</title> <content> 1.2 +2 -1 cocoon-2.1/src/webapp/samples/myapp/xsl/style.xsl Index: style.xsl =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/myapp/xsl/style.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- style.xsl 9 Mar 2003 00:11:17 -0000 1.1 +++ style.xsl 7 May 2003 04:57:14 -0000 1.2 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- CVS: $Id$ --> + +<!-- CVS $Id$ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> 1.2 +2 -1 cocoon-2.1/src/webapp/samples/myapp/xsp/page.xsp Index: page.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/myapp/xsp/page.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page.xsp 9 Mar 2003 00:11:17 -0000 1.1 +++ page.xsp 7 May 2003 04:57:14 -0000 1.2 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> + +<!-- CVS $Id$ --> <!-- XSP can be assotiated with the logicsheet using processing 1.3 +8 -2 cocoon-2.1/src/webapp/samples/sites/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/sites/samples.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- samples.xml 27 Mar 2003 14:16:22 -0000 1.2 +++ samples.xml 7 May 2003 04:57:14 -0000 1.3 @@ -2,7 +2,13 @@ <!-- CVS $Id$ --> -<samples> +<samples name="XML-ized Web Sites"> + + <group name="Back"> + <sample name="Back" href="../"> + Back to the samples home page. + </sample> + </group> <group name="Sites"> <sample name="jakarta.apache.org" href="jakarta.apache.org/"> 1.3 +1 -1 cocoon-2.1/src/webapp/samples/slides/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/slides/sitemap.xmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sitemap.xmap 27 Mar 2003 17:55:47 -0000 1.2 +++ sitemap.xmap 7 May 2003 04:57:14 -0000 1.3 @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> 1.3 +26 -18 cocoon-2.1/src/webapp/samples/soap/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/samples.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- samples.xml 27 Mar 2003 17:55:45 -0000 1.2 +++ samples.xml 7 May 2003 04:57:14 -0000 1.3 @@ -2,7 +2,13 @@ <!-- CVS $Id$ --> -<samples> +<samples name="SOAP Samples"> + + <group name="Back"> + <sample name="Back" href="../"> + Back to the samples home page. + </sample> + </group> <group name="SOAP"> <sample name="Temperature" href="temperature"> @@ -13,27 +19,29 @@ </sample> </group> - <group name="XScript"> - <sample name="Simple Sample" href="xscript/simple"> - A simple sample for the SOAP logicsheet (XScript). - </sample> - <sample name="SOAP Stock Quote Example 1" href="xscript/getquote1"> - This page demonstrates the SOAP logicsheet for - Cocoon. It accesses a SOAP service that provides stock quotes - and displays the result. + <group name="SOAP Logicsheet"> + <sample name="Simple XScript Sample" href="xscript/simple"> + A simple sample showing XScript logicsheet which is used as foundation + for the SOAP logicsheet. + </sample> + <sample name="XScript Test" href="xscript/test"> + Sample testing XScript logicsheet functionality. + </sample> + <sample name="SOAP Sample 1" href="xscript/getquote1"> + This page demonstrates the SOAP logicsheet for + Cocoon. It accesses a SOAP service that provides stock quotes + and displays the result. </sample> <sample name="SOAP Sample 2" href="xscript/getquote2"> - This example uses an inline XSLT stylesheet and an - XScript transform instruction to extract the stock - price. + This example uses an inline XSLT stylesheet and an + XScript transform instruction to extract the stock + price. </sample> <sample name="SOAP Sample 3" href="xscript/getquote3"> - This is yet another example of the XScript and SOAP - logicsheets. This sample is very similar with - SOAP Sample 2, except that the stylesheet is defined in an external file. + This is yet another example of the XScript and SOAP + logicsheets. This sample is very similar with + SOAP Sample 2, except that the stylesheet is defined in an external file. </sample> - <sample name="Test" href="xscript/test"> - </sample> </group> </samples> 1.3 +7 -7 cocoon-2.1/src/webapp/samples/soap/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/sitemap.xmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sitemap.xmap 27 Mar 2003 17:55:45 -0000 1.2 +++ sitemap.xmap 7 May 2003 04:57:14 -0000 1.3 @@ -1,10 +1,10 @@ <?xml version="1.0"?> -<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> + +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> <map:pipelines> - <map:pipeline> <map:match pattern=""> @@ -24,7 +24,7 @@ <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="docs/samples/{0}.xsp"/> + <map:parameter name="file" value="pages/{0}.xsp"/> <map:parameter name="remove" value="{0}"/> </map:transform> <map:serialize/> @@ -36,7 +36,7 @@ <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="{0}.xsp"/> + <map:parameter name="file" value="pages/{0}.xsp"/> <map:parameter name="remove" value="{0}"/> </map:transform> <map:serialize/> @@ -50,6 +50,6 @@ <map:serialize/> </map:match> - </map:pipeline> - </map:pipelines> + </map:pipeline> + </map:pipelines> </map:sitemap> 1.2 +2 -3 cocoon-2.1/src/webapp/samples/soap/pages/xscript/getquote1.xsp Index: getquote1.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/pages/xscript/getquote1.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- getquote1.xsp 27 Mar 2003 17:55:46 -0000 1.1 +++ getquote1.xsp 7 May 2003 04:57:14 -0000 1.2 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> - <!-- Author: Ovidiu Predescu "[EMAIL PROTECTED]" - Date: October 9, 2001 + CVS $Id$ --> + <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0" 1.2 +2 -3 cocoon-2.1/src/webapp/samples/soap/pages/xscript/getquote2.xsp Index: getquote2.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/pages/xscript/getquote2.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- getquote2.xsp 27 Mar 2003 17:55:46 -0000 1.1 +++ getquote2.xsp 7 May 2003 04:57:14 -0000 1.2 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> - <!-- Author: Ovidiu Predescu "[EMAIL PROTECTED]" - Date: October 9, 2001 + CVS $Id$ --> + <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0" 1.2 +2 -3 cocoon-2.1/src/webapp/samples/soap/pages/xscript/getquote3.xsp Index: getquote3.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/pages/xscript/getquote3.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- getquote3.xsp 27 Mar 2003 17:55:46 -0000 1.1 +++ getquote3.xsp 7 May 2003 04:57:14 -0000 1.2 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> - <!-- Author: Ovidiu Predescu "[EMAIL PROTECTED]" - Date: October 9, 2001 + CVS $Id$ --> + <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0" 1.2 +2 -3 cocoon-2.1/src/webapp/samples/soap/pages/xscript/simple.xsp Index: simple.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/pages/xscript/simple.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- simple.xsp 27 Mar 2003 17:55:46 -0000 1.1 +++ simple.xsp 7 May 2003 04:57:14 -0000 1.2 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> - <!-- Author: Ovidiu Predescu "[EMAIL PROTECTED]" - Date: September 18, 2001 + CVS $Id$ --> + <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0" 1.2 +2 -2 cocoon-2.1/src/webapp/samples/soap/pages/xscript/test.xsp Index: test.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/soap/pages/xscript/test.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- test.xsp 27 Mar 2003 17:55:46 -0000 1.1 +++ test.xsp 7 May 2003 04:57:14 -0000 1.2 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> - <!-- Author: Vadim Gritsenko "[EMAIL PROTECTED]" + CVS $Id$ --> + <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xscript="http://apache.org/xsp/xscript/1.0" 1.1 cocoon-2.1/src/webapp/samples/sources/samples.xml Index: samples.xml =================================================================== <?xml version="1.0" encoding="iso-8859-1"?> <!-- CVS $Id: samples.xml,v 1.1 2003/05/07 04:57:15 vgritsenko Exp $ --> <samples name="Using Sources" xmlns:xlink="http://www.w3.org/1999/xlink"> <group name="Back"> <sample name="Back" href="../"> Back to the samples home page. </sample> </group> <group name="Static XML With Static XSL"> <sample name="All Static" href="all-static"> This is the simpliest sample, similar to the "Hello World!". </sample> </group> <group name="Obtaining XSP Source"> <sample name="Plain XSP" href="xsp-file"> Source is obtained from local file </sample> <sample name="This sitemap XSP" href="xsp-cocoon"> Source is obtained via cocoon:/xsp-source </sample> <sample name="Root sitemap XSP" href="xsp-cocoon-root"> Source is obtained via cocoon://sub/xsp-source </sample> <sample name="External XSP" href="xsp-http"> Source is obtained via http://localhost:8080/cocoon/sub/xsp-source (Note: if you run Cocoon on another host/port, you have to edit sub-sitemap) </sample> <sample name="Dynamic XSP" href="xsp-dynamic"> Source is generated dynamically and obtained as Cocoon source cocoon:/xsp-dynamic-source </sample> </group> <group name="Obtaining XSL Source"> <sample name="Plain XSL" href="xsl-file"> XSL is obtained from local file </sample> <sample name="This sitemap XSL" href="xsl-cocoon"> XSL is obtained via cocoon:/xsl-source, processed by this sitemap directly. </sample> <sample name="Root sitemap XSL" href="xsl-cocoon-root"> XSL is obtained via cocoon://sub/xsp-source, processed by root sitemap. </sample> <sample name="External XSL" href="xsl-http"> XSL is obtained via http://localhost:8080/cocoon/sub/xsl-source (Note: if you run Cocoon on another host/port, you have to edit sub-sitemap) </sample> <sample name="Dynamic XSL" href="xsl-dynamic"> XSL is dynamically generated and obtained as Cocoon source cocoon:/xsl-dynamic-source. </sample> </group> <group name="Dynamic XSP With Dynamic XSL"> <sample name="All Dynamic" href="all-dynamic"> Combines last XSP sample with last XSL sample: XSP is obtained via Cocoon source cocoon:/xsp-dynamic-source, and processed by XSL obtained via Cocoon source cocoon:/xsl-dynamic-source. </sample> </group> </samples> 1.1 cocoon-2.1/src/webapp/samples/sources/sitemap.xmap Index: sitemap.xmap =================================================================== <?xml version="1.0"?> <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"> <map:views> <map:view name="content" from-label="content"> <map:serialize type="xml"/> </map:view> <map:view name="pretty-content" from-label="data"> <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> <map:pipelines> <map:pipeline> <map:match pattern=""> <map:redirect-to uri="welcome"/> </map:match> <map:match pattern="welcome"> <map:generate src="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> <!-- All Static. --> <map:match pattern="all-static"> <map:generate src="content/simple.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="remove" value="all-static"/> <map:parameter name="file" value="content/simple.xml"/> </map:transform> <map:serialize/> </map:match> <!-- These samples show ways how XSP could be obtained and executed --> <map:match pattern="xsp-*"> <!-- XSP obtained from the local file, and executed --> <map:match pattern="xsp-file"> <map:generate type="serverpages" src="content/simple.xsp"/> </map:match> <!-- Generate XSP source from local file --> <map:match pattern="xsp-source"> <map:generate src="content/simple.xsp"/> <map:serialize type="xml"/> </map:match> <!-- XSP obtained from the matcher 'xsp-source', right above, and executed --> <map:match pattern="xsp-cocoon"> <map:generate type="serverpages" src="cocoon:/xsp-source"/> </map:match> <!-- XSP obtained from the matcher 'xsp-source', absolute reference, and executed --> <map:match pattern="xsp-cocoon-root"> <map:generate type="serverpages" src="cocoon://samples/sources/xsp-source"/> </map:match> <!-- XSP obtained from the external HTTP server, and executed --> <map:match pattern="xsp-http"> <map:generate type="serverpages" src="http://{request:serverName}:{request:serverPort}/{request:contextPath}/samples/sources/xsp-source"/> </map:match> <!-- Generate XSP source dynamically. --> <map:match pattern="xsp-dynamic-source"> <map:generate type="serverpages" src="content/dynamic.xsp"/> <map:transform src="style/dynamic-xsp2xsp.xsl"/> <map:serialize type="xml"/> </map:match> <!-- XSP obtained from the matcher 'xsp-dynamic-source'. Beware: Very slow! --> <map:match pattern="xsp-dynamic"> <map:generate type="serverpages" src="cocoon:/xsp-dynamic-source"/> </map:match> <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="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xsp"/> </map:transform> <map:serialize/> </map:match> <!-- These samples show ways how XSL could be obtained and applied --> <map:match pattern="xsl-*"> <!-- XSL obtained from the local file, and applied --> <map:match pattern="xsl-file"> <map:generate src="content/simple.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="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xml"/> </map:transform> <map:serialize/> </map:match> <!-- Generate XSL source from local file --> <map:match pattern="xsl-source"> <map:generate src="context://samples/common/style/xsl/html/simple-page2html.xsl"/> <map:serialize type="xml"/> </map:match> <!-- XSL obtained from the matcher 'xsl-source', right above, and applied --> <map:match pattern="xsl-cocoon"> <map:generate src="content/simple.xml"/> <map:transform src="cocoon:/xsl-source"> <map:parameter name="servletPath" value="{request:servletPath}"/> <map:parameter name="sitemapURI" value="{request:sitemapURI}"/> <map:parameter name="contextPath" value="{request:contextPath}"/> <map:parameter name="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xml"/> </map:transform> <map:serialize/> </map:match> <!-- XSL obtained from the matcher 'xsl-source', absolute reference, and applied --> <map:match pattern="xsl-cocoon-root"> <map:generate src="content/simple.xml"/> <map:transform src="cocoon://samples/sources/xsl-source"> <map:parameter name="servletPath" value="{request:servletPath}"/> <map:parameter name="sitemapURI" value="{request:sitemapURI}"/> <map:parameter name="contextPath" value="{request:contextPath}"/> <map:parameter name="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xml"/> </map:transform> <map:serialize/> </map:match> <!-- XSL obtained from the external HTTP server, and applied --> <map:match pattern="xsl-http"> <map:generate src="content/simple.xml"/> <map:transform src="http://{request:serverName}:{request:serverPort}/{request:contextPath}/samples/sources/xsl-source"> <map:parameter name="servletPath" value="{request:servletPath}"/> <map:parameter name="sitemapURI" value="{request:sitemapURI}"/> <map:parameter name="contextPath" value="{request:contextPath}"/> <map:parameter name="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xml"/> </map:transform> <map:serialize/> </map:match> <!-- Generate XSL source dynamically using XSP page. --> <map:match pattern="xsl-dynamic-source"> <map:generate type="serverpages" src="style/simple-page2html.xsp"/> <map:serialize type="xml"/> </map:match> <!-- XSL obtained from the matcher 'xsl-dynamic-source'. Beware: Slow! --> <map:match pattern="xsl-dynamic"> <map:generate src="content/simple.xml"/> <map:transform src="cocoon:/xsl-dynamic-source"> <map:parameter name="servletPath" value="{request:servletPath}"/> <map:parameter name="sitemapURI" value="{request:sitemapURI}"/> <map:parameter name="contextPath" value="{request:contextPath}"/> <map:parameter name="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xml"/> </map:transform> <map:serialize/> </map:match> </map:match> <!-- All Dynamic. Beware: Very slow! --> <map:match pattern="all-dynamic"> <map:generate type="serverpages" src="cocoon:/xsp-dynamic-source"/> <map:transform src="cocoon:/xsl-dynamic-source"> <map:parameter name="servletPath" value="{request:servletPath}"/> <map:parameter name="sitemapURI" value="{request:sitemapURI}"/> <map:parameter name="contextPath" value="{request:contextPath}"/> <map:parameter name="remove" value="{0}"/> <map:parameter name="file" value="content/simple.xsp"/> </map:transform> <map:serialize/> </map:match> </map:pipeline> </map:pipelines> </map:sitemap> <!-- end of file --> 1.1 cocoon-2.1/src/webapp/samples/sources/content/dynamic.xsp Index: dynamic.xsp =================================================================== <?xml version="1.0" encoding="ISO-8859-1"?> <!-- CVS $Id: dynamic.xsp,v 1.1 2003/05/07 04:57:15 vgritsenko Exp $ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:an-xsp="urn:xsp" xmlns:an-xsp-request="urn:xsp-request"> <an-xsp:page language="java"> <page> <title>Dynamic XSP page, served by sub-sitemap</title> <content> <para>Hi there! I'm a very complex dynamic page generated by XSP (eXtensible Server Pages), with source dynamically generated by XSP. Nobody should use such complex constructs while in good health :)</para> <para> My source resides in the file <b>cocoon/sub/docs/dynamic.xsp</b>.</para> <para> My source was generated by XSP at <b><xsp:expr>new Date()</xsp:expr></b>.</para> <para>I know that I was requested as the URI <b> <an-xsp-request:get-uri as="xml"/></b>, and executed at <b><an-xsp:expr>new Date()</an-xsp:expr></b> by <b><an-xsp:expr>Constants.COMPLETE_NAME</an-xsp:expr></b>. </para> </content> </page> </an-xsp:page> </xsp:page> 1.1 cocoon-2.1/src/webapp/samples/sources/content/simple.xml Index: simple.xml =================================================================== <?xml version="1.0"?> <!-- CVS $Id: simple.xml,v 1.1 2003/05/07 04:57:15 vgritsenko Exp $ --> <page> <title>Simple static page, served by sub-sitemap</title> <content> <para> Hi there! I'm a simple static page read from the file.</para> <para> My source resides in the file <b>samples/sources/content/simple.xml</b></para> <para> I know nothing about the environment which is using me.</para> </content> </page> 1.1 cocoon-2.1/src/webapp/samples/sources/content/simple.xsp Index: simple.xsp =================================================================== <?xml version="1.0" encoding="ISO-8859-1"?> <!-- CVS $Id: simple.xsp,v 1.1 2003/05/07 04:57:15 vgritsenko Exp $ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0"> <page> <title>Simple XSP page, served by sub-sitemap</title> <content> <para>Hi there! I'm a simple dynamic page generated by XSP (eXtensible Server Pages).</para> <para> My source resides in the file <b>samples/sources/content/simple.xsp</b>.</para> <para>I know that I was requested as the URI <b><xsp-request:get-uri as="xml"/></b>, and executed at <b><xsp:expr>new Date()</xsp:expr></b> by <b><xsp:expr>Constants.COMPLETE_NAME</xsp:expr></b>. </para> </content> </page> </xsp:page> 1.1 cocoon-2.1/src/webapp/samples/sources/style/dynamic-xsp2xsp.xsl Index: dynamic-xsp2xsp.xsl =================================================================== <?xml version="1.0"?> <!-- CVS $Id: dynamic-xsp2xsp.xsl,v 1.1 2003/05/07 04:57:15 vgritsenko Exp $ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0"> <xsl:template match="*[namespace-uri() = 'urn:xsp']"> <xsl:element name="xsp:{local-name()}"> <xsl:for-each select="@*"> <xsl:attribute name="{name(.)}"> <xsl:value-of select="."/> </xsl:attribute> </xsl:for-each> <xsl:apply-templates select="node()"/> </xsl:element> </xsl:template> <xsl:template match="*[namespace-uri() = 'urn:xsp-request']"> <xsl:element name="xsp-request:{local-name()}" namespace="http://apache.org/xsp/request/2.0"> <xsl:for-each select="@*"> <xsl:attribute name="{name(.)}"> <xsl:value-of select="."/> </xsl:attribute> </xsl:for-each> <xsl:apply-templates select="node()"/> </xsl:element> </xsl:template> <xsl:template match="@*|node()" priority="-1"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> </xsl:copy> </xsl:template> </xsl:stylesheet> 1.1 cocoon-2.1/src/webapp/samples/sources/style/simple-page2html.xsp Index: simple-page2html.xsp =================================================================== <?xml version="1.0"?> <!-- CVS $Id: simple-page2html.xsp,v 1.1 2003/05/07 04:57:15 vgritsenko Exp $ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" xmlns:xsp-request="http://apache.org/xsp/request/2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:stylesheet version="1.0"> <xsl:template match="page"> <html> <head> <title> <xsl:value-of select="title"/> </title> </head> <body bgcolor="white" alink="red" link="blue" vlink="blue"> <xsl:apply-templates/> </body> </html> </xsl:template> <xsl:template match="title"> <h2 style="color: navy; text-align: center"> <xsl:apply-templates/> </h2> </xsl:template> <xsl:template match="para"> <p align="left"> <i> <xsl:apply-templates/> </i> </p> <xsl:if test="not(following-sibling::para)"> <p align="left"> <i>Note from the stylesheet:<br/> Page above was processed by dynamic XSL stylesheet generated by XSP (eXtensible Server Pages).<br/> My source could be found in the file <b>cocoon/sub/stylesheets/simple-page2html.xsp</b>.<br/> I know that I was executed at <b><xsp:expr>new Date()</xsp:expr></b> by <b><xsp:expr>Constants.COMPLETE_NAME</xsp:expr></b>. </i> </p> </xsl:if> </xsl:template> <xsl:template match="@*|node()" priority="-1"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> </xsl:copy> </xsl:template> </xsl:stylesheet> </xsp:page> 1.3 +3 -2 cocoon-2.1/src/webapp/samples/stream/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/stream/sitemap.xmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sitemap.xmap 30 Apr 2003 09:24:02 -0000 1.2 +++ sitemap.xmap 7 May 2003 04:57:15 -0000 1.3 @@ -35,7 +35,8 @@ <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=".xsp"/> + <map:parameter name="remove" value="order"/> + <map:parameter name="file" value="OrderPage.xml"/> </map:transform> <map:serialize type="html"/> </map:match> 1.3 +7 -1 cocoon-2.1/src/webapp/samples/xsp/samples.xml Index: samples.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/samples.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- samples.xml 27 Mar 2003 17:55:47 -0000 1.2 +++ samples.xml 7 May 2003 04:57:15 -0000 1.3 @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <samples xmlns:xlink="http://www.w3.org/1999/xlink"> + + <group name="Back"> + <sample name="Back" href="../"> + Back to the samples home page. + </sample> + </group> <group name="Hello, XSP"> <sample name="Hello Page" href="java/hello"> 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/cookie.xsp Index: cookie.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/cookie.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cookie.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ cookie.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/hello.xsp Index: hello.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/hello.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hello.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ hello.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp"> 1.3 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/logicsheet.xsp Index: logicsheet.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/logicsheet.xsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- logicsheet.xsp 27 Mar 2003 17:55:47 -0000 1.2 +++ logicsheet.xsp 7 May 2003 04:57:15 -0000 1.3 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <!-- XSP can be assotiated with the logicsheet using processing instruction xml-logicsheet or the xsp:logicsheet element. 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/request.xsp Index: request.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/request.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- request.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ request.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/response.xsp Index: response.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/response.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- response.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ response.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/session.xsp Index: session.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/session.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- session.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ session.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/sessionpage.xsp Index: sessionpage.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/sessionpage.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sessionpage.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ sessionpage.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/simple.xsp Index: simple.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/simple.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- simple.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ simple.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp/upload.xsp Index: upload.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp/upload.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upload.xsp 26 Mar 2003 21:21:33 -0000 1.1 +++ upload.xsp 7 May 2003 04:57:15 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.3 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp-js/hello.xsp Index: hello.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp-js/hello.xsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hello.xsp 27 Mar 2003 17:55:45 -0000 1.2 +++ hello.xsp 7 May 2003 04:57:16 -0000 1.3 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="javascript" xmlns:xsp="http://apache.org/xsp"> <page> 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp-js/request.xsp Index: request.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp-js/request.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- request.xsp 26 Mar 2003 21:21:38 -0000 1.1 +++ request.xsp 7 May 2003 04:57:16 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="jsxsp" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp-js/response.xsp Index: response.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp-js/response.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- response.xsp 26 Mar 2003 21:21:38 -0000 1.1 +++ response.xsp 7 May 2003 04:57:16 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="javascript" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp-js/session.xsp Index: session.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp-js/session.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- session.xsp 26 Mar 2003 21:21:38 -0000 1.1 +++ session.xsp 7 May 2003 04:57:16 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="java" xmlns:xsp="http://apache.org/xsp" 1.2 +1 -1 cocoon-2.1/src/webapp/samples/xsp/xsp-js/simple.xsp Index: simple.xsp =================================================================== RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/xsp/xsp-js/simple.xsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- simple.xsp 26 Mar 2003 21:21:38 -0000 1.1 +++ simple.xsp 7 May 2003 04:57:16 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- CVS: $Id$ --> +<!-- CVS $Id$ --> <xsp:page language="javascript" xmlns:xsp="http://apache.org/xsp"> <page>