You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2008/02/06 23:33:01 UTC
svn commit: r619187 - in /lenya/trunk/src: pubs/default/config/menu.xml
pubs/default/config/menus/menu.xml pubs/default/menus.xmap
webapp/global-sitemap.xmap
Author: andreas
Date: Wed Feb 6 14:32:59 2008
New Revision: 619187
URL: http://svn.apache.org/viewvc?rev=619187&view=rev
Log:
Remove default publication menu sitemap, move menu.xml one directory up because the menus directory doesn't contain more files.
Added:
lenya/trunk/src/pubs/default/config/menu.xml
- copied unchanged from r619168, lenya/trunk/src/pubs/default/config/menus/menu.xml
Removed:
lenya/trunk/src/pubs/default/config/menus/menu.xml
lenya/trunk/src/pubs/default/menus.xmap
Modified:
lenya/trunk/src/webapp/global-sitemap.xmap
Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?rev=619187&r1=619186&r2=619187&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Wed Feb 6 14:32:59 2008
@@ -130,6 +130,11 @@
<map:generate src="lenya/xslt/util/identity.xsl"/>
<map:serialize type="xml"/>
</map:match>
+ <!-- no menu for live area -->
+ <map:match pattern="lenya-page/*/live/**">
+ <map:generate src="lenya/xslt/util/identity.xsl"/>
+ <map:serialize type="xml"/>
+ </map:match>
<!-- for everything else: -->
<map:aggregate element="menu" ns="http://apache.org/cocoon/lenya/menubar/1.0">
<map:part src="cocoon:/menu-xml/{1}/{2}/{3}" strip-root="true"/>
@@ -207,7 +212,16 @@
<!-- include publication-specific menus -->
<!-- menu-xml/{publication-id}/... -->
<map:match pattern="menu-xml/*/**" internal-only="true">
- <map:mount uri-prefix="menu-xml/{1}/" src="{fallback:menus.xmap}" check-reload="true" reload-method="synchron" pass-through="true"/>
+ <map:select type="resource-exists">
+ <map:when test="fallback://lenya/pubs/{1}/config/menu.xml">
+ <map:generate src="fallback://lenya/pubs/{1}/config/menu.xml"/>
+ <map:serialize type="xml"/>
+ </map:when>
+ <!-- @deprecated: Mount menus.xmap for backwards-compatibility reasons -->
+ <map:otherwise>
+ <map:mount uri-prefix="menu-xml/{1}/" src="{fallback:menus.xmap}" check-reload="true" reload-method="synchron" pass-through="true"/>
+ </map:otherwise>
+ </map:select>
</map:match>
<!-- FIXME: this is currently unused -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org