vgritsenko 02/02/08 22:21:58
Modified: src/webapp sitemap.xmap
src/webapp/docs/samples error-giving-page.xml hello-page.xml
sample-apps.xml sample-dynamic.xml
sample-static.xml samples.xml
src/webapp/docs/samples/xsp aggregate.xsp cacheable.xsp
cookie.xsp esql.xsp logicsheet.xsp simple.xsp
upload.xsp
src/webapp/docs/samples/xsp-js hello.xsp simple.xsp
src/webapp/stylesheets simple-samples2html.xsl
src/webapp/sub/docs dynamic.xsp error-giving-page.xml
samples.xml simple.xml simple.xsp
src/webapp/sub/stylesheets dynamic-xsp2xsp.xsl
error2html.xsl simple-page2html.xsl
simple-page2html.xsp simple-samples2html.xsl
Added: src/webapp/docs/samples sample-xsp.xml
src/webapp/docs/samples/xsp hello.xsp request.xsp
session.xsp
src/webapp/docs/samples/xsp-js request.xsp
Removed: src/webapp/docs/samples/session sessionpage.xsp
src/webapp/docs/samples/xsp request-test.xsp
src/webapp/docs/samples/xsp-js request-test.xsp
Log:
Reorganize XSP samples
Revision Changes Path
1.26 +8 -15 xml-cocoon2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sitemap.xmap 9 Feb 2002 04:16:39 -0000 1.25
+++ sitemap.xmap 9 Feb 2002 06:21:57 -0000 1.26
@@ -801,6 +801,14 @@
<map:serialize/>
</map:match>
+ <!-- Aggregation using CInclude transformer -->
+ <map:match pattern="news/aggregate">
+ <map:generate type="serverpages" src="docs/samples/xsp/aggregate.xsp"/>
+ <map:transform type="cinclude"/>
+ <map:transform src="stylesheets/news/news.xsl"/>
+ <map:serialize/>
+ </map:match>
+
<!-- ============== Catalog ========================== -->
<map:match pattern="**/samples/catalog-demo">
@@ -982,21 +990,6 @@
<map:call resource="dynamic-page">
<map:parameter name="target" value="docs/samples/formvalidation/ERROR"/>
</map:call>
- </map:match>
-
-
-
- <!-- ========================== Session ================================= -->
- <map:match pattern="session">
- <map:redirect-to uri="session/sessionpage.xsp"/>
- </map:match>
-
- <map:match pattern="session/*.xsp*">
- <map:generate type="serverpages" src="docs/samples/session/{1}.xsp"/>
- <map:transform src="stylesheets/dynamic-page2html.xsl">
- <map:parameter name="view-source" value="docs/samples/session/{1}.xsp"/>
- </map:transform>
- <map:serialize/>
</map:match>
<!-- ========================== session state =================================
-->
1.2 +2 -0 xml-cocoon2/src/webapp/docs/samples/error-giving-page.xml
Index: error-giving-page.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/error-giving-page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error-giving-page.xml 3 Jan 2002 12:31:39 -0000 1.1
+++ error-giving-page.xml 9 Feb 2002 06:21:57 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: error-giving-page.xml,v 1.2 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<!DOCTYPE page [
<!ELEMENT page (title?, content)>
<!ELEMENT title (#PCDATA)>
1.2 +2 -0 xml-cocoon2/src/webapp/docs/samples/hello-page.xml
Index: hello-page.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/hello-page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hello-page.xml 3 Jan 2002 12:31:39 -0000 1.1
+++ hello-page.xml 9 Feb 2002 06:21:57 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: hello-page.xml,v 1.2 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<!DOCTYPE page [
<!ELEMENT page (title?, content)>
<!ELEMENT title (#PCDATA)>
1.2 +2 -0 xml-cocoon2/src/webapp/docs/samples/sample-apps.xml
Index: sample-apps.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/sample-apps.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sample-apps.xml 15 Jan 2002 19:06:37 -0000 1.1
+++ sample-apps.xml 9 Feb 2002 06:21:57 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- CVS: $Id: sample-apps.xml,v 1.2 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
<group name="Back">
1.7 +26 -39 xml-cocoon2/src/webapp/docs/samples/sample-dynamic.xml
Index: sample-dynamic.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/sample-dynamic.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sample-dynamic.xml 2 Feb 2002 03:08:10 -0000 1.6
+++ sample-dynamic.xml 9 Feb 2002 06:21:57 -0000 1.7
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- CVS: $Id: sample-dynamic.xml,v 1.7 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
<group name="Back">
@@ -8,15 +10,17 @@
</sample>
</group>
- <group name="Dynamic Content">
+ <group name="Internationalization">
<sample name="Simple Internationalization" href="i18n/simple.xml">
Sample for Internationalization.
</sample>
- <sample name="Simple SQL" href="sql/sql-page" xlink:role="dynamic">
- Simple SQL example. You should make sure that you have a database and
- table according to the conf/sitemap.xmap and the
- docs/samples/sql/sql-page.xml.sql definitions.
+
+ <sample name="XSP Internationalization" href="i18n/simple.xsp">
+ Sample for Internationalization in an XSP.
</sample>
+ </group>
+
+ <group name="Dynamic Content">
<sample name="Javascript Generator" href="scripts/hello.js">
An example of the ScriptGenerator producing XML out of a Javascript program.
</sample>
@@ -44,39 +48,6 @@
-->
</group>
- <group name="Java Server Pages">
- <sample name="JSP Generator" href="jsp/hello">
- An example of the JSPGenerator producing XML out of using JSP.
- ATTENTION: Depending on your servlet engine, this example might not work
directly.
- For more information on how to configure the JSP components please refer to the
- documentation.
- </sample>
- <sample name="JSP Reader" href="jsp/welcome.htm">
- An example of the JSPReader producing HTML out of using JSP.
- ATTENTION: Depending on your servlet engine, this example might not work
directly.
- For more information on how to configure the JSP components please refer to the
- documentation.
- </sample>
- </group>
-
- <group name="eXtensible Server Pages">
- <sample name="Simple XSP" href="xsp/simple">
- Simple XSP example.
- </sample>
- <sample name="XSP Internationalization" href="i18n/simple.xsp">
- Sample for Internationalization in an XSP.
- </sample>
- <sample name="ESQL" href="xsp/esql" xlink:role="dynamic">
- Simple ESQL example.
- </sample>
- <sample name="Session XSP" href="session" xlink:role="dynamic">
- Sample Session XSP to illustrate session handling.
- </sample>
- <sample name="File Uploads" href="xsp/upload" xlink:role="dynamic">
- Sample to illustrate file uploads.
- </sample>
- </group>
-
<group name="XScript and SOAP">
<sample name="Simple Sample" href="xscript/simple">
An simple sample for XScript.
@@ -100,6 +71,17 @@
-->
</group>
+ <group name="Database Access">
+ <sample name="Simple SQL" href="sql/sql-page" xlink:role="dynamic">
+ Simple SQL example. You should make sure that you have a database and
+ table according to the conf/sitemap.xmap and the
+ docs/samples/sql/sql-page.xml.sql definitions.
+ </sample>
+ <sample name="ESQL" href="xsp/esql" xlink:role="dynamic">
+ Simple example of the ESQL logicsheet.
+ </sample>
+ </group>
+
<group name="Aggregation Sample">
<sample name="Slashdot" href="news/slashdot.xml">
Live XML Feed from Slashdot.
@@ -111,7 +93,12 @@
Live Channel Feed from XMLHack.com.
</sample>
<sample name="Aggregation" href="news/aggregate.xml">
- Single Web Page with News from all sources above.
+ Single Web Page with News from all sources above aggregated by
+ the sitemap.
+ </sample>
+ <sample name="Aggregation" href="news/aggregate">
+ Single Web Page with News from all sources above aggregated by
+ include transformer.
</sample>
</group>
</samples>
1.3 +2 -0 xml-cocoon2/src/webapp/docs/samples/sample-static.xml
Index: sample-static.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/sample-static.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sample-static.xml 30 Jan 2002 22:34:13 -0000 1.2
+++ sample-static.xml 9 Feb 2002 06:21:57 -0000 1.3
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- CVS: $Id: sample-static.xml,v 1.3 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
<group name="Back">
1.8 +25 -19 xml-cocoon2/src/webapp/docs/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/samples.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- samples.xml 22 Jan 2002 20:55:21 -0000 1.7
+++ samples.xml 9 Feb 2002 06:21:57 -0000 1.8
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- CVS: $Id: samples.xml,v 1.8 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
<group name="Multimedia Hello World">
@@ -24,13 +26,35 @@
</sample>
</group>
+ <group name="Documentation">
+ <sample name="Docs" href="documents/index">
+ The Cocoon documentation.
+ </sample>
+ <sample name="Tutorial" href="tutorial/home.html">
+ A tutorial on Cocoon.
+ </sample>
+ <sample name="List of docs" href="documents/doclist.html">
+ Generated list of all documentation (aggregates each book.xml)
+ </sample>
+ <sample name="Slides" href="slides/slides">
+ Presentation of Cocoon 1 shown at ApacheCon 2000. (Example of complex XSLT
usage)
+ </sample>
+ <sample name="Search the docs" href="search/welcome">
+ Search into the cocoon documentation using Apache Lucene.
+ </sample>
+ </group>
+
<group name="More Samples">
<sample name="Static Content" href="sample-static">
How to produce different type of static content.
</sample>
+ <sample name="Server Pages" href="sample-xsp">
+ Dynamic content implemented in XSP pages.
+ </sample>
+
<sample name="Dynamic Content" href="sample-dynamic">
- XSP pages with Cocoon, and other ways of implementing dynamic content.
+ More ways of implementing dynamic content.
</sample>
<sample name="Sources" href="sub/">
@@ -41,24 +65,6 @@
<sample name="Web Applications" href="sample-apps">
Samples showing how to perform form processing, state management,
and simple web-application with login and protected resources.
- </sample>
- </group>
-
- <group name="Documentation">
- <sample name="Docs" href="documents/index">
- The Cocoon documentation.
- </sample>
- <sample name="Tutorial" href="tutorial/home.html">
- A tutorial on Cocoon.
- </sample>
- <sample name="List of docs" href="documents/doclist.html">
- Generated list of all documentation (aggregates each book.xml)
- </sample>
- <sample name="Slides" href="slides/slides">
- Presentation of Cocoon 1 shown at ApacheCon 2000. (Example of complex XSLT
usage)
- </sample>
- <sample name="Search the docs" href="search/welcome">
- Search into the cocoon documentation using Apache Lucene.
</sample>
</group>
1.1 xml-cocoon2/src/webapp/docs/samples/sample-xsp.xml
Index: sample-xsp.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- CVS: $Id: sample-xsp.xml,v 1.1 2002/02/09 06:21:57 vgritsenko Exp $ -->
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
<group name="Back">
<sample name="Back" href="welcome">
Back to samples home page.
</sample>
</group>
<group name="Hello, XSP">
<sample name="Hello Page" href="xsp/hello">
Dynamically generated hello page.
</sample>
<sample name="Logicsheet" href="xsp/logicsheet">
Greetings page with logic separated into logicsheet.
</sample>
<sample name="Cacheable" href="xsp/cacheable">
Cacheable XSP page.
</sample>
</group>
<group name="Java Server Pages">
<note>
Note: Depending on your servlet engine, this example might not work directly.
For more information on how to configure the JSP components please refer to the
documentation.
</note>
<sample name="JSP Generator" href="jsp/hello">
An example of the JSPGenerator producing XML out of using JSP.
</sample>
<sample name="JSP Reader" href="jsp/welcome.htm">
An example of the JSPReader producing HTML out of using JSP.
</sample>
</group>
<group name="eXtensible Server Pages in Java">
<sample name="Simple XSP" href="xsp/simple">
Simple XSP example showing usage of several logicsheets.
</sample>
<sample name="ESQL" href="xsp/esql" xlink:role="dynamic">
Simple example of the ESQL logicsheet.
</sample>
<sample name="Session XSP" href="xsp/session" xlink:role="dynamic">
Sample Session XSP to illustrate session handling.
</sample>
<sample name="File Uploads" href="xsp/upload" xlink:role="dynamic">
Sample to illustrate file uploads.
</sample>
<sample name="Request" href="xsp/request" xlink:role="dynamic">
Request logicsheet tests.
</sample>
<sample name="Cookie" href="xsp/cookie" xlink:role="dynamic">
Cookies logicsheet tests.
</sample>
</group>
<group name="eXtensible Server Pages in Javascript">
<sample name="Hello" href="xsp-js/hello">
Hello in Javascript
</sample>
<sample name="Request" href="xsp-js/request" xlink:role="dynamic">
Request logicsheet tests - same as before, but translated into Javascript.
</sample>
<sample name="Simple" href="xsp-js/simple" xlink:role="dynamic">
Another simple XSP example.
</sample>
</group>
</samples>
1.4 +21 -9 xml-cocoon2/src/webapp/docs/samples/xsp/aggregate.xsp
Index: aggregate.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/aggregate.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aggregate.xsp 2 Feb 2002 04:13:11 -0000 1.3
+++ aggregate.xsp 9 Feb 2002 06:21:57 -0000 1.4
@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- CVS: $Id: aggregate.xsp,v 1.3 2002/02/02 04:13:11 vgritsenko Exp $ -->
+<!-- CVS: $Id: aggregate.xsp,v 1.4 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
+<xsp:page language="java"
+ xmlns:xsp="http://apache.org/xsp";
+ xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
-<xsp:page
- language="java"
- xmlns:xsp="http://apache.org/xsp";
- xmlns:cinclude="http://apache.org/cocoon/include/1.0";
->
<xsp:logic>
/**
+ * Generate the unique key.
+ * This key must be unique inside the space of this XSP page.
+ * This method will be invoked before the generateValidity() method.
+ *
+ * @return The generated key or 0 if the component
+ * is currently not cacheable.
+ */
+ public long generateKey()
+ {
+ return 1;
+ }
+
+ /**
* Generate the validity object.
*
* @return The generated validity object or <code>null</code> if the
@@ -22,13 +34,13 @@
<title>A Simple XSP Page using Content Aggregation</title>
<content>
<para>
- <cinclude:include src="news/slashdot.xml" element="slashdot"
ns="http://foo.bar.com/slashdot"/>
+ <cinclude:include src="cocoon:/news/slashdot.xml"
element="slashdot" ns="http://foo.bar.com/slashdot"/>
</para>
<para>
- <cinclude:include src="news/moreover.xml" element="moreover"
ns="http://foo.bar.com/moreover"/>
+ <cinclude:include src="cocoon:/news/moreover.xml"
element="moreover" ns="http://foo.bar.com/moreover"/>
</para>
<para>
- <cinclude:include src="news/news.xml" element="isyndicate"
ns="http://foo.bar.com/isyndicate"/>
+ <cinclude:include src="cocoon:/news/xmlhack.xml"
element="isyndicate" ns="http://foo.bar.com/xmlhack"/>
</para>
<para>Brought to you by Cocoon at <xsp:expr>new
Date()</xsp:expr>.</para>
</content>
1.5 +2 -0 xml-cocoon2/src/webapp/docs/samples/xsp/cacheable.xsp
Index: cacheable.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/cacheable.xsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cacheable.xsp 7 Feb 2002 03:49:51 -0000 1.4
+++ cacheable.xsp 9 Feb 2002 06:21:57 -0000 1.5
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: cacheable.xsp,v 1.5 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";>
1.3 +2 -0 xml-cocoon2/src/webapp/docs/samples/xsp/cookie.xsp
Index: cookie.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/cookie.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cookie.xsp 7 Feb 2002 03:49:51 -0000 1.2
+++ cookie.xsp 9 Feb 2002 06:21:57 -0000 1.3
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: cookie.xsp,v 1.3 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-cookie="http://apache.org/xsp/cookie/2.0";
1.4 +4 -5 xml-cocoon2/src/webapp/docs/samples/xsp/esql.xsp
Index: esql.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/esql.xsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esql.xsp 24 Jan 2002 12:12:41 -0000 1.3
+++ esql.xsp 9 Feb 2002 06:21:57 -0000 1.4
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsp:page
- language="java"
+<!-- CVS: $Id: esql.xsp,v 1.4 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
+<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
- xmlns:esql="http://apache.org/cocoon/SQL/v2";
->
+ xmlns:esql="http://apache.org/cocoon/SQL/v2";>
<page>
-
<title>A Database Driven XSP Page</title>
<content>
1.3 +16 -9 xml-cocoon2/src/webapp/docs/samples/xsp/logicsheet.xsp
Index: logicsheet.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/logicsheet.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logicsheet.xsp 9 Feb 2002 04:16:39 -0000 1.2
+++ logicsheet.xsp 9 Feb 2002 06:21:57 -0000 1.3
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: logicsheet.xsp,v 1.3 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
<!-- XSP can be assotiated with the logicsheet using processing
instruction xml-logicsheet or the xsp:logicsheet element.
Do not use both methods!
@@ -28,16 +30,21 @@
<xsp:logic>
String name = <xsp-request:get-parameter name="name"/>;
if (name == null) {
- <xsp-hello:greeting name="Unknown"/>
- <form action="logicsheet">
- Please enter your name: <input name="name"/> <input type="submit"/>
- </form>
+ <para>
+ <!-- Print default greeting -->
+ <xsp-hello:greeting name="Unknown"/>
+ <form action="logicsheet">
+ Please enter your name: <input name="name"/> <input type="submit"/>
+ </form>
+ </para>
} else {
- <b>
- <xsp-hello:greeting value="Welcome to this small logicsheet sample">
- <xsp-hello:name><xsp:expr>name</xsp:expr></xsp-hello:name>
- </xsp-hello:greeting>
- </b>
+ <para>
+ <!-- Override default greeting -->
+ <xsp-hello:greeting value="Welcome to this small logicsheet sample">
+ <!-- Alternate way of specifying name attribute -->
+ <xsp-hello:name><xsp:expr>name</xsp:expr></xsp-hello:name>
+ </xsp-hello:greeting>
+ </para>
<para>
This greeting above was created using simple logicsheet.
1.3 +4 -4 xml-cocoon2/src/webapp/docs/samples/xsp/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/simple.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.xsp 24 Jan 2002 08:55:00 -0000 1.2
+++ simple.xsp 9 Feb 2002 06:21:57 -0000 1.3
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsp:page
- language="java"
+<!-- CVS: $Id: simple.xsp,v 1.3 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
+<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";
xmlns:log="http://apache.org/xsp/log/2.0";
- xmlns:capture="http://apache.org/cocoon/capture/1.0";
->
+ xmlns:capture="http://apache.org/cocoon/capture/1.0";>
<page>
<log:logger name="xsp-sample" filename="xsp-sample.log"/>
1.3 +5 -4 xml-cocoon2/src/webapp/docs/samples/xsp/upload.xsp
Index: upload.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp/upload.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- upload.xsp 24 Jan 2002 08:55:00 -0000 1.2
+++ upload.xsp 9 Feb 2002 06:21:57 -0000 1.3
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsp:page
- language="java"
+<!-- CVS: $Id: upload.xsp,v 1.3 2002/02/09 06:21:57 vgritsenko Exp $ -->
+
+<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";
xmlns:xsp-response="http://apache.org/xsp/response/2.0";
- xmlns:log="http://apache.org/xsp/log/2.0";
->
+ xmlns:log="http://apache.org/xsp/log/2.0";>
+
<xsp:structure>
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
<xsp:include>org.apache.avalon.framework.context.ContextException</xsp:include>
1.1 xml-cocoon2/src/webapp/docs/samples/xsp/hello.xsp
Index: hello.xsp
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- CVS: $Id: hello.xsp,v 1.1 2002/02/09 06:21:57 vgritsenko Exp $ -->
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";>
<page>
<title>Hello</title>
<content>
<para>This is my first Cocoon page!</para>
<xsp:element name="para">
With the help of XSP and
<xsp:expr>Constants.COMPLETE_NAME</xsp:expr>
</xsp:element>
</content>
</page>
</xsp:page>
1.1 xml-cocoon2/src/webapp/docs/samples/xsp/request.xsp
Index: request.xsp
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- CVS: $Id: request.xsp,v 1.1 2002/02/09 06:21:57 vgritsenko Exp $ -->
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";>
<page>
<xsp-request:set-attribute name="attr">Test Attribute
Value</xsp-request:set-attribute>
<h1>xsp-request logicsheet output</h1>
<table border="1">
<tr>
<th>Logicsheet tag</th><th>Output</th><th>Java method</th><th>Output</th></tr>
<tr>
<td>get-uri</td><td><xsp-request:get-uri/></td>
<td>getRequestURI</td><td><xsp:expr>request.getRequestURI()</xsp:expr></td>
</tr>
<tr>
<td>get-sitemap-uri</td><td><xsp-request:get-sitemap-uri/></td>
</tr>
<tr>
<td>get-scheme</td><td><xsp-request:get-scheme/></td>
<td>getScheme</td><td><xsp:expr>request.getScheme()</xsp:expr></td>
</tr>
<tr>
<td>get-character-encoding</td><td><xsp-request:get-character-encoding/></td>
<td>getCharacterEncoding</td><td><xsp:expr>request.getCharacterEncoding()</xsp:expr></td>
</tr>
<tr>
<td>get-content-length</td><td><xsp-request:get-content-length/></td>
<td>getContentLength</td><td><xsp:expr>request.getContentLength()</xsp:expr></td>
</tr>
<tr>
<td>get-content-type</td><td><xsp-request:get-content-type/></td>
<td>getContentType</td><td><xsp:expr>request.getContentType()</xsp:expr></td>
</tr>
<tr>
<td>get-locale</td><td><xsp-request:get-locale/></td>
<td>getLocale</td><td><xsp:expr>request.getLocale()</xsp:expr></td>
</tr>
<tr>
<td>get-locales</td><td><xsp:expr>String.valueOf(<xsp-request:get-locales
as="array"/>)</xsp:expr></td>
<td>getLocales</td><td><xsp:expr>String.valueOf(request.getLocales())</xsp:expr></td>
</tr>
<tr>
<td>get-parameter</td><td><xsp-request:get-parameter name="param"/></td>
<td>getParameter</td><td><xsp:expr>request.getParameter("param")</xsp:expr></td>
</tr>
<tr>
<td>get-parameter with default </td><td><xsp-request:get-parameter name="param"
default="default"/></td>
</tr>
<tr>
<td>get-parameter-values (as
array)</td><td><xsp:expr>String.valueOf(<xsp-request:get-parameter-values name="param"
as="array"/>)</xsp:expr></td>
<td>getParameterValues</td><td><xsp:expr>String.valueOf(request.getParameterValues("param"))</xsp:expr></td>
</tr>
<tr>
<td>get-parameter-names (as
array)</td><td><xsp:expr>String.valueOf(<xsp-request:get-parameter-names
as="array"/>)</xsp:expr></td>
<td>getParameterNames</td><td><xsp:expr>String.valueOf(request.getParameterNames())</xsp:expr></td>
</tr>
<tr>
<td>get-header accept</td><td><xsp-request:get-header name="accept"/></td>
<td>getHeader</td><td><xsp:expr>request.getHeader("accept")</xsp:expr></td>
</tr>
<tr>
<td>get-header user-agent</td><td><xsp-request:get-header name="user-agent"/></td>
<td>getHeader</td><td><xsp:expr>request.getHeader("user-agent")</xsp:expr></td>
</tr>
<!--
get-int-header
get-date-header
-->
<tr>
<td>get-headers accept-language (as
array)</td><td><xsp:expr>String.valueOf(<xsp-request:get-headers
name="accept-language" as="array"/>)</xsp:expr></td>
<td>getHeaders</td><td><xsp:expr>request.getHeaders("accept-language")</xsp:expr></td>
</tr>
<tr>
<td>get-header-names (as
array)</td><td><xsp:expr>String.valueOf(<xsp-request:get-header-names
as="array"/>)</xsp:expr></td>
<td>getHeaderNames</td><td><xsp:expr>String.valueOf(request.getHeaderNames())</xsp:expr></td>
</tr>
<tr>
<td>get-attribute attr</td><td><xsp-request:get-attribute name="attr"/></td>
<td>getAttribute</td><td><xsp:expr>request.getAttribute("attr")</xsp:expr></td>
</tr>
<tr>
<td>get-attribute-names (as
array)</td><td><xsp:expr>String.valueOf(<xsp-request:get-attribute-names
as="array"/>)</xsp:expr></td>
<td>getAttributeNames</td><td><xsp:expr>String.valueOf(request.getAttributeNames())</xsp:expr></td>
</tr>
<tr>
<td>get-requested-url</td><td><xsp-request:get-requested-url/></td>
</tr>
<tr>
<td>get-remote-address</td><td><xsp-request:get-remote-address/></td>
<td>getRemoteAddr</td><td><xsp:expr>request.getRemoteAddr()</xsp:expr></td>
</tr>
<tr>
<td>get-remote-user</td><td><xsp-request:get-remote-user/></td>
<td>getRemoteUser</td><td><xsp:expr>request.getRemoteUser()</xsp:expr></td>
</tr>
<tr>
<td>get-context-path</td><td><xsp-request:get-context-path/></td>
<td>getContextPath</td><td><xsp:expr>request.getContextPath()</xsp:expr></td>
</tr>
<tr>
<td>get-path-info</td><td><xsp-request:get-path-info/></td>
<td>getPathInfo</td><td><xsp:expr>request.getPathInfo()</xsp:expr></td>
</tr>
<tr>
<td>get-server-name</td><td><xsp-request:get-server-name/></td>
<td>getServerName</td><td><xsp:expr>request.getServerName()</xsp:expr></td>
</tr>
<tr>
<td>get-server-port</td><td><xsp-request:get-server-port/></td>
<td>getServerPort</td><td><xsp:expr>request.getServerPort()</xsp:expr></td>
</tr>
<tr>
<td>get-method</td><td><xsp-request:get-method/></td>
<td>getMethod</td><td><xsp:expr>request.getMethod()</xsp:expr></td>
</tr>
<tr>
<td>get-query-string</td><td><xsp-request:get-query-string/></td>
<td>getQueryString</td><td><xsp:expr>request.getQueryString()</xsp:expr></td>
</tr>
<tr>
<td>get-protocol</td><td><xsp-request:get-protocol/></td>
<td>getProtocol</td><td><xsp:expr>request.getProtocol()</xsp:expr></td>
</tr>
<tr>
<td>get-remote-host</td><td><xsp-request:get-remote-host/></td>
<td>getRemoteHost</td><td><xsp:expr>request.getRemoteHost()</xsp:expr></td>
</tr>
<tr>
<td>is-secure</td><td><xsp-request:is-secure/></td>
<td>isSecure</td><td><xsp:expr>request.isSecure()</xsp:expr></td>
</tr>
<tr>
<td>get-servlet-path</td><td><xsp-request:get-servlet-path/></td>
<td>getServletPath</td><td><xsp:expr>request.getServletPath()</xsp:expr></td>
</tr>
<tr>
<td>get-user-principal</td><td><xsp-request:get-user-principal/></td>
<td>getUserPrincipal</td><td><xsp:expr>request.getUserPrincipal()</xsp:expr></td>
</tr>
<tr>
<td>get-auth-type</td><td><xsp-request:get-auth-type/></td>
<td>getAuthType</td><td><xsp:expr>request.getAuthType()</xsp:expr></td>
</tr>
<tr>
<td>is-user-in-role</td><td><xsp-request:is-user-in-role role="admin"/></td>
<td>isUserInRole</td><td><xsp:expr>request.isUserInRole("admin")</xsp:expr></td>
</tr>
<tr>
<td>get-requested-session-id</td><td><xsp-request:get-requested-session-id/></td>
<td>getRequestedSessionId</td><td><xsp:expr>request.getRequestedSessionId()</xsp:expr></td>
</tr>
</table>
<h1>xsp-request logicsheet output (as xml)</h1>
<textarea cols="100" rows="30">
get-uri <xsp-request:get-uri as="xml"/>
get-sitemap-uri <xsp-request:get-sitemap-uri as="xml"/>
get-scheme <xsp-request:get-scheme as="xml"/>
get-character-encoding <xsp-request:get-character-encoding as="xml"/>
get-content-length <xsp-request:get-content-length as="xml"/>
get-content-type <xsp-request:get-content-type as="xml"/>
get-locale <xsp-request:get-locale as="xml"/>
get-locales <xsp-request:get-locales as="xml"/>
get-parameter <xsp-request:get-parameter name="param" as="xml"/>
get-parameter with default <xsp-request:get-parameter name="param"
default="default" as="xml"/>
get-parameter-values <xsp-request:get-parameter-values name="param" as="xml"/>
get-parameter-names <xsp-request:get-parameter-names as="xml"/>
get-header accept <xsp-request:get-header name="accept" as="xml"/>
get-header user-agent <xsp-request:get-header name="user-agent" as="xml"/>
get-header-names <xsp-request:get-header-names as="xml"/>
get-int-header - no sample
get-date-header - no sample
get-headers - no sample
get-headers <xsp-request:get-headers name="accept-language"
as="xml"/>
get-attribute attr <xsp-request:get-attribute name="attr" as="xml"/>
get-attribute-names <xsp-request:get-attribute-names as="xml"/>
get-requested-url <xsp-request:get-requested-url as="xml"/>
get-remote-address <xsp-request:get-remote-address as="xml"/>
get-remote-user <xsp-request:get-remote-user as="xml"/>
get-context-path <xsp-request:get-context-path as="xml"/>
get-path-info <xsp-request:get-path-info as="xml"/>
get-server-name <xsp-request:get-server-name as="xml"/>
get-server-port <xsp-request:get-server-port as="xml"/>
get-method <xsp-request:get-method as="xml"/>
get-query-string <xsp-request:get-query-string as="xml"/>
get-protocol <xsp-request:get-protocol as="xml"/>
get-remote-host <xsp-request:get-remote-host as="xml"/>
is-secure <xsp-request:is-secure as="xml"/>
get-servlet-path <xsp-request:get-servlet-path as="xml"/>
get-user-principal <xsp-request:get-user-principal as="xml"/>
get-auth-type <xsp-request:get-auth-type as="xml"/>
is-user-in-role <xsp-request:is-user-in-role role="admin" as="xml"/>
get-requested-session-id <xsp-request:get-requested-session-id as="xml"/>
</textarea>
<xsp-request:remove-attribute name="attr"/>
<h2>Links</h2>
<a href="request-test?param=value&a=b&x=y">Get</a>
<br/>
<form method="post" action="request-test">
<input name="param"/>
<input type="submit" value="Post"/>
</form>
</page>
</xsp:page>
1.1 xml-cocoon2/src/webapp/docs/samples/xsp/session.xsp
Index: session.xsp
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- CVS: $Id: session.xsp,v 1.1 2002/02/09 06:21:57 vgritsenko Exp $ -->
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:session="http://apache.org/xsp/session/2.0";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";
>
<!-- a simple session page by Jörg Prante <[EMAIL PROTECTED]> -->
<page>
<title>A Simple URI-based Session Example</title>
<content>
<para> <xsp-request:get-uri as="xml"/> </para>
<para> Session ID = <session:get-id as="xml"/> </para>
<para>
Encode URL Test =
<session:encode-url href="sessionpage.xsp">Follow me!</session:encode-url>
</para>
<para>Session parameter "my-param" is <session:get-attribute name="my-param"
default="not set"/></para>
<!-- set my-param for future visits to page -->
<session:set-attribute
name="my-param"><xsp:expr>set</xsp:expr></session:set-attribute>
</content>
</page>
</xsp:page>
1.2 +24 -2 xml-cocoon2/src/webapp/docs/samples/xsp-js/hello.xsp
Index: hello.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp-js/hello.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hello.xsp 9 Feb 2002 04:16:39 -0000 1.1
+++ hello.xsp 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,10 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: hello.xsp,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsp:page language="javascript" xmlns:xsp="http://apache.org/xsp";>
<page>
- <title>A Simple XSP Page</title>
+ <title>Hello</title>
<content>
- <para>Hi there! I'm a simple dynamic page generated by XSP (eXtensible Server
Pages).</para>
+ <para>This is my first Cocoon page!</para>
+
+ <xsp:element name="para">
+ With the help of XSP and Javascript!
+ </xsp:element>
+
+ <para>
+ <xsp:logic>
+ align = "center";
+ </xsp:logic>
+ <p>
+ <xsp:attribute name="align"><xsp:expr>align</xsp:expr></xsp:attribute>
+
+ <xsp:logic>
+ msg = "Executed at: ";
+ <xsp:content>
+ <xsp:expr>msg + new Date()</xsp:expr>
+ </xsp:content>
+ </xsp:logic>
+ </p>
+ </para>
</content>
</page>
</xsp:page>
1.2 +3 -1 xml-cocoon2/src/webapp/docs/samples/xsp-js/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/xsp-js/simple.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple.xsp 9 Feb 2002 04:16:39 -0000 1.1
+++ simple.xsp 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: simple.xsp,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsp:page language="javascript" xmlns:xsp="http://apache.org/xsp";>
<page>
- <title>A Simple XSP Page</title>
+ <title>A Simple XSP Page in Javascript</title>
<content>
<para>Hi there! I'm a simple dynamic page generated by XSP (eXtensible Server
Pages).</para>
<para>
1.1 xml-cocoon2/src/webapp/docs/samples/xsp-js/request.xsp
Index: request.xsp
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- CVS: $Id: request.xsp,v 1.1 2002/02/09 06:21:58 vgritsenko Exp $ -->
<xsp:page language="jsxsp"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";>
<page>
<xsp-request:set-attribute name="attr">Test Attribute
Value</xsp-request:set-attribute>
<h1>xsp-request logicsheet output</h1>
<table border="1">
<tr>
<th>Logicsheet tag</th><th>Output</th><th>Java method</th><th>Output</th></tr>
<tr>
<td>get-uri</td><td><xsp-request:get-uri/></td>
<td>getRequestURI</td><td><xsp:expr>request.getRequestURI()</xsp:expr></td>
</tr>
<tr>
<td>get-sitemap-uri</td><td><xsp-request:get-sitemap-uri/></td>
</tr>
<tr>
<td>get-scheme</td><td><xsp-request:get-scheme/></td>
<td>getScheme</td><td><xsp:expr>request.getScheme()</xsp:expr></td>
</tr>
<tr>
<td>get-character-encoding</td><td><xsp-request:get-character-encoding/></td>
<td>getCharacterEncoding</td><td><xsp:expr>request.getCharacterEncoding()</xsp:expr></td>
</tr>
<tr>
<td>get-content-length</td><td><xsp-request:get-content-length/></td>
<td>getContentLength</td><td><xsp:expr>request.getContentLength()</xsp:expr></td>
</tr>
<tr>
<td>get-content-type</td><td><xsp-request:get-content-type/></td>
<td>getContentType</td><td><xsp:expr>request.getContentType()</xsp:expr></td>
</tr>
<tr>
<td>get-locale</td><td><xsp-request:get-locale/></td>
<td>getLocale</td><td><xsp:expr>request.getLocale()</xsp:expr></td>
</tr>
<tr>
<td>get-locales</td><td><xsp:expr>String(<xsp-request:get-locales
as="array"/>)</xsp:expr></td>
<td>getLocales</td><td><xsp:expr>String(request.getLocales())</xsp:expr></td>
</tr>
<tr>
<td>get-parameter</td><td><xsp-request:get-parameter name="param"/></td>
<td>getParameter</td><td><xsp:expr>request.getParameter("param")</xsp:expr></td>
</tr>
<tr>
<td>get-parameter with default </td><td><xsp-request:get-parameter name="param"
default="default"/></td>
</tr>
<tr>
<td>get-parameter-values (as
array)</td><td><xsp:expr>String(<xsp-request:get-parameter-values name="param"
as="array"/>)</xsp:expr></td>
<td>getParameterValues</td><td><xsp:expr>String(request.getParameterValues("param"))</xsp:expr></td>
</tr>
<tr>
<td>get-parameter-names (as
array)</td><td><xsp:expr>String(<xsp-request:get-parameter-names
as="array"/>)</xsp:expr></td>
<td>getParameterNames</td><td><xsp:expr>String(request.getParameterNames())</xsp:expr></td>
</tr>
<tr>
<td>get-header accept</td><td><xsp-request:get-header name="accept"/></td>
<td>getHeader</td><td><xsp:expr>request.getHeader("accept")</xsp:expr></td>
</tr>
<tr>
<td>get-header user-agent</td><td><xsp-request:get-header name="user-agent"/></td>
<td>getHeader</td><td><xsp:expr>request.getHeader("user-agent")</xsp:expr></td>
</tr>
<!--
get-int-header
get-date-header
-->
<tr>
<td>get-headers accept-language (as
array)</td><td><xsp:expr>String(<xsp-request:get-headers name="accept-language"
as="array"/>)</xsp:expr></td>
<td>getHeaders</td><td><xsp:expr>request.getHeaders("accept-language")</xsp:expr></td>
</tr>
<tr>
<td>get-header-names (as
array)</td><td><xsp:expr>String(<xsp-request:get-header-names
as="array"/>)</xsp:expr></td>
<td>getHeaderNames</td><td><xsp:expr>String(request.getHeaderNames())</xsp:expr></td>
</tr>
<tr>
<td>get-attribute attr</td><td><xsp-request:get-attribute name="attr"/></td>
<td>getAttribute</td><td><xsp:expr>request.getAttribute("attr")</xsp:expr></td>
</tr>
<tr>
<td>get-attribute-names (as
array)</td><td><xsp:expr>String(<xsp-request:get-attribute-names
as="array"/>)</xsp:expr></td>
<td>getAttributeNames</td><td><xsp:expr>String(request.getAttributeNames())</xsp:expr></td>
</tr>
<tr>
<td>get-requested-url</td><td><xsp-request:get-requested-url/></td>
</tr>
<tr>
<td>get-remote-address</td><td><xsp-request:get-remote-address/></td>
<td>getRemoteAddr</td><td><xsp:expr>request.getRemoteAddr()</xsp:expr></td>
</tr>
<tr>
<td>get-remote-user</td><td><xsp-request:get-remote-user/></td>
<td>getRemoteUser</td><td><xsp:expr>request.getRemoteUser()</xsp:expr></td>
</tr>
<tr>
<td>get-context-path</td><td><xsp-request:get-context-path/></td>
<td>getContextPath</td><td><xsp:expr>request.getContextPath()</xsp:expr></td>
</tr>
<tr>
<td>get-path-info</td><td><xsp-request:get-path-info/></td>
<td>getPathInfo</td><td><xsp:expr>request.getPathInfo()</xsp:expr></td>
</tr>
<tr>
<td>get-server-name</td><td><xsp-request:get-server-name/></td>
<td>getServerName</td><td><xsp:expr>request.getServerName()</xsp:expr></td>
</tr>
<tr>
<td>get-server-port</td><td><xsp-request:get-server-port/></td>
<td>getServerPort</td><td><xsp:expr>request.getServerPort()</xsp:expr></td>
</tr>
<tr>
<td>get-method</td><td><xsp-request:get-method/></td>
<td>getMethod</td><td><xsp:expr>request.getMethod()</xsp:expr></td>
</tr>
<tr>
<td>get-query-string</td><td><xsp-request:get-query-string/></td>
<td>getQueryString</td><td><xsp:expr>request.getQueryString()</xsp:expr></td>
</tr>
<tr>
<td>get-protocol</td><td><xsp-request:get-protocol/></td>
<td>getProtocol</td><td><xsp:expr>request.getProtocol()</xsp:expr></td>
</tr>
<tr>
<td>get-remote-host</td><td><xsp-request:get-remote-host/></td>
<td>getRemoteHost</td><td><xsp:expr>request.getRemoteHost()</xsp:expr></td>
</tr>
<tr>
<td>is-secure</td><td><xsp-request:is-secure/></td>
<td>isSecure</td><td><xsp:expr>request.isSecure()</xsp:expr></td>
</tr>
<tr>
<td>get-servlet-path</td><td><xsp-request:get-servlet-path/></td>
<td>getServletPath</td><td><xsp:expr>request.getServletPath()</xsp:expr></td>
</tr>
<tr>
<td>get-user-principal</td><td><xsp-request:get-user-principal/></td>
<td>getUserPrincipal</td><td><xsp:expr>request.getUserPrincipal()</xsp:expr></td>
</tr>
<tr>
<td>get-auth-type</td><td><xsp-request:get-auth-type/></td>
<td>getAuthType</td><td><xsp:expr>request.getAuthType()</xsp:expr></td>
</tr>
<tr>
<td>is-user-in-role</td><td><xsp-request:is-user-in-role role="admin"/></td>
<td>isUserInRole</td><td><xsp:expr>request.isUserInRole("admin")</xsp:expr></td>
</tr>
<tr>
<td>get-requested-session-id</td><td><xsp-request:get-requested-session-id/></td>
<td>getRequestedSessionId</td><td><xsp:expr>request.getRequestedSessionId()</xsp:expr></td>
</tr>
</table>
<h1>xsp-request logicsheet output (as xml)</h1>
<textarea cols="100" rows="30">
get-uri <xsp-request:get-uri as="xml"/>
get-sitemap-uri <xsp-request:get-sitemap-uri as="xml"/>
get-scheme <xsp-request:get-scheme as="xml"/>
get-character-encoding <xsp-request:get-character-encoding as="xml"/>
get-content-length <xsp-request:get-content-length as="xml"/>
get-content-type <xsp-request:get-content-type as="xml"/>
get-locale <xsp-request:get-locale as="xml"/>
get-locales <xsp-request:get-locales as="xml"/>
get-parameter <xsp-request:get-parameter name="param" as="xml"/>
get-parameter with default <xsp-request:get-parameter name="param"
default="default" as="xml"/>
get-parameter-values <xsp-request:get-parameter-values name="param" as="xml"/>
get-parameter-names <xsp-request:get-parameter-names as="xml"/>
get-header accept <xsp-request:get-header name="accept" as="xml"/>
get-header user-agent <xsp-request:get-header name="user-agent" as="xml"/>
get-header-names <xsp-request:get-header-names as="xml"/>
get-int-header - no sample
get-date-header - no sample
get-headers - no sample
get-headers <xsp-request:get-headers name="accept-language"
as="xml"/>
get-attribute attr <xsp-request:get-attribute name="attr" as="xml"/>
get-attribute-names <xsp-request:get-attribute-names as="xml"/>
get-requested-url <xsp-request:get-requested-url as="xml"/>
get-remote-address <xsp-request:get-remote-address as="xml"/>
get-remote-user <xsp-request:get-remote-user as="xml"/>
get-context-path <xsp-request:get-context-path as="xml"/>
get-path-info <xsp-request:get-path-info as="xml"/>
get-server-name <xsp-request:get-server-name as="xml"/>
get-server-port <xsp-request:get-server-port as="xml"/>
get-method <xsp-request:get-method as="xml"/>
get-query-string <xsp-request:get-query-string as="xml"/>
get-protocol <xsp-request:get-protocol as="xml"/>
get-remote-host <xsp-request:get-remote-host as="xml"/>
is-secure <xsp-request:is-secure as="xml"/>
get-servlet-path <xsp-request:get-servlet-path as="xml"/>
get-user-principal <xsp-request:get-user-principal as="xml"/>
get-auth-type <xsp-request:get-auth-type as="xml"/>
is-user-in-role <xsp-request:is-user-in-role role="admin" as="xml"/>
get-requested-session-id <xsp-request:get-requested-session-id as="xml"/>
</textarea>
<xsp-request:remove-attribute name="attr"/>
<h2>Links</h2>
<a href="request-test?param=value&a=b&x=y">Get</a>
<br/>
<form method="post" action="request-test">
<input name="param"/>
<input type="submit" value="Post"/>
</form>
</page>
</xsp:page>
1.7 +11 -1 xml-cocoon2/src/webapp/stylesheets/simple-samples2html.xsl
Index: simple-samples2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/stylesheets/simple-samples2html.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- simple-samples2html.xsl 2 Feb 2002 03:21:04 -0000 1.6
+++ simple-samples2html.xsl 9 Feb 2002 06:21:58 -0000 1.7
@@ -20,7 +20,7 @@
</tr>
</table>
- <xsl:apply-templates/>
+ <xsl:apply-templates select="samples"/>
<p align="center">
<font size="-1">
@@ -171,4 +171,14 @@
</tr>
</xsl:template>
+ <xsl:template match="note">
+ <tr>
+ <td width="100%" bgcolor="#ffffff" align="left">
+ <font size="+0" face="arial,helvetica,sanserif" color="#000000">
+ <xsl:value-of select="."/>
+ </font>
+ </td>
+ </tr>
+ </xsl:template>
+
</xsl:stylesheet>
1.2 +2 -0 xml-cocoon2/src/webapp/sub/docs/dynamic.xsp
Index: dynamic.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/docs/dynamic.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dynamic.xsp 22 Jan 2002 20:53:22 -0000 1.1
+++ dynamic.xsp 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: dynamic.xsp,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:an-xsp="urn:xsp"
1.2 +2 -0 xml-cocoon2/src/webapp/sub/docs/error-giving-page.xml
Index: error-giving-page.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/docs/error-giving-page.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error-giving-page.xml 3 Jan 2002 12:31:47 -0000 1.1
+++ error-giving-page.xml 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: error-giving-page.xml,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<!DOCTYPE page [
<!ELEMENT page (title?, content)>
<!ELEMENT title (#PCDATA)>
1.5 +5 -4 xml-cocoon2/src/webapp/sub/docs/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/docs/samples.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- samples.xml 26 Jan 2002 00:43:18 -0000 1.4
+++ samples.xml 9 Feb 2002 06:21:58 -0000 1.5
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- CVS: $Id: samples.xml,v 1.5 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
<group name="This page is served by sub-sitemap!">
@@ -31,11 +33,10 @@
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>
-<!-- FIXME
+
<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">
@@ -60,7 +61,7 @@
XSL is dynamically generated and obtained as Cocoon source
cocoon:/xsl-dynamic-source.
</sample>
</group>
-<!-- FIXME
+
<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
@@ -68,7 +69,7 @@
source cocoon:/xsl-dynamic-source.
</sample>
</group>
--->
+
<group name="System pages">
<sample name="Sitemap" href="view-source?filename=/sub/sitemap.xmap">
shows the source file of this sitemap. Located in the file sub/sitemap.xmap
1.2 +2 -0 xml-cocoon2/src/webapp/sub/docs/simple.xml
Index: simple.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/docs/simple.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple.xml 22 Jan 2002 20:53:22 -0000 1.1
+++ simple.xml 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: simple.xml,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<page>
<title>Simple static page, served by sub-sitemap</title>
<content>
1.3 +2 -0 xml-cocoon2/src/webapp/sub/docs/simple.xsp
Index: simple.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/docs/simple.xsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple.xsp 22 Jan 2002 20:53:22 -0000 1.2
+++ simple.xsp 9 Feb 2002 06:21:58 -0000 1.3
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- CVS: $Id: simple.xsp,v 1.3 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";>
1.2 +2 -0 xml-cocoon2/src/webapp/sub/stylesheets/dynamic-xsp2xsp.xsl
Index: dynamic-xsp2xsp.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/stylesheets/dynamic-xsp2xsp.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dynamic-xsp2xsp.xsl 22 Jan 2002 20:53:22 -0000 1.1
+++ dynamic-xsp2xsp.xsl 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: dynamic-xsp2xsp.xsl,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xsp="http://apache.org/xsp";
1.2 +2 -0 xml-cocoon2/src/webapp/sub/stylesheets/error2html.xsl
Index: error2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/stylesheets/error2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error2html.xsl 3 Jan 2002 12:31:47 -0000 1.1
+++ error2html.xsl 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: error2html.xsl,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<html xmlns:error="http://apache.org/cocoon/error/2.0";
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xsl:version="1.0">
1.3 +2 -0 xml-cocoon2/src/webapp/sub/stylesheets/simple-page2html.xsl
Index: simple-page2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/stylesheets/simple-page2html.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simple-page2html.xsl 22 Jan 2002 20:53:22 -0000 1.2
+++ simple-page2html.xsl 9 Feb 2002 06:21:58 -0000 1.3
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: simple-page2html.xsl,v 1.3 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="page">
1.2 +2 -0 xml-cocoon2/src/webapp/sub/stylesheets/simple-page2html.xsp
Index: simple-page2html.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/stylesheets/simple-page2html.xsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple-page2html.xsp 22 Jan 2002 20:53:22 -0000 1.1
+++ simple-page2html.xsp 9 Feb 2002 06:21:58 -0000 1.2
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
+<!-- CVS: $Id: simple-page2html.xsp,v 1.2 2002/02/09 06:21:58 vgritsenko Exp $ -->
+
<xsp:page language="java"
xmlns:xsp="http://apache.org/xsp";
xmlns:xsp-request="http://apache.org/xsp/request/2.0";
1.6 +3 -0 xml-cocoon2/src/webapp/sub/stylesheets/simple-samples2html.xsl
Index: simple-samples2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sub/stylesheets/simple-samples2html.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- simple-samples2html.xsl 29 Jan 2002 07:53:49 -0000 1.5
+++ simple-samples2html.xsl 9 Feb 2002 06:21:58 -0000 1.6
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+
+<!-- CVS: $Id: simple-samples2html.xsl,v 1.6 2002/02/09 06:21:58 vgritsenko Exp $
-->
+
<!-- Author: Nicola Ken Barozzi "[EMAIL PROTECTED]" -->
<!-- Author: Vadim Gritsenko "[EMAIL PROTECTED]" -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:xlink="http://www.w3.org/1999/xlink";>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
