You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/11/14 20:17:52 UTC
svn commit: rev 65615 - in cocoon/branches/BRANCH_2_1_X/src/blocks/taglib: conf samples
Author: vgritsenko
Date: Sun Nov 14 11:17:52 2004
New Revision: 65615
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/taglib.xsamples
- copied, changed from rev 57549, cocoon/branches/BRANCH_2_1_X/src/blocks/batik/conf/batik.xsamples
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml
- copied, changed from rev 57549, cocoon/branches/BRANCH_2_1_X/src/blocks/batik/samples/samples.xml
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/jxpath.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/TaglibTest.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-s.xhtml
cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml
Log:
cleanup
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/jxpath.xconf
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/jxpath.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/jxpath.xconf Sun Nov 14 11:17:52 2004
@@ -17,7 +17,7 @@
<xconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.jxpath.JXPathCocoonContexts']">
- <component role="org.apache.cocoon.jxpath.JXPathCocoonContexts"
- class="org.apache.cocoon.jxpath.JXPathCocoonContexts"
- logger="core.jxpath"/>
+ <component role="org.apache.cocoon.jxpath.JXPathCocoonContexts"
+ class="org.apache.cocoon.jxpath.JXPathCocoonContexts"
+ logger="core.jxpath"/>
</xconf>
Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/taglib.xsamples (from rev 57549, cocoon/branches/BRANCH_2_1_X/src/blocks/batik/conf/batik.xsamples)
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/conf/batik.xsamples (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/conf/taglib.xsamples Sun Nov 14 11:17:52 2004
@@ -15,12 +15,11 @@
limitations under the License.
-->
-<xsamples xpath="/samples" unless="group[@name='Batik']">
+<xsamples xpath="/samples" unless="group[@name='Taglib']">
- <group name="Batik">
- <sample name="Batik Block" href="batik/">
- Examples of rasterized SVG images.
+ <group name="Taglib">
+ <sample name="Taglib Block" href="taglib/">
+ Examples of taglib transformer usage.
</sample>
</group>
-
</xsamples>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/TaglibTest.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/TaglibTest.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/TaglibTest.xhtml Sun Nov 14 11:17:52 2004
@@ -14,50 +14,46 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:xlink="http://www.w3.org/1999/xlink">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
- <title>Taglib Samples Intro</title>
- </head>
- <body bgcolor="#ffffff">
-
- Samples to explain the possibilities of Tags
-
-
- <table width="100%" align="center" cellpadding="2" cellspacing="2" border="1">
- <tbody>
- <tr>
- <td align="center" width="50%">
- <a href="parent.xhtml">ParentResolving and Iteration</a>
- </td>
- <td align="center" width="50%">
- LocaleTag in Kombination with MonthTag
- </td>
- </tr>
-
- <tr>
- <td align="center" width="50%">
- <a href="variable-p.xhtml">XPath-Resolving and Variables</a>
- </td>
- <td align="center" width="50%">
- OutTag
- </td>
- </tr>
-
- </tbody>
- </table>
-
- <p align="center">
- <br />
-
- <font size="-1">Copyright © @year@
- <a href="http://www.apache.org/">The Apache Software Foundation</a>.
- <br />
-
- All rights reserved.</font>
- </p>
- </body>
+<html xmlns:xlink="http://www.w3.org/1999/xlink">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Taglib Samples Intro</title>
+ </head>
+
+ <body bgcolor="#ffffff">
+ Samples to explain the possibilities of Tags
+ <table width="100%" align="center" cellpadding="2" cellspacing="2" border="1">
+ <tbody>
+ <tr>
+ <td align="center" width="50%">
+ <a href="parent.xhtml">ParentResolving and Iteration</a>
+ </td>
+ <td align="center" width="50%">
+ LocaleTag in Kombination with MonthTag
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center" width="50%">
+ <a href="variable-p.xhtml">XPath-Resolving and Variables</a>
+ </td>
+ <td align="center" width="50%">
+ OutTag
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <p align="center">
+ <br />
+
+ <font size="-1">Copyright © @year@
+ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
+ <br />
+
+ All rights reserved.</font>
+ </p>
+ </body>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/parent.xhtml Sun Nov 14 11:17:52 2004
@@ -14,104 +14,100 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+ xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
+ xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+
+ <title>Tag Test</title>
+ <h2>tag test</h2>
+ <i18n:locale localeRef="$session/locale" >
- <title>Tag Test</title>
- <h2>tag test</h2>
- <i18n:locale localeRef="$session/locale" >
-
- <h3>forEach</h3>
- <p>
-
- <table border="1" cellspaceing="0" cellpadding="5">
- <tr>
- <td>
- <ul>
- <jxpath:forEach varStatus="n" var="i" begin="2" end="10" step="2">
- <li><jxpath:out value="$n/count" />. that's number <jxpath:out value="i" /></li>
- </jxpath:forEach>
- </ul>
- </td>
- <td>
- <ul><br/>
- <jxpath:forEach varStatus="n" var="i" begin="2" end="10" step="2">
-<br/>       <li><jxpath:out value="$n/count"
-/>. that's number <jxpath:out value="i" /></li>
-<br/></jxpath:forEach><br/>
- </ul>
- </td>
- </tr>
- </table>
- </p>
-
- <ul>
- <jxpath:forEach varStatus="n" var="i" items="$request/BrowserLocales" >
- <li><jxpath:out value="$n/count" />. <jxpath:out value="$i/language" /></li>
- </jxpath:forEach>
- </ul>
-
-
- <ul>
- <jxpath:forEach varStatus="n" var="j" items="$session/RequestInfo" >
- <li><jxpath:out value="$n/count" />. <jxpath:out value="j" /></li>
- </jxpath:forEach>
- </ul>
-
- <jxpath:out value="$session/RequestInfo[5]/language" />
-
- <h3>locale</h3>
- <i18n:locale language="en">
- <p>
- <form>
- <table border="1" >
- <tr>
- <i18n:locale>
- <td>session language</td>
- <td>
- <select size="1" name="month">
- <dt:months var="mon">
- <option><jxpath:out value="$mon/month" /></option>
- </dt:months>
- </select>
- </td>
- </i18n:locale>
- </tr>
- <tr>
- <i18n:locale language="de" country="DE">
- <td>german</td>
- <td>
- <select size="1" name="month">
- <dt:months var="mon">
- <option><jxpath:out value="$mon/month" /></option>
- </dt:months>
- </select>
- </td>
- </i18n:locale>
- </tr>
- <tr>
- <td colspan="2">
- <i18n:locale><br/>
- <td><br/>
- <select size="1" name="month"><br/>
- <dt:months var="mon"><br/>
- <option><jxpath:out value="$mon/month" /></option><br/>
- </dt:months><br/>
- </select><br/>
- </td><br/>
- </i18n:locale><br/>
- </td>
- </tr>
- </table>
- </form>
- </p>
- </i18n:locale>
+ <h3>forEach</h3>
+ <p>
+ <table border="1" cellspaceing="0" cellpadding="5">
+ <tr>
+ <td>
+ <ul>
+ <jxpath:forEach varStatus="n" var="i" begin="2" end="10" step="2">
+ <li><jxpath:out value="$n/count" />. that's number <jxpath:out value="i" /></li>
+ </jxpath:forEach>
+ </ul>
+ </td>
+ <td>
+ <ul><br/>
+ <jxpath:forEach varStatus="n" var="i" begin="2" end="10" step="2">
+ <br/>       <li><jxpath:out value="$n/count"
+ />. that's number <jxpath:out value="i" /></li>
+ <br/></jxpath:forEach><br/>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ </p>
+ <ul>
+ <jxpath:forEach varStatus="n" var="i" items="$request/BrowserLocales" >
+ <li><jxpath:out value="$n/count" />. <jxpath:out value="$i/language" /></li>
+ </jxpath:forEach>
+ </ul>
+
+ <ul>
+ <jxpath:forEach varStatus="n" var="j" items="$session/RequestInfo">
+ <li><jxpath:out value="$n/count" />. <jxpath:out value="j" /></li>
+ </jxpath:forEach>
+ </ul>
+
+ <jxpath:out value="$session/RequestInfo[5]/language" />
+ <h3>locale</h3>
+ <i18n:locale language="en">
+ <p>
+ <form>
+ <table border="1" >
+ <tr>
+ <i18n:locale>
+ <td>session language</td>
+ <td>
+ <select size="1" name="month">
+ <dt:months var="mon">
+ <option><jxpath:out value="$mon/month" /></option>
+ </dt:months>
+ </select>
+ </td>
+ </i18n:locale>
+ </tr>
+ <tr>
+ <i18n:locale language="de" country="DE">
+ <td>german</td>
+ <td>
+ <select size="1" name="month">
+ <dt:months var="mon">
+ <option><jxpath:out value="$mon/month" /></option>
+ </dt:months>
+ </select>
+ </td>
+ </i18n:locale>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <i18n:locale><br/>
+ <td><br/>
+ <select size="1" name="month"><br/>
+ <dt:months var="mon"><br/>
+ <option><jxpath:out value="$mon/month" /></option><br/>
+ </dt:months><br/>
+ </select><br/>
+ </td><br/>
+ </i18n:locale><br/>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </p>
+ </i18n:locale>
</i18n:locale>
<p>
- <a href="TaglibTest.xhtml">Back</a>
+ <a href="TaglibTest.xhtml">Back</a>
</p>
-
</html>
Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml (from rev 57549, cocoon/branches/BRANCH_2_1_X/src/blocks/batik/samples/samples.xml)
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/samples/samples.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/samples.xml Sun Nov 14 11:17:52 2004
@@ -15,77 +15,21 @@
limitations under the License.
-->
-<!-- CVS $Id: samples.xml,v 1.9 2004/05/23 07:17:29 antonio Exp $ -->
+<!-- CVS $Id$ -->
-<samples name="Batik Block Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
+<samples name="Taglib Block Samples" xmlns:xlink="http://www.w3.org/1999/xlink">
<group name="Back">
<sample name="Back" href="../..">to Cocoon Samples main page</sample>
<sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
</group>
- <group name="Hello World!">
- <sample name="SVG" href="hello.svg">
- SVG from the main samples
+ <group name="Taglib Samples">
+ <sample name="Parent" href="parent.xhtml">
+ ParentResolving and Iteration. Uses LocaleTag in combination with MonthTag
</sample>
- <sample name="JPG" href="hello.jpeg">
- Same hello in JPG format
- </sample>
- <sample name="PNG" href="hello.png">
- Hello in PNG format
- </sample>
- </group>
-
- <group name="Batik Logo">
- <sample name="Batik Logo in SVG" href="batikLogo.svg">
- Batik logo as it is in SVG (SVG browser, plugin, viewer needed).
- </sample>
- <sample name="Batik Logo in JPEG" href="batikLogo.jpeg">
- Batik logo rasterized with Batik to JPEG.
- </sample>
- <sample name="Batik Logo in PNG" href="batikLogo.png">
- Batik logo rasterized with Batik to PNG.
- </sample>
- </group>
-
- <group name="Henry V">
- <sample name="Henry V in SVG" href="henryV.svg">
- Henry V as it is in SVG (SVG browser, plugin, viewer needed).
- </sample>
- <sample name="Henry V in JPEG" href="henryV.jpeg">
- Henry V rasterized with Batik to JPEG.
- </sample>
- <sample name="Henry V in PNG" href="henryV.png">
- Henry V rasterized with Batik to PNG.
- </sample>
- </group>
-
- <group name="Anne's Portrait">
- <note>Note: You can refer to other SVG files. anne.svg refers to
- batikLogo.svg to draw batik 'stamp' in the lower right corner.</note>
- <sample name="Anne in SVG" href="anne.svg">
- Portrait as it is in SVG (SVG browser, plugin, viewer needed).
- </sample>
- <sample name="Anne in JPEG" href="anne.jpeg">
- Portrait rasterized with Batik to JPEG.
- </sample>
- <sample name="Anne in PNG" href="anne.png">
- Portrait rasterized with Batik to PNG.
- </sample>
- </group>
-
- <group name="Resources">
- <sample name="SVG Specification" href="http://www.w3.org/TR/SVG/">
- Scalable Vector Graphics (SVG) 1.0 Specification
- </sample>
- <sample name="Batik web site" href="http://xml.apache.org/batik">
- Links and reference information, SVG browser
- </sample>
- <sample name="Adobe SVG Viewer" href="http://www.adobe.com/svg/viewer/install/main.html">
- SVG browser plugin
- </sample>
- <sample name="Mozilla SVG Project" href="http://www.mozilla.org/projects/svg/">
- Mozilla with native SVG support
+ <sample name="Variables" href="variable-p.xhtml">
+ XPath-Resolving and Variables. Uses OutTag.
</sample>
</group>
</samples>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/sitemap.xmap
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/sitemap.xmap Sun Nov 14 11:17:52 2004
@@ -14,16 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:components>
- <map:transformers>
+ <map:transformers default="xslt">
<!-- FIXME: pool-min="0" because of recursive lookup & some problem in Avalon -->
<map:transformer name="tag" src="org.apache.cocoon.transformation.TagTransformer" pool-max="64" pool-min="0" pool-grow="2" logger="sitemap.transformer.newtag">
<transformer-hint>tag</transformer-hint>
</map:transformer>
- </map:transformers>
- <map:actions>
+ </map:transformers>
+ <map:actions>
<map:action name="tagtest" logger="sitemap.action.locale" src="org.apache.cocoon.taglib.test.acting.TagtestAction" />
<map:action name="locale" logger="sitemap.action.locale" src="org.apache.cocoon.acting.LocaleAction">
<store-in-session>true</store-in-session>
@@ -34,12 +35,24 @@
<map:pipelines>
<map:pipeline>
+ <map:match pattern="">
+ <map:redirect-to uri="welcome"/>
+ </map:match>
+
+ <map:match pattern="welcome">
+ <map:generate src="samples.xml"/>
+ <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
<map:match pattern="**.xhtml">
- <map:act type="locale" />
- <map:act type="tagtest" />
+ <map:act type="locale"/>
+ <map:act type="tagtest"/>
<map:generate src="{1}.xhtml"/>
- <map:transform type="tag" label="tag" />
- <map:serialize />
+ <map:transform type="tag" label="tag"/>
+ <map:serialize/>
</map:match>
</map:pipeline>
</map:pipelines>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-p.xhtml Sun Nov 14 11:17:52 2004
@@ -14,40 +14,46 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+ xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
+ xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+
+ <title>Tag Test</title>
+ <h2>tag test</h2>
- <title>Tag Test</title>
- <h2>tag test</h2>
- <string:trim var="p">pipeline</string:trim>
- <string:trim var="$request/r">request</string:trim>
- <string:trim var="$session/s">session</string:trim>
- <string:trim var="$application/a">application</string:trim>
-
- <h3>variables in pipeline</h3>
- <p>
- <table>
- <tr>
- <td>pipeline: </td><td><jxpath:out value="p" /></td>
+ <string:trim var="p">pipeline</string:trim>
+ <string:trim var="$request/r">request</string:trim>
+ <string:trim var="$session/s">session</string:trim>
+ <string:trim var="$application/a">application</string:trim>
+
+ <h3>variables in pipeline</h3>
+ <p>
+ <table>
+ <tr>
+ <td>pipeline:</td>
+ <td><jxpath:out value="p" /></td>
</tr>
- <tr>
- <td>request: </td><td><jxpath:out value="$request/r" /></td>
+ <tr>
+ <td>request:</td>
+ <td><jxpath:out value="$request/r" /></td>
</tr>
- <tr>
- <td>session: </td><td><jxpath:out value="$session/s" /></td>
+ <tr>
+ <td>session:</td>
+ <td><jxpath:out value="$session/s" /></td>
</tr>
- <tr>
- <td>application: </td><td><jxpath:out value="$application/a" /></td>
+ <tr>
+ <td>application:</td>
+ <td><jxpath:out value="$application/a" /></td>
</tr>
- </table>
- </p>
+ </table>
+ </p>
+
+ <a href="variable-p.xhtml">pipeline</a>
+ <a href="variable-r.xhtml">request</a>
+ <a href="variable-s.xhtml">session & application</a>
- <a href="variable-p.xhtml">pipeline</a>
- <a href="variable-r.xhtml">request</a>
- <a href="variable-s.xhtml">session & application</a>
- <p>
- <a href="TaglibTest.xhtml">Back</a>
- </p>
-
+ <p>
+ <a href="TaglibTest.xhtml">Back</a>
+ </p>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-r.xhtml Sun Nov 14 11:17:52 2004
@@ -14,24 +14,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+ xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
+ xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+
+ <title>Tag Test</title>
+ <h2>tag test</h2>
+
+ <string:trim var="p">pipeline</string:trim>
+ <string:trim var="$request/r">request</string:trim>
+
+ <h3>variables in request</h3>
+ <p>
+ <core:source src="variable.xhtml"/>
+ </p>
+
+ <a href="variable-p.xhtml">pipeline</a>
+ <a href="variable-r.xhtml">request</a>
+ <a href="variable-s.xhtml">session & application</a>
- <title>Tag Test</title>
- <h2>tag test</h2>
- <string:trim var="p">pipeline</string:trim>
- <string:trim var="$request/r">request</string:trim>
-
- <h3>variables in request</h3>
- <p>
- <core:source src="variable.xhtml" />
- </p>
-
- <a href="variable-p.xhtml">pipeline</a>
- <a href="variable-r.xhtml">request</a>
- <a href="variable-s.xhtml">session & application</a>
- <p>
- <a href="TaglibTest.xhtml">Back</a>
- </p>
+ <p>
+ <a href="TaglibTest.xhtml">Back</a>
+ </p>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-s.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-s.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable-s.xhtml Sun Nov 14 11:17:52 2004
@@ -14,38 +14,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+ xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
+ xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
- <title>Tag Test</title>
- <h2>tag test</h2>
+ <title>Tag Test</title>
+ <h2>tag test</h2>
- <h3>variables in session & application</h3>
- <p>
- <table>
+ <h3>variables in session & application</h3>
+ <p>
+ <table>
<!--
- <tr>
- <td>pipeline: </td><td><jxpath:out value="p" /></td>
+ <tr>
+ <td>pipeline: </td><td><jxpath:out value="p" /></td>
</tr>
-->
- <tr>
- <td>request: </td><td><jxpath:out value="$request/r" /></td>
+ <tr>
+ <td>request:</td>
+ <td><jxpath:out value="$request/r"/></td>
</tr>
- <tr>
- <td>session: </td><td><jxpath:out value="$session/s" /></td>
+ <tr>
+ <td>session:</td>
+ <td><jxpath:out value="$session/s"/></td>
</tr>
- <tr>
- <td>application: </td><td><jxpath:out value="$application/a" /></td>
+ <tr>
+ <td>application:</td>
+ <td><jxpath:out value="$application/a"/></td>
</tr>
- </table>
- </p>
-
- <a href="variable-p.xhtml">pipeline</a>
- <a href="variable-r.xhtml">request</a>
- <a href="variable-s.xhtml">session & application</a>
- <p>
- <a href="TaglibTest.xhtml">Back</a>
- </p>
-
+ </table>
+ </p>
+
+ <a href="variable-p.xhtml">pipeline</a>
+ <a href="variable-r.xhtml">request</a>
+ <a href="variable-s.xhtml">session & application</a>
+
+ <p>
+ <a href="TaglibTest.xhtml">Back</a>
+ </p>
</html>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/taglib/samples/variable.xhtml Sun Nov 14 11:17:52 2004
@@ -14,23 +14,26 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<html xmlns:core="urn:apache:taglib:core" xmlns:dt="urn:apache:taglib:datetime"
- xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
- xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
+ xmlns:i18n="urn:apache:taglib:i18n" xmlns:jxpath="urn:apache:taglib:jxpath:core"
+ xmlns:string="urn:apache:taglib:string" xmlns:test="urn:apache:taglib:test">
- <table>
- <!-- tr>
- <td>pipeline: </td><td><jxpath:out value="p" /></td>
- </tr -->
- <tr>
- <td>request: </td><td><jxpath:out value="$request/r" /></td>
- </tr>
- <tr>
- <td>session: </td><td><jxpath:out value="$session/s" /></td>
- </tr>
- <tr>
- <td>application: </td><td><jxpath:out value="$application/a" /></td>
- </tr>
- </table>
-
+ <table>
+ <!-- tr>
+ <td>pipeline: </td><td><jxpath:out value="p" /></td>
+ </tr -->
+ <tr>
+ <td>request:</td>
+ <td><jxpath:out value="$request/r" /></td>
+ </tr>
+ <tr>
+ <td>session:</td>
+ <td><jxpath:out value="$session/s" /></td>
+ </tr>
+ <tr>
+ <td>application:</td>
+ <td><jxpath:out value="$application/a" /></td>
+ </tr>
+ </table>
</html>