unico 2004/03/10 05:36:09
Modified: src/webapp/samples/modules menu.xml sitemap.xmap index.xhtml
Added: src/webapp/samples/modules properties.xml
Removed: src/webapp/samples/modules properties.xsp
Log:
remove dependency on XSP from modules samples
Revision Changes Path
1.11 +14 -14 cocoon-2.1/src/webapp/samples/modules/menu.xml
Index: menu.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/modules/menu.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- menu.xml 6 Mar 2004 02:26:06 -0000 1.10
+++ menu.xml 10 Mar 2004 13:36:09 -0000 1.11
@@ -22,24 +22,24 @@
>
<menu label="Overview">
- <menu-item label="Index" href="index.xsp"/>
+ <menu-item label="Index" href="index.html"/>
<menu-item label="Sitemap" href="sitemap.xmap"/>
</menu>
<menu label="Modules">
- <menu-item label="RequestModule" href="request.xsp"/>
- <menu-item label="BaseLinkModule" href="baselink.xsp"/>
- <menu-item label="RequestParameterModule" href="requestparam"/>
- <menu-item label="DateInputModule" href="date.xsp"/>
- <menu-item label="DefaultsModule" href="defaults.xsp"/>
- <menu-item label="SessionModule" href="session.xsp"/>
- <menu-item label="SessionAttributeModule" href="session-attr.xsp"/>
- <menu-item label="SystemPropertyModule" href="system-property.xsp"/>
- <menu-item label="XMLFileModule" href="xml.xsp"/>
- <menu-item label="ChainMetaModule" href="chain.xsp"/>
- <menu-item label="RandomNumberModule" href="randomnumber.xsp"/>
- <menu-item label="RealPathModule" href="realpath.xsp"/>
- <menu-item label="PropertiesFileModule" href="properties.xsp"/>
+ <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>
<menu label="Documentation">
1.9 +34 -35 cocoon-2.1/src/webapp/samples/modules/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/modules/sitemap.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sitemap.xmap 6 Mar 2004 02:26:06 -0000 1.8
+++ sitemap.xmap 10 Mar 2004 13:36:09 -0000 1.9
@@ -27,8 +27,8 @@
<!-- 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/{../0}"/>
- <map:part src="cocoon:/content/{../0}" label="content"/>
+ <map:part src="cocoon:/menu/{../1}.xml"/>
+ <map:part src="cocoon:/content/{../1}.xml" label="content"/>
</map:aggregate>
<map:transform src="site2html.xsl">
<map:parameter name="page" value="{../0}" />
@@ -43,21 +43,20 @@
<!-- Default URL matcher. Matches '/' URLs-->
<map:match pattern="">
- <map:redirect-to uri="index.xsp" />
+ <map:redirect-to uri="index.html" />
</map:match>
- <!-- Generate dynamic output (simple.xsp) -->
- <map:match pattern="*.xsp">
+ <map:match pattern="*.html">
<map:call resource="composite" />
</map:match>
- <map:match pattern="content/index.xsp">
+ <map:match pattern="content/index.xml">
<map:generate src="index.xhtml"/>
<map:serialize/>
</map:match>
- <map:match pattern="content/request.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/request.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="attributeNames"
value="{request:attributeNames}"/>
<map:parameter name="authType" value="{request:authType}"/>
<map:parameter name="characterEncoding"
value="{request:characterEncoding}"/>
@@ -100,8 +99,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/baselink.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/baselink.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="(anything)" value="{baselink:}"/>
</map:generate>
@@ -116,10 +115,10 @@
</map:match>
<map:match pattern="requestparam">
- <map:redirect-to
uri="requestparam.xsp?foo=foo+param&bar=bar+param"/>
+ <map:redirect-to
uri="requestparam.xml?foo=foo+param&bar=bar+param"/>
</map:match>
- <map:match pattern="content/requestparam.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/requestparam.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="foo" value="{request-param:foo}"/>
<map:parameter name="bar" value="{request-param:bar}"/>
</map:generate>
@@ -132,8 +131,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/session.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/session.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="attributeNames"
value="{session:attributeNames}"/>
<map:parameter name="creationTime" value="{session:creationTime}"/>
<map:parameter name="lastAccessedTime"
value="{session:lastAccessedTime}"/>
@@ -149,8 +148,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/system-property.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/system-property.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="java.version"
value="{system-property:java.version}"/>
<map:parameter name="java.vendor"
value="{system-property:java.vendor}"/>
<map:parameter name="java.vendor.url"
value="{system-property:java.vendor.url}"/>
@@ -186,8 +185,8 @@
</map:match>
- <map:match pattern="content/xml.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/xml.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="/forrestconf/@version"
value="{myxml:/forrestconf/@version}"/>
<map:parameter name="/forrestconf/skin"
value="{myxml:/forrestconf/skin}"/>
<map:parameter name="/*/base-url" value="{myxml:/*/base-url}"/>
@@ -205,8 +204,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/defaults.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/defaults.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="skin" value="{defaults:skin}"/>
<map:parameter name="base-url" value="{defaults:base-url}"/>
</map:generate>
@@ -220,8 +219,8 @@
</map:match>
- <map:match pattern="content/chain.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/chain.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="skin" value="{chain:skin}"/>
</map:generate>
<map:transform src="properties2html.xsl">
@@ -239,8 +238,8 @@
</map:match>
- <map:match pattern="content/date.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/date.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="date" value="{date:date}"/>
</map:generate>
<map:transform src="properties2html.xsl">
@@ -251,8 +250,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/session-attr.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/session-attr.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="fruit" value="{session-attr:fruit}"/>
</map:generate>
<map:transform src="properties2html.xsl">
@@ -264,8 +263,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/randomnumber.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/randomnumber.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="x" value="{random:x}"/>
</map:generate>
<map:transform src="properties2html.xsl">
@@ -277,8 +276,8 @@
</map:match>
- <map:match pattern="content/realpath.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/realpath.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="/" value="{realpath:/}"/>
<map:parameter name="/images" value="{realpath:/images}"/>
<map:parameter name="/WEB-INF" value="{realpath:/WEB-INF}"/>
@@ -291,8 +290,8 @@
<map:serialize />
</map:match>
- <map:match pattern="content/properties.xsp">
- <map:generate type="serverpages" src="properties.xsp">
+ <map:match pattern="content/properties.xml">
+ <map:generate type="jx" src="properties.xml">
<map:parameter name="name" value="{cocoon-properties:name}"/>
<map:parameter name="Name" value="{cocoon-properties:Name}"/>
<map:parameter name="fullname"
value="{cocoon-properties:fullname}"/>
@@ -302,7 +301,7 @@
</map:generate>
<map:transform src="properties2html.xsl">
<map:parameter name="title" value="Properties File Module
- (PropertiesFileModule)"/>
+ (PropertiesFileModule)"/>
<map:parameter name="description" value="PropertiesFileModule
provides access
to properties from a properties file. In this example the keys
identify properties in
resource://org/apache/cocoon/cocoon.properties"/>
1.8 +12 -12 cocoon-2.1/src/webapp/samples/modules/index.xhtml
Index: index.xhtml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/modules/index.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- index.xhtml 6 Mar 2004 06:16:51 -0000 1.7
+++ index.xhtml 10 Mar 2004 13:36:09 -0000 1.8
@@ -29,11 +29,11 @@
<th>Description</th>
</tr>
<tr>
- <td><a href="request.xsp">request</a></td>
+ <td><a href="request.html">request</a></td>
<td>Request object properties</td>
</tr>
<tr>
- <td><a href="baselink.xsp">baselink</a></td>
+ <td><a href="baselink.html">baselink</a></td>
<td>BaseLink properties</td>
</tr>
<tr>
@@ -42,43 +42,43 @@
</tr>
<tr>
- <td><a href="defaults.xsp">defaults</a></td>
+ <td><a href="defaults.html">defaults</a></td>
<td>Default (static) values</td>
</tr>
<tr>
- <td><a href="date.xsp">date</a></td>
+ <td><a href="date.html">date</a></td>
<td>Date</td>
</tr>
<tr>
- <td><a href="session.xsp">session</a></td>
+ <td><a href="session.html">session</a></td>
<td>Session object properties</td>
</tr>
<tr>
- <td><a href="session-attr.xsp">session-attr</a></td>
+ <td><a href="session-attr.html">session-attr</a></td>
<td>Session attributes</td>
</tr>
<tr>
- <td><a href="system-property.xsp">system-property</a></td>
+ <td><a href="system-property.html">system-property</a></td>
<td>System properties (environment variables)</td>
</tr>
<tr>
- <td><a href="xml.xsp">xml</a></td>
+ <td><a href="xml.html">xml</a></td>
<td>XML node values</td>
</tr>
<tr>
- <td><a href="chain.xsp">chain</a></td>
+ <td><a href="chain.html">chain</a></td>
<td>Chained values</td>
</tr>
<tr>
- <td><a href="randomnumber.xsp">randomnumber</a></td>
+ <td><a href="randomnumber.html">randomnumber</a></td>
<td>Random number</td>
</tr>
<tr>
- <td><a href="realpath.xsp">realpath</a></td>
+ <td><a href="realpath.html">realpath</a></td>
<td>Real filesystem paths of context paths</td>
</tr>
<tr>
- <td><a href="properties.xsp">properties</a></td>
+ <td><a href="properties.html">properties</a></td>
<td>Properties file values</td>
</tr>
</table>
1.1 cocoon-2.1/src/webapp/samples/modules/properties.xml
Index: properties.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
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.
-->
<!-- $Id: properties.xml,v 1.1 2004/03/10 13:36:09 unico Exp $ -->
<properties xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
<jx:forEach var="name" items="${parameters.names}">
<property>
<name>${name}</name>
<value>${parameters.getParameter(name)}</value>
</property>
</jx:forEach>
</properties>
