Author: antonio Date: Mon Nov 15 22:18:40 2004 New Revision: 75987 Modified: cocoon/trunk/src/blocks/mail/samples/mail/sitemap.xmap cocoon/trunk/status.xml Log: Fix #32124: Webmail sample broken
Modified: cocoon/trunk/src/blocks/mail/samples/mail/sitemap.xmap ============================================================================== --- cocoon/trunk/src/blocks/mail/samples/mail/sitemap.xmap (original) +++ cocoon/trunk/src/blocks/mail/samples/mail/sitemap.xmap Mon Nov 15 22:18:40 2004 @@ -130,8 +130,8 @@ <map:match pattern="page-mail/*-head-col-1"> <map:select type="resource-exists"> <map:when test="docs/head-col-1/{1}.xsp"> - <map:call resource="load-xsp-page"> - <map:parameter name="sect" value="head-col-1"/> + <map:call resource="load-xsp-page"> + <map:parameter name="sect" value="head-col-1"/> <map:parameter name="page" value="{1}"/> <map:parameter name="resource-exists" value="true"/> </map:call> @@ -141,7 +141,7 @@ <map:parameter name="sect" value="head-col-1"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> @@ -162,11 +162,11 @@ </map:call> </map:when> <map:otherwise> - <map:call resource="load-xsp-page"> - <map:parameter name="sect" value="mid-col-1"/> + <map:call resource="load-xsp-page"> + <map:parameter name="sect" value="mid-col-1"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> @@ -211,11 +211,11 @@ <map:match pattern="page-mail/*-mid-col-2"> <map:select type="resource-exists"> <map:when test="docs/mid-col-2/{1}.xsp"> - <map:call resource="load-xsp-page"> - <map:parameter name="sect" value="mid-col-2"/> + <map:call resource="load-xsp-page"> + <map:parameter name="sect" value="mid-col-2"/> <map:parameter name="page" value="{1}"/> - <map:parameter name="resource-exists" value="{resource-exists}"/> - </map:call> + <map:parameter name="resource-exists" value="true"/> + </map:call> </map:when> <map:otherwise> <map:call resource="load-xsp-page"> @@ -230,8 +230,8 @@ <map:match pattern="page-mail/*-mid-col-3"> <map:select type="resource-exists"> <map:when test="docs/mid-col-3/{1}.xml"> - <map:call resource="load-page"> - <map:parameter name="sect" value="mid-col-3"/> + <map:call resource="load-page"> + <map:parameter name="sect" value="mid-col-3"/> <map:parameter name="page" value="{1}"/> <map:parameter name="resource-exists" value="true"/> </map:call> @@ -241,10 +241,49 @@ <map:parameter name="sect" value="mid-col-3"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> + </map:call> + </map:otherwise> + </map:select> + </map:match> + + <map:match pattern="page-mail/*-top-col-1"> + <map:select type="resource-exists"> + <map:when test="docs/top-col-1/{1}.xml"> + <map:call resource="load-page"> + <map:parameter name="sect" value="top-col-1"/> + <map:parameter name="page" value="{1}"/> + <map:parameter name="resource-exists" value="true"/> + </map:call> + </map:when> + <map:otherwise> + <map:call resource="load-page"> + <map:parameter name="sect" value="top-col-1"/> + <map:parameter name="page" value="index"/> + <map:parameter name="resource-exists" value="true"/> + </map:call> + </map:otherwise> + </map:select> + </map:match> + + <map:match pattern="page-mail/*-bottom-col-1"> + <map:select type="resource-exists"> + <map:when test="docs/bottom-col-1/{1}.xml"> + <map:call resource="load-page"> + <map:parameter name="sect" value="bottom-col-1"/> + <map:parameter name="page" value="{1}"/> + <map:parameter name="resource-exists" value="true"/> + </map:call> + </map:when> + <map:otherwise> + <map:call resource="load-page"> + <map:parameter name="sect" value="bottom-col-1"/> + <map:parameter name="page" value="index"/> + <map:parameter name="resource-exists" value="true"/> </map:call> </map:otherwise> </map:select> </map:match> + </map:pipeline> <!-- general page section handling @@ -259,8 +298,8 @@ <map:match pattern="page-*-top-col-1"> <map:select type="resource-exists"> <map:when test="docs/top-col-1/{1}.xml"> - <map:call resource="load-page"> - <map:parameter name="sect" value="top-col-1"/> + <map:call resource="load-page"> + <map:parameter name="sect" value="top-col-1"/> <map:parameter name="page" value="{1}"/> <map:parameter name="resource-exists" value="true"/> </map:call> @@ -270,7 +309,7 @@ <map:parameter name="sect" value="top-col-1"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> @@ -285,11 +324,11 @@ </map:call> </map:when> <map:otherwise> - <map:call resource="load-page"> - <map:parameter name="sect" value="head-col-1"/> + <map:call resource="load-page"> + <map:parameter name="sect" value="head-col-1"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> @@ -297,8 +336,8 @@ <map:match pattern="page-*-mid-col-1"> <map:select type="resource-exists"> <map:when test="docs/mid-col-1/{1}.xml"> - <map:call resource="load-page"> - <map:parameter name="sect" value="mid-col-1"/> + <map:call resource="load-page"> + <map:parameter name="sect" value="mid-col-1"/> <map:parameter name="page" value="{1}"/> <map:parameter name="resource-exists" value="true"/> </map:call> @@ -308,7 +347,7 @@ <map:parameter name="sect" value="mid-col-1"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> @@ -321,8 +360,8 @@ <map:match pattern="page-*-mid-col-3"> <map:select type="resource-exists"> <map:when test="docs/mid-col-3/{1}.xml"> - <map:call resource="load-page"> - <map:parameter name="sect" value="mid-col-3"/> + <map:call resource="load-page"> + <map:parameter name="sect" value="mid-col-3"/> <map:parameter name="page" value="{1}"/> <map:parameter name="resource-exists" value="true"/> </map:call> @@ -332,7 +371,7 @@ <map:parameter name="sect" value="mid-col-3"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> @@ -349,11 +388,11 @@ </map:call> </map:when> <map:otherwise> - <map:call resource="load-page"> - <map:parameter name="sect" value="bottom-col-1"/> + <map:call resource="load-page"> + <map:parameter name="sect" value="bottom-col-1"/> <map:parameter name="page" value="index"/> <map:parameter name="resource-exists" value="true"/> - </map:call> + </map:call> </map:otherwise> </map:select> </map:match> Modified: cocoon/trunk/status.xml ============================================================================== --- cocoon/trunk/status.xml (original) +++ cocoon/trunk/status.xml Mon Nov 15 22:18:40 2004 @@ -368,8 +368,11 @@ </action> </release> <release version="2.1.6" date="TBD"> + <action dev="AG" type="fix" fixes-bug="32124" due-to="Leo Leonid" due-to-email="[EMAIL PROTECTED]"> + Fix: Webmail sample broken. + </action> <action dev="AG" type="fix" fixes-bug="32214" due-to="Rick Tessner" due-to-email="[EMAIL PROTECTED]"> - Context directory not required to be writable by the CLI + Fix: Context directory not required to be writable by the CLI </action> <action dev="CZ" type="fix" fixes-bug="32199"> Portal: If a coplet has an error, the error-uri has been called twice. This is fixed now.