Author: antonio
Date: Tue Nov 16 15:46:46 2004
New Revision: 76060
Added:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/swf/
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/swf/hello.fla
(contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/swf/hello.swf
(contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2content.xsl
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2navigation.xsl
Removed:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/index.xhtml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2html.xsl
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/resources/styles/main.css
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/errorhandling/samples.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/samples.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/xsl/page2html.xsl
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/properties.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/explain-test.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/sendpage-redirect/explain-test.xml
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/text-wrap/welcome.html
cocoon/branches/BRANCH_2_1_X/src/webapp/stylesheets/system/error2html.xslt
Log:
Backporting samples from 2.2
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Tue Nov
16 15:46:46 2004
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+<!-- CVS $Id$ -->
<cocoon version="2.1">
<!--+
@@ -125,14 +125,14 @@
| indirection, other components can be more generic and changes
| to the application logic are easier.
|
- | A number of components already use InputModules: the sitemap
processor,
+ | A number of components already use InputModules: the sitemap processor,
| flow, some matchers, the linkrewriting transformer, database actions
| and more.
|
| For example the sitemap processor allows to obtain a value
| named "foo" from an the InputModule for request parameters by
| writing {request-param:foo} wherever a sitemap variable is
- | allowed.
+ | allowed.
|
| Some InputModules need the help of other InputModules to
| obtain values and only apply a function to the obtained value
@@ -169,7 +169,7 @@
<!--Eg: Mon, 28 Oct 2002 03:08:49 +1100 -->
</component-instance>
<component-instance logger="core.modules.input" name="nullinput"
class="org.apache.cocoon.components.modules.input.NullInputModule"/>
- <component-instance logger="core.modules.input" name="realpath"
class="org.apache.cocoon.components.modules.input.RealPathModule"/>
+ <component-instance logger="core.modules.input" name="realpath"
class="org.apache.cocoon.components.modules.input.RealPathModule"/>
<component-instance logger="core.modules.input" name="naming"
class="org.apache.cocoon.components.modules.input.NamingInputModule">
</component-instance>
<component-instance logger="core.modules.input" name="cocoon-properties"
class="org.apache.cocoon.components.modules.input.PropertiesFileModule">
@@ -190,7 +190,7 @@
<input-module name="session-attr"/>
<input-module name="defaults"/>
</component-instance>
-
+
<!-- The 'defaults', 'myxml' and 'slashdot' input modules are used
in the samples -->
<component-instance logger="core.modules.input" name="defaults"
class="org.apache.cocoon.components.modules.input.DefaultsModule">
@@ -210,7 +210,7 @@
</input-modules>
<!--+
- | OutputModules are companion modules for InputModules.
+ | OutputModules are companion modules for InputModules.
|
| The same principles apply here, only that OutputModules allow
| writing data to places. Apparently, there are a lot less
@@ -223,7 +223,7 @@
| end. Until then, the value could not be read from the
| corresponding InputModule. This behaviour is not enfored but
| it should be expected. Omitting a commit or rollback is an
- | error.
+ | error.
|
| OutputModules are currently used by flow, a number of actions
| and transformers.
@@ -304,7 +304,7 @@
| XML Parser
|
| Apache Cocoon requires a JAXP 1.1 parser. The default parser is
- | org.apache.excalibur.xml.impl.JaxpParser.
+ | org.apache.excalibur.xml.impl.JaxpParser.
| Note: If you have problems because your servlet environment uses its
| own parser not conforming to JAXP 1.1 try using the alternative
| XercesParser instead of the JaxpParser. To activate the XercesParser,
@@ -391,7 +391,7 @@
<parameter name="use-store" value="true"/>
<parameter name="transformer-factory"
value="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"/>
</component>
-
+
<!--+
| Xalan XSLT Processor
+-->
@@ -438,7 +438,7 @@
<transient-store logger="core.store.transient">
<parameter name="maxobjects" value="1000"/>
</transient-store>
-
+
<!--+
| Store: generic store. The default implementation is an in-memory store
| backed by a disk store (based on EHCache). This forms a two-stage
@@ -539,15 +539,15 @@
| The Cache Manager is a component that can be used to cache content.
| It is currently used by the cinclude transformer
+-->
- <component
class="org.apache.cocoon.transformation.helpers.DefaultIncludeCacheManager"
+ <component
class="org.apache.cocoon.transformation.helpers.DefaultIncludeCacheManager"
role="org.apache.cocoon.transformation.helpers.IncludeCacheManager">
<!-- Set the preemptive-loader-url to a pipeline inside Cocoon that
- contains the preemptive loader action. The URL must be absolute!
- <parameter name="preemptive-loader-url"
+ contains the preemptive loader action. The URL must be absolute!
+ <parameter name="preemptive-loader-url"
value="http://localhost:8080/cocoon/samples/cinclude/loader"/>
-->
</component>
-
+
<!--+
| Runnable manager
|
@@ -556,77 +556,77 @@
+-->
<runnable-manager logger="core.runnable">
<!--+
- | This is the default configuration of the runnable-manager. More
+ | This is the default configuration of the runnable-manager. More
| indepth information can be found at
|
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/PooledExecutor.html
| The following elements can be used:
|
| thread-factory: specifies the fully qualified class name of an
|
org.apache.cocoon.components.thread.ThreadFactory
- | implementation. It is responsible to create
Thread
+ | implementation. It is responsible to create
Thread
| classes.
| thread-pools: container element for thread-pool elements.
| name: required name of the pool.
- | priority: optional priority all threads of the pool
will
- | have (the ThreadFactory will be set to this
- | priority).The possible values are:
+ | priority: optional priority all threads of the pool will
+ | have (the ThreadFactory will be set to this
+ | priority).The possible values are:
| MIN: corresponds to Thread#MIN_PRIORITY
| NORM: corresponds to Thread#NORM_PRIORITY
(default)
| MAX: corresponds to Thread#MAX_PRIORITY
- | daemon: whether newly created Threads should run in
+ | daemon: whether newly created Threads should run in
| daemon mode or not. Default to false.
- | queue-size: optional size of a queue to hold Runnables if
the
+ | queue-size: optional size of a queue to hold Runnables if
the
| pool is full. Possible values are:
| less than 0: unbounded (default)
| equal to 0: no queue at all
| greater than 0: size of the queue
- | max-pool-size: optional maximum number of threads in the
pool.
- | Defaults to 5.
- | NOTE: if a queue is specified (queue-sie !=
0)
+ | max-pool-size: optional maximum number of threads in the
pool.
+ | Defaults to 5.
+ | NOTE: if a queue is specified (queue-sie != 0)
| this value will be ignored.
- | min-pool-size: optional minimum number of threads in the
pool.
- | Defaults to 5.
+ | min-pool-size: optional minimum number of threads in the
pool.
+ | Defaults to 5.
| NOTE: if a queue has been specified
(queue-sie != 0)
| this value will be used as the maximum
of
| thread running concurrently.
- | keep-alive-time-ms: The time in ms an idle thread should keep
alive
- | before it might get garbage collected. This
+ | keep-alive-time-ms: The time in ms an idle thread should keep
alive
+ | before it might get garbage collected. This
| defaults to 60000 ms.
| block-policy; The policy to be used if all resources
(thread in
| the pool and slots in the queue) are
exhausted.
| Possible values are:
| ABORT: Throw a RuntimeException
- | DISCARD: Throw away the current
request
+ | DISCARD: Throw away the current
request
| and return.
- | DISCARDOLDEST: Throw away the oldest
request
+ | DISCARDOLDEST: Throw away the oldest request
| and return.
- | RUN (default): The thread making the
execute
- | request runs the task
itself.
- | This policy helps guard
against
+ | RUN (default): The thread making the execute
+ | request runs the task itself.
+ | This policy helps guard
against
| lockup.
- | WAIT: Wait until a thread becomes
- | available. This policy
should, in
- | general, not be used if the
- | minimum number of threads is
zero,
- | in which case a thread may
never
+ | WAIT: Wait until a thread becomes
+ | available. This policy
should, in
+ | general, not be used if the
+ | minimum number of threads is
zero,
+ | in which case a thread may
never
| become available.
- | shutdown-graceful: Terminate thread pool after processing all
- | Runnables currently in queue. Any Runnable
entered
- | after this point will be discarded. A shut
down
- | pool cannot be restarted. This also means
that a
- | pool will need keep-alive-time-ms to
terminate.
+ | shutdown-graceful: Terminate thread pool after processing all
+ | Runnables currently in queue. Any Runnable
entered
+ | after this point will be discarded. A shut
down
+ | pool cannot be restarted. This also means
that a
+ | pool will need keep-alive-time-ms to
terminate.
| The default value not to shutdown graceful.
- | shutdown-wait-time-ms: The time in ms to wait before issuing an
- | immediate shutdown after a graceful shutdown
+ | shutdown-wait-time-ms: The time in ms to wait before issuing an
+ | immediate shutdown after a graceful shutdown
| has been requested.
+-->
<thread-factory>org.apache.cocoon.components.thread.DefaultThreadFactory</thread-factory>
<thread-pools>
<!--+
- | This is the default thread pool. It's use fits best for short
+ | This is the default thread pool. It's use fits best for short
| running background tasks.
+-->
- <thread-pool>
+ <thread-pool>
<name>default</name>
<priority>NORM</priority>
<daemon>false</daemon>
@@ -637,12 +637,12 @@
<block-policy>RUN</block-policy>
<shutdown-graceful>false</shutdown-graceful>
<shutdown-wait-time-ms>-1</shutdown-wait-time-ms>
- </thread-pool>
+ </thread-pool>
<!--+
- | This thread pool should be used for daemons (permanently running
+ | This thread pool should be used for daemons (permanently running
| threads).
+-->
- <thread-pool>
+ <thread-pool>
<name>daemon</name>
<priority>NORM</priority>
<daemon>true</daemon>
@@ -653,7 +653,7 @@
<block-policy>ABORT</block-policy>
<shutdown-graceful>false</shutdown-graceful>
<shutdown-wait-time-ms>-1</shutdown-wait-time-ms>
- </thread-pool>
+ </thread-pool>
</thread-pools>
</runnable-manager>
</cocoon>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/web.xml Tue Nov 16
15:46:46 2004
@@ -19,8 +19,9 @@
| This is the Cocoon web-app configurations file
+-->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app>
@@ -37,7 +38,7 @@
<param-value>/some/path/to/your/webapp</param-value>
<description>An override of the session cookie path</description>
</context-param-->
-
+
<!-- Servlet Configuration ========================================== -->
<servlet>
@@ -143,7 +144,7 @@
an XML configuration file here. You can use the usual log4j property
substituation mechanism, e.g. ${context-root} is replaced by the
context root of this web application etc.
- You can configure the log4j configuration even if you use LogKit
+ You can configure the log4j configuration even if you use LogKit
for Cocoon logging. You can use this to configure third party code
for example.
<init-param>
@@ -151,11 +152,11 @@
<param-value>/WEB-INF/log4j.xconf</param-value>
</init-param>
-->
-
+
<!--
Allow reinstantiating (reloading) of the cocoon instance. If this is
set to "yes" or "true", a new cocoon instance can be created using
- the request parameter "cocoon-reload". It also enables that Cocoon is
+ the request parameter "cocoon-reload". It also enables that Cocoon is
reloaded when cocoon.xconf changes. Default is no for security reasons.
-->
<init-param>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/resources/styles/main.css
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/resources/styles/main.css
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/resources/styles/main.css Tue Nov
16 15:46:46 2004
@@ -41,10 +41,11 @@
/* Samples */
-/* background-color: #ffffcc; would make the groups even more visible but it's
a bit heavy IMHO */
.samplesGroup {
+ /* a tasteful shade of blue */
+ background-color: #BFCCDF;
color: black;
- border-width: 0px 0px 1px 1px;
+ border-width: 0px 0px 2px 0px;
border-style: solid;
border-color: #336699;
font-size:120%;
@@ -53,6 +54,10 @@
padding-bottom: 0.2em;
margin-top: 1em;
margin-bottom: 0;
+
+ /* mozilla and some others support the fancy CSS3 borders */
+ -moz-border-radius-bottomleft: 1em;
+ border-radius-bottomleft: 1em;
}
.samplesNote {
@@ -67,3 +72,10 @@
margin-top: 0.2em;
}
+div.resources {
+ text-align: right;
+}
+
+div.resources a {
+ margin: 5px;
+}
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/common/style/xsl/html/simple-page2html.xsl
Tue Nov 16 15:46:46 2004
@@ -42,45 +42,29 @@
<xsl:template name="resources">
<div class="resources">
- <table width="100%" cellpadding="3">
- <tbody>
- <tr>
- <td width="90%"> </td>
- <td nowrap="nowrap">
- <a href="?cocoon-view=content">Content View</a>
- </td>
- <td nowrap="nowrap">
- <a href="?cocoon-view=pretty-content">Source</a>
- </td>
- <td nowrap="nowrap">
- <a href="{$sitemap}?cocoon-view=pretty-content">Sitemap</a>
- </td>
- <xsl:for-each select="resources/resource">
- <td class="[EMAIL PROTECTED]">
- <xsl:choose>
- <xsl:when test="@type='file'">
- <a href="[EMAIL PROTECTED]">
- <!-- we need an explicite match in the sitemap showing
- the source of these resources -->
- <xsl:apply-templates/>
- </a>
- </xsl:when>
- <xsl:when test="@type='doc'">
- <a href="{concat($contextPath,'/docs/',@href)}">
- <xsl:apply-templates/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <a href="{concat($contextPath,'/',@href)}">
- <xsl:apply-templates/>
- </a>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- </xsl:for-each>
- </tr>
- </tbody>
- </table>
+ <a href="?cocoon-view=content">Content View</a>
+ <a href="?cocoon-view=pretty-content">Source</a>
+ <a href="{$sitemap}?cocoon-view=pretty-content">Sitemap</a>
+ <xsl:for-each select="resources/resource">
+ <xsl:variable name="href">
+ <xsl:choose>
+ <xsl:when test="@type='file'">
+ <!-- we need an explicite match in the sitemap showing
+ the source of these resources -->
+ <xsl:value-of select="@href"/>
+ </xsl:when>
+ <xsl:when test="@type='doc'">
+ <xsl:value-of select="concat($contextPath, '/docs/', @href)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($contextPath, '/', @href)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <a class="[EMAIL PROTECTED]" href="{$href}">
+ <xsl:apply-templates/>
+ </a>
+ </xsl:for-each>
</div>
</xsl:template>
@@ -91,7 +75,7 @@
<xsl:apply-templates/>
</h2>
</xsl:template>
-
+
<xsl:template match="content">
<xsl:apply-templates/>
</xsl:template>
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/errorhandling/samples.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/errorhandling/samples.xml
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/errorhandling/samples.xml
Tue Nov 16 15:46:46 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- CVS $Id: samples.xml,v 1.4 2004/04/05 12:34:23 antonio Exp $ -->
+<!-- CVS $Id$ -->
<samples name="Error Handling Samples"
xmlns:xlink="http://www.w3.org/1999/xlink";>
@@ -54,6 +54,12 @@
<sample name="NullPointerException"
href="exception/exception?exception=nullPointer">
Generate RuntimeException.
</sample>
+ <note>
+ Since Cocoon does not process java.lang.Error (and derived objects),
+ behavior of this sample will depend on behavior of servlet engine.
+ In case of Jetty and Tomcat, they will show empty page and print
+ Error's stacktrace to the console.
+ </note>
<sample name="Error" href="exception/exception?exception=error">
Generate Error.
</sample>
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
Tue Nov 16 15:46:46 2004
@@ -16,17 +16,27 @@
-->
<!--+
- | CVS: $Id: getNumberA.xml,v 1.4 2004/03/06 02:26:06 antonio Exp $
+ | CVS: $Id$
| Author: Ovidiu Predescu "[EMAIL PROTECTED]"
| Date: March 23, 2002
+-->
-<page>
+<page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
<resources>
<resource type="file" href="../calc/calc.js">Flowscript</resource>
</resources>
<title>Calculator</title>
+ <!--+ XML comments are not parsed.
+ |ie: This expresion don't break the Generator:
#{$.[4.]$..cocoon/continuation/id}">
+ +-->
<content>
+ <jx:comment>
+ The "comment" tag allows to insert comments in the result file.
+ JXTemplate Expresions are parsed. Samples:
+
+ This is the continuation id: #{$cocoon/continuation/id}
+ A backslash dir reference: d:\cocoon\
+ </jx:comment>
<form method="post" action="continue.#{$cocoon/continuation/id}">
<para>Enter value of <strong>a</strong>: <input type="text"
name="a"/></para>
<input type="submit" name="submit" value="Enter"/>
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/samples.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/samples.xml
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/samples.xml
Tue Nov 16 15:46:46 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- CVS $Id: samples.xml,v 1.15 2004/04/05 12:34:23 antonio Exp $ -->
+<!-- CVS $Id$ -->
<samples name="Hello, World!">
@@ -39,7 +39,7 @@
This page shows how a simple XML page can be presented in HTML.
</sample>
<sample name="XHTML" href="hello.xhtml">
- This is the same page as above, but rendered in XHTML (which is the
+ This is the same page as above, but rendered in XHTML (which is the
well-formed XML version of HTML). Note that both the page and the
stylesheet used to transform it didn't change from the previous
example, Cocoon does everything for you by setting a different serializer.
@@ -58,7 +58,12 @@
based on the XML syntax, it is possible to generate even vector graphics
from your content. Here is an example that renders to SVG (Scalable Vector
Graphics). (You need an SVG plugin, or an SVG-capable browser to see this.)
- </sample>
+ </sample>
+ <sample name="SWF" href="hello.swf">
+ Flash is everywhere. In fact many people have the plugin installed.
+ Let Cocoon configure your flash movie. A little action script and you set.
+ See this sample how it works.
+ </sample>
<sample name="Plain Text" href="hello.txt">
Sometimes you don't need to be very fancy, so here is a plain text
version of your content.
@@ -70,7 +75,7 @@
</sample>
<sample name="VoiceML" href="hello.vml">
Or sometimes you don't even have a display in front of you, so you want to
- hear your content, so here is a VoiceML representation of your content
(you
+ hear your content, so here is a VoiceML representation of your content (you
need a VoiceML-capable agent to hear this).
</sample>
<sample name="Zip archive" href="hello.zip">
@@ -108,7 +113,7 @@
<group name="Blocks Hello World!">
<note>
These samples only work if the corresponding blocks are activated
- at build time.
+ at build time.
</note>
<sample name="RTF" href="../blocks/jfor/hello.rtf">
Hello from the jfor block in Rich Text Format.
@@ -124,9 +129,6 @@
</sample>
<sample name="PNG" href="../blocks/batik/hello.png">
Hello from the batik block in PNG.
- </sample>
- <sample name="SWF" href="../blocks/swf/hello.swf">
- Flashy hello from swf block! You need the appropriate (flash) plugin for
your browser.
</sample>
<sample name="XLS" href="../blocks/poi/hello.xls">
Hello in Excel spreadsheet format from the POI block.
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/sitemap.xmap
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/sitemap.xmap
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/sitemap.xmap
Tue Nov 16 15:46:46 2004
@@ -95,6 +95,10 @@
<map:serialize type="svgxml"/>
</map:match>
+ <map:match pattern="hello.swf">
+ <map:read src="style/swf/hello.swf"/>
+ </map:match>
+
<map:match pattern="hello.wrl">
<map:generate src="content/hello.xml"/>
<map:transform src="style/xsl/page2vrml.xsl"/>
@@ -127,7 +131,7 @@
<map:match pattern="hello.sxi">
<map:generate src="content/hello.xml"/>
<!-- FIXME: XSLTC fails on this stylesheet -->
- <map:transform type="xalan" src="style/xsl/page2sxi.xsl"/>
+ <map:transform src="style/xsl/page2sxi.xsl"/>
<map:serialize type="sxi"/>
</map:match>
Added:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/swf/hello.fla
==============================================================================
Binary file. No diff available.
Added:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/swf/hello.swf
==============================================================================
Binary file. No diff available.
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/xsl/page2html.xsl
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/xsl/page2html.xsl
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/hello-world/style/xsl/page2html.xsl
Tue Nov 16 15:46:46 2004
@@ -15,9 +15,10 @@
limitations under the License.
-->
-<!-- CVS $Id: page2html.xsl,v 1.4 2004/03/06 02:25:32 antonio Exp $ -->
+<!-- CVS $Id$ -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns="http://www.w3.org/1999/xhtml";>
<xsl:template match="page">
<html>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu.xml Tue Nov
16 15:46:46 2004
@@ -14,43 +14,44 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!--DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN"
"dtd/book-cocoon-v10.dtd" -->
-<book software="Apache Cocoon"
- title="Apache Cocoon Input Modules Samples"
- copyright="@year@ The Apache Software Foundation"
->
+<book software="Apache Cocoon"
+ title="Apache Cocoon Input Modules Samples"
+ copyright="@year@ The Apache Software Foundation">
<menu label="Overview">
<menu-item label="Index" href="index.html"/>
- <menu-item label="Sitemap" href="sitemap.xmap"/>
- </menu>
-
+ <menu-item label="Sitemap" href="sitemap.xmap"/>
+ </menu>
+
<menu label="Modules">
- <menu-item label="RequestModule" href="request.html"/>
- <menu-item label="BaseLinkModule" href="baselink.html"/>
- <menu-item label="RequestParameterModule" href="requestparam.html"/>
- <menu-item label="DateInputModule" href="date.html"/>
- <menu-item label="DefaultsModule" href="defaults.html"/>
- <menu-item label="SessionModule" href="session.html"/>
- <menu-item label="SessionAttributeModule" href="session-attr.html"/>
- <menu-item label="SystemPropertyModule" href="system-property.html"/>
- <menu-item label="XMLFileModule" href="xml.html"/>
- <menu-item label="ChainMetaModule" href="chain.html"/>
- <menu-item label="RandomNumberModule" href="randomnumber.html"/>
- <menu-item label="RealPathModule" href="realpath.html"/>
- <menu-item label="PropertiesFileModule" href="properties.html"/>
+ <menu-item label="RequestModule" href="request.html" desc="Request object
properties"/>
+ <menu-item label="BaseLinkModule" href="baselink.html" desc="BaseLink
properties"/>
+ <menu-item label="RequestParameterModule" href="requestparam.html"
desc="Request parameters"/>
+ <menu-item label="DateInputModule" href="date.html" desc="Date"/>
+ <menu-item label="DefaultsModule" href="defaults.html" desc="Default
(static) values"/>
+ <menu-item label="SessionModule" href="session.html" desc="Session object
properties"/>
+ <menu-item label="SessionAttributeModule" href="session-attr.html"
desc="Session attributes"/>
+ <menu-item label="SystemPropertyModule" href="system-property.html"
desc="System properties (environment variables)"/>
+ <menu-item label="XMLFileModule" href="xml.html" desc="XML node values"/>
+ <menu-item label="ChainMetaModule" href="chain.html" desc="Chained
values"/>
+ <menu-item label="RandomNumberModule" href="randomnumber.html"
desc="Random number"/>
+ <menu-item label="RealPathModule" href="realpath.html" desc="Real
filesystem paths of context paths"/>
+ <menu-item label="PropertiesFileModule" href="properties.html"
desc="Properties file values"/>
+ <menu-item label="URLEncodeModule" href="url-encode.html" desc="URLEncode
passed parameter"/>
+ <menu-item label="URLDecodeModule" href="url-decode.html" desc="URLDecode
passed parameter"/>
+ <menu-item label="NamingInputModule" href="naming.html" desc="JNDI
Resources. This sample does not work with built-in Jetty as it does not provide
JNDI."/>
+ <menu-item label="GlobalInputModule" href="global.html" desc="Access to
the global variables defined in the sitemap."/>
</menu>
<menu label="Documentation">
- <external label="Input Modules Docs"
href="../../docs/userdocs/concepts/modules.html"/>
- <external label="API Docs"
href="../../api/java/org/apache/cocoon/components/modules/input/package-summary.html"/>
+ <external label="Input Modules Docs"
href="../../docs/userdocs/concepts/modules.html"/>
+ <external label="API Docs"
href="../../api/java/org/apache/cocoon/components/modules/input/package-summary.html"/>
</menu>
-
+
<menu label="Credits">
- <menu-item label="Christian Haul" href="mailto:[EMAIL PROTECTED]"/>
- <menu-item label="Konstantin Piroumian" href="mailto:[EMAIL PROTECTED]"/>
- <menu-item label="Many others..." href="/docs/who.html"/>
- </menu>
-
+ <menu-item label="Christian Haul" href="mailto:[EMAIL PROTECTED]"/>
+ <menu-item label="Konstantin Piroumian" href="mailto:[EMAIL PROTECTED]"/>
+ <menu-item label="Many others..." href="/docs/who.html"/>
+ </menu>
</book>
Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2content.xsl
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2content.xsl
Tue Nov 16 15:46:46 2004
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--+
+ | Transforms menu.xml to the index page
+ | CVS $Id: menu2content.xsl 36239 2004-08-11 18:28:06Z vgritsenko $
+ +-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+ <xsl:template match="book">
+ <page>
+ <title>Input Modules</title>
+ <table>
+ <tr>
+ <td>
+ <h3>Input Modules</h3>
+ <p>Modules are used to access input and output data in
+ modular way. Below there are samples for some of the
+ available input modules.
+ </p>
+ <table class="table">
+ <xsl:apply-templates select="menu/[EMAIL PROTECTED]"/>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </page>
+ </xsl:template>
+
+ <xsl:template match="[EMAIL PROTECTED]">
+ <tr>
+ <td>
+ <a href="[EMAIL PROTECTED]"><xsl:value-of select="@label" /></a>
+ </td>
+ <td>
+ <xsl:value-of select="@desc" />
+ </td>
+ </tr>
+ </xsl:template>
+</xsl:stylesheet>
Added:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2navigation.xsl
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/menu2navigation.xsl
Tue Nov 16 15:46:46 2004
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--+
+ | Transforms menu.xml to the navigation bar
+ | CVS $Id: menu2navigation.xsl 36239 2004-08-11 18:28:06Z vgritsenko $
+ +-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:param name="page" />
+
+ <xsl:template match="book">
+ <table class="menu">
+ <tr>
+ <td>
+ <ul><xsl:apply-templates select="menu"/></ul>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+
+ <!-- Process only current book -->
+ <xsl:template match="[EMAIL PROTECTED]">
+ <ul><xsl:apply-templates /></ul>
+ </xsl:template>
+
+ <!-- Current (open) menu -->
+ <xsl:template match="menu">
+ <li>
+ <xsl:if test="@icon">
+ <img src="[EMAIL PROTECTED]" align="middle"/><xsl:text> </xsl:text>
+ </xsl:if>
+ <span class="chapter open"><xsl:value-of select="@label" /></span>
+ </li>
+ <ul><xsl:apply-templates /></ul>
+ </xsl:template>
+
+ <!-- Display a link to a page -->
+
+ <xsl:template match="[EMAIL PROTECTED]">
+ <li class="current" title="[EMAIL PROTECTED]">
+ <xsl:if test="@icon">
+ <img src="[EMAIL PROTECTED]" align="middle"/><xsl:text> </xsl:text>
+ </xsl:if>
+ <xsl:value-of select="@label" />
+ </li>
+ </xsl:template>
+
+ <xsl:template match="menu-item | external">
+ <li class="page">
+ <xsl:if test="@icon">
+ <img src="[EMAIL PROTECTED]" align="middle"/><xsl:text> </xsl:text>
+ </xsl:if>
+ <a href="[EMAIL PROTECTED]" class="page"><xsl:value-of select="@label"
/></a>
+ </li>
+ </xsl:template>
+
+</xsl:stylesheet>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/properties.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/properties.xml
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/properties.xml
Tue Nov 16 15:46:46 2004
@@ -14,7 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: properties.xml,v 1.2 2004/04/05 12:34:23 antonio Exp $ -->
+
+<!--+
+ | Prints out all passed parameters.
+ |
+ | $Id$
+ +-->
<properties xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
<jx:forEach var="name" items="${parameters.names}">
<property>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/sitemap.xmap
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/sitemap.xmap
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/modules/sitemap.xmap
Tue Nov 16 15:46:46 2004
@@ -14,12 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: sitemap.xmap,v 1.11 2004/05/07 09:52:26 upayavira Exp $ -->
-<!--
-Input Modules sample sitemap.
-Author: Konstantin Piroumian "[EMAIL PROTECTED]"
--->
+<!--+
+ | Input Modules sample sitemap.
+ | Author: Konstantin Piroumian "[EMAIL PROTECTED]"
+ |
+ | $Id$
+ +-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<!-- =========================== Resources ===============================
-->
@@ -27,11 +28,11 @@
<!-- This resource is used to create a composite page from menu and
content -->
<map:resource name="composite">
<map:aggregate element="site">
- <map:part src="cocoon:/menu/{../1}.xml"/>
+ <map:part src="cocoon:/menu/{../1}.html"/>
<map:part src="cocoon:/content/{../1}.xml" label="content"/>
</map:aggregate>
<map:transform src="site2html.xsl">
- <map:parameter name="page" value="{../0}" />
+ <map:parameter name="page" value="{../0}"/>
</map:transform>
<map:serialize/>
</map:resource>
@@ -39,21 +40,43 @@
<!-- =========================== Pipelines =================================
-->
<map:pipelines>
+ <map:component-configurations>
+ <global-variables>
+ <!--+
+ | (Re)Define global parameters, used in the input modules
GlobalInputModule demo.
+ +-->
+ <global-sub-sitemap>This value is defined in the
samples/modules/sitemap.xmap</global-sub-sitemap>
+ <global-sitemap-override>This value was defined in the
samples/sitemap.xmap, but was overridden by
samples/modules/sitemap.xmap</global-sitemap-override>
+ </global-variables>
+ </map:component-configurations>
+
<map:pipeline>
<!-- Default URL matcher. Matches '/' URLs-->
<map:match pattern="">
- <map:redirect-to uri="index.html" />
+ <map:redirect-to uri="index.html"/>
</map:match>
<map:match pattern="*.html">
- <map:call resource="composite" />
- </map:match>
+ <map:call resource="composite"/>
+ </map:match>
+ <!-- Index page content -->
<map:match pattern="content/index.xml">
- <map:generate src="index.xhtml"/>
+ <map:generate src="menu.xml"/>
+ <map:transform src="menu2content.xsl"/>
<map:serialize/>
- </map:match>
+ </map:match>
+
+ <!-- Menu -->
+ <map:match pattern="menu/*">
+ <map:generate src="menu.xml"/>
+ <map:transform src="menu2navigation.xsl">
+ <map:parameter name="page" value="{1}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
<map:match pattern="content/request.xml">
<map:generate type="jx" src="properties.xml">
@@ -96,7 +119,7 @@
<map:transform src="properties2html.xsl">
<map:parameter name="title" value="Request Input Module
(RequestModule)"/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
<map:match pattern="content/baselink.xml">
@@ -113,8 +136,8 @@
In this demonstration, the request URI is {0} (an internal request
not
equivalent to what the user sees)"/>
</map:transform>
- <map:serialize />
- </map:match>
+ <map:serialize/>
+ </map:match>
<map:match pattern="requestparam">
<map:redirect-to
uri="content/requestparam.xml?foo=foo+param&bar=bar+param"/>
@@ -130,7 +153,7 @@
parameters. Edit the URL of this page to see the request parameter
values change (parts after the '?' are request parameters) ."/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
<map:match pattern="content/session.xml">
@@ -147,8 +170,8 @@
<map:parameter name="description" value="SessionModule provides
access
to Session object properties."/>
</map:transform>
- <map:serialize />
- </map:match>
+ <map:serialize/>
+ </map:match>
<map:match pattern="content/system-property.xml">
<map:generate type="jx" src="properties.xml">
@@ -183,9 +206,8 @@
<map:transform src="properties2html.xsl">
<map:parameter name="title" value="System Properties Input Module
(SystemPropertiesModule)"/>
</map:transform>
- <map:serialize />
- </map:match>
-
+ <map:serialize/>
+ </map:match>
<map:match pattern="content/xml.xml">
<map:generate type="jx" src="properties.xml">
@@ -197,13 +219,13 @@
-->
</map:generate>
<map:transform src="properties2html.xsl">
- <map:parameter name="title" value="XML File Input Module
(XMLFileModule)"/>
+ <map:parameter name="title" value="XML File Input Module
(XMLFileModule)"/>
<map:parameter name="description" value="XMLFileModule uses an XML
file as a data source, with XPath expressions as the key values. In
this example, the keys identify nodes in
- context:///samples/modules/forrestconf.xml"/>
+ context://samples/modules/forrestconf.xml"/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
<map:match pattern="content/defaults.xml">
@@ -217,10 +239,9 @@
contains 'default' values, hardcoded into cocoon.xconf.
It is simply a lookup table containing static values."/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
-
<map:match pattern="content/chain.xml">
<map:generate type="jx" src="properties.xml">
<map:parameter name="skin" value="{chain:skin}"/>
@@ -236,10 +257,9 @@
Try adding '?skin=myskin' to the URL, and it should
change."/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
-
<map:match pattern="content/date.xml">
<map:generate type="jx" src="properties.xml">
<map:parameter name="date" value="{date:date}"/>
@@ -249,20 +269,20 @@
<map:parameter name="description" value="Returns the current
date and time. The format is specified in cocoon.xconf"/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
<map:match pattern="content/session-attr.xml">
<map:generate type="jx" src="properties.xml">
- <map:parameter name="fruit" value="{session-attr:fruit}"/>
+ <map:parameter name="fruit" value="{session-attr:fruit}"/>
</map:generate>
<map:transform src="properties2html.xsl">
<map:parameter name="title" value="Session Attribute Input Module
- (SessionAttributeModule)"/>
+ (SessionAttributeModule)"/>
<map:parameter name="description" value="SessionAttributeModule
provides access
to Session attributes."/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
<map:match pattern="content/randomnumber.xml">
@@ -274,10 +294,9 @@
<map:parameter name="description" value="Returns a random number in a
user-configurable range (by default 0 to 9999999999)"/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
-
<map:match pattern="content/realpath.xml">
<map:generate type="jx" src="properties.xml">
<map:parameter name="/" value="{realpath:/}"/>
@@ -289,8 +308,8 @@
<map:parameter name="description" value="Returns the real path of a
context-relative virtual path (if not deployed from a .war)."/>
</map:transform>
- <map:serialize />
- </map:match>
+ <map:serialize/>
+ </map:match>
<map:match pattern="content/properties.xml">
<map:generate type="jx" src="properties.xml">
@@ -308,14 +327,58 @@
to properties from a properties file. In this example the keys
identify properties in
resource://org/apache/cocoon/cocoon.properties"/>
</map:transform>
- <map:serialize />
+ <map:serialize/>
</map:match>
- <!-- Menu generation -->
- <map:match pattern="menu/*">
- <map:generate src="menu.xml"/>
- <map:transform src="menu2html.xsl">
- <map:parameter name="page" value="{1}" />
+ <map:match pattern="content/url-encode.xml">
+ <map:generate type="jx" src="properties.xml">
+ <map:parameter name="foo bar" value="{url-encode:foo bar}"/>
+ <map:parameter name="foo/bar" value="{url-encode:foo/bar}"/>
+ </map:generate>
+ <map:transform src="properties2html.xsl">
+ <map:parameter name="title" value="URL Encoding Module
(URLEncodeModule)"/>
+ <map:parameter name="description" value="URLEncodeModule performs
+ URL encoding of the passed parameter"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="content/url-decode.xml">
+ <map:generate type="jx" src="properties.xml">
+ <map:parameter name="foo%20bar" value="{url-decode:foo%20bar}"/>
+ <map:parameter name="foo%2Fbar" value="{url-decode:foo%2Fbar}"/>
+ </map:generate>
+ <map:transform src="properties2html.xsl">
+ <map:parameter name="title" value="URL Decoding Module
(URLDecodeModule)"/>
+ <map:parameter name="description" value="URLDecodeModule performs
+ URL decoding of the passed parameter"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="content/naming.xml">
+ <map:generate type="jx" src="properties.xml">
+ <map:parameter name="java:comp/env/greeting"
value="{naming:java:comp/env/greeting}"/>
+ </map:generate>
+ <map:transform src="properties2html.xsl">
+ <map:parameter name="title" value="Naming Module
(NamingInputModule)"/>
+ <map:parameter name="description" value="NamingInputModule provides
access
+ to JNDI resources. This sample does not work with built-in Jetty
as it does not provide JNDI."/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="content/global.xml">
+ <map:generate type="jx" src="properties.xml">
+ <map:parameter name="global-sitemap"
value="{global:global-sitemap}"/>
+ <map:parameter name="global-sub-sitemap"
value="{global:global-sub-sitemap}"/>
+ <map:parameter name="global-sitemap-override"
value="{global:global-sitemap-override}"/>
+ </map:generate>
+ <map:transform src="properties2html.xsl">
+ <map:parameter name="title" value="Global Input Module
(GlobalInputModule)"/>
+ <map:parameter name="description" value="GlobalInputModule
+ contains 'global' values defined in the sitemap. Children sitemaps
+ can override values defined in the parent sitemap."/>
</map:transform>
<map:serialize/>
</map:match>
@@ -325,7 +388,7 @@
<map:generate src="sitemap.xmap"/>
<map:transform src="context://stylesheets/system/xml2html.xslt"/>
<map:serialize/>
- </map:match>
+ </map:match>
<map:match pattern="*.css">
<map:read src="{1}.css" mime-type="text/css"/>
@@ -335,6 +398,6 @@
<map:read src="images/{1}.gif" mime-type="image/gif"/>
</map:match>
- </map:pipeline>
+ </map:pipeline>
</map:pipelines>
</map:sitemap>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/sitemap.xmap
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/sitemap.xmap
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/sitemap.xmap Tue Nov
16 15:46:46 2004
@@ -15,22 +15,17 @@
limitations under the License.
-->
-<!-- CVS $Id: sitemap.xmap,v 1.26 2004/05/19 11:32:02 cziegeler Exp $ -->
+<!-- CVS $Id$ -->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
-<!-- =========================== Components ================================
-->
+ <!-- ========================= Components ================================
-->
<map:components>
<map:generators default="file">
<map:generator name="linkstatus"
src="org.apache.cocoon.generation.LinkStatusGenerator"/>
<map:generator name="calendar"
src="org.apache.cocoon.generation.CalendarGenerator"/>
</map:generators>
- <map:transformers default="xslt"/>
- <map:readers default="resource"/>
- <map:serializers default="html"/>
- <map:matchers default="wildcard"/>
- <map:selectors default="browser"/>
</map:components>
<!-- =========================== Views =================================== -->
@@ -50,11 +45,20 @@
</map:view>
</map:views>
-<!-- =========================== Pipelines =================================
-->
+<!-- ========================== Pipelines ================================ -->
<map:pipelines>
- <map:pipeline>
+ <map:component-configurations>
+ <global-variables>
+ <!--+
+ | Define global parameters, used in the input modules
GlobalInputModule demo.
+ +-->
+ <global-sitemap>This value is defined in the
samples/sitemap.xmap</global-sitemap>
+ <global-sitemap-override>This value is defined in the
samples/sitemap.xmap, should be overridden by
samples/modules/sitemap.xmap</global-sitemap-override>
+ </global-variables>
+ </map:component-configurations>
+ <map:pipeline>
<map:match pattern="">
<map:generate src="samples.xml"/>
<map:transform
src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
@@ -63,7 +67,7 @@
<map:serialize/>
</map:match>
- <!-- ========================== Stream ================================= -->
+ <!-- ========================= Stream ================================ -->
<map:match pattern="order">
<map:generate src="stream/OrderPage.xml"/>
@@ -84,7 +88,7 @@
<map:serialize type="html"/>
</map:match>
- <!-- ========================= Other Samples
================================ -->
+ <!-- ======================= Other Samples =========================== -->
<map:match pattern="scratchpad">
<map:generate src="scratchpad-samples.xml"/>
@@ -110,7 +114,7 @@
<map:serialize/>
</map:match>
- <!-- ========================= Utilities ================================
-->
+ <!-- ======================== Utilities ============================== -->
<map:match pattern="**sitemap.xmap">
<map:generate src="{0}"/>
@@ -126,7 +130,7 @@
<map:transform src="context://stylesheets/system/linkstatus2html.xslt"/>
<map:serialize/>
</map:match>
-
+
<map:match pattern="status.html">
<map:generate src="status" type="status"/>
<map:transform src="context://stylesheets/system/status2html.xslt">
@@ -178,12 +182,11 @@
<map:serialize/>
</map:match>
- <!-- ======================== Automount =============================== -->
+ <!-- ========================= Automount ============================= -->
<map:match pattern="*/**">
<map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
</map:match>
-
</map:pipeline>
</map:pipelines>
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/explain-test.xml
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/explain-test.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/explain-test.xml
Tue Nov 16 15:46:46 2004
@@ -21,7 +21,7 @@
<title>reader-mime-type test</title>
<content>
<para>Test harness for
- <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25121";>
+ <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25121";>
bugzilla 25212
</a>, test mime-types on map:reader.
</para>
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/sendpage-redirect/explain-test.xml
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/sendpage-redirect/explain-test.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/sendpage-redirect/explain-test.xml
Tue Nov 16 15:46:46 2004
@@ -15,13 +15,13 @@
limitations under the License.
-->
-<!-- CVS $Id: explain-test.xml,v 1.2 2004/03/06 02:25:57 antonio Exp $ -->
+<!-- CVS $Id$ -->
<page>
<title>sendpage-redirect test</title>
<content>
<para>Test harness for
- <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26571";>
+ <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26571";>
bugzilla 26571
</a>, redirecting from within a flow-called pipeline fails.
</para>
@@ -33,4 +33,4 @@
</ul>
</para>
</content>
-</page>
\ No newline at end of file
+</page>
Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/text-wrap/welcome.html
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/text-wrap/welcome.html
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/text-wrap/welcome.html
Tue Nov 16 15:46:46 2004
@@ -25,7 +25,7 @@
which can make the resulting pages too wide to view on screen or to print.
The width of the long source line causes the whole page layout to be that
same width. A web page that is wider than the screen is a complete bastard to
-read - you have to scroll right and left all the time. And printing in
+read - you have to scroll right and left all the time. And printing in
landscape orientation is not very nice either.
(See Bugzilla report
<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23796";>23796</a>.)
@@ -53,7 +53,7 @@
The following examples are deliberately extreme to ensure that the issues
are triggered.
</p>
-
+
<h2>Using no special handling</h2>
<p>No special handling was done for the
<source> elements. The content is wrapped with a <pre> element.
@@ -118,7 +118,7 @@
Sequences of two consecutive spaces are replaced by a non-breaking space
and a regular space.
Each line is encased in a <code><br/>
-This method keeps the text indentation that would be obtained with a
<pre>
+This method keeps the text indentation that would be obtained with a
<pre>
while still allowing line wrapping by the browser.
This utilises the <a href="http://exslt.org/";>exslt extension</a> for strings.
</p>
@@ -150,7 +150,7 @@
<p>
See the Bugzilla report
-(<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23796";>23796</a>)
+(<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23796";>23796</a>)
and the links to the cocoon-dev and forrest-dev mail discussion.
</p>
Modified:
cocoon/branches/BRANCH_2_1_X/src/webapp/stylesheets/system/error2html.xslt
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/stylesheets/system/error2html.xslt
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/stylesheets/system/error2html.xslt
Tue Nov 16 15:46:46 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- CVS $Id: error2html.xslt,v 1.17 2004/03/06 02:25:41 antonio Exp $ -->
+<!-- CVS $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
@@ -88,7 +88,7 @@
<p>
If you think you found a bug, please report it to
- <a href="http://nagoya.apache.org/bugzilla/";>Apache's Bugzilla</a>;
+ <a href="http://issues.apache.org/bugzilla/";>Apache's Bugzilla</a>;
a message will automatically be sent to the developer mailing list
and you'll
be kept in contact automatically with the further progress on that
bug.
</p>
