svn commit: r511770 - in /lenya/branches/trunk-rework-pubconf/src: java/org/apache/lenya/cms/cocoon/components/modules/input/ java/org/apache/lenya/cms/publication/templating/ pubs/default/config/ webapp/ webapp/lenya/config/cocoon-xconf/input-modules/...

Author: nettings
Date: Mon Feb 26 02:17:59 2007
New Revision: 511770

URL: http://svn.apache.org/viewvc?view=rev&rev=511770
Log:
mirrored andreas' changes in trunk

Removed:
    
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/components/modules/input/UsecaseFallbackModule.java
    
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/publication/templating/ExistingUsecaseResolver.java
    
lenya/branches/trunk-rework-pubconf/src/webapp/lenya/config/cocoon-xconf/input-modules/usecase-fallback.xconf
Modified:
    
lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf
    lenya/branches/trunk-rework-pubconf/src/webapp/global-sitemap.xmap
    
lenya/branches/trunk-rework-pubconf/src/webapp/lenya/xslt/modules/modules2xinclude.xsl

Modified: 
lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf?view=diff&rev=511770&r1=511769&r2=511770
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf 
(original)
+++ 
lenya/branches/trunk-rework-pubconf/src/pubs/default/config/publication.xconf 
Mon Feb 26 02:17:59 2007
@@ -99,5 +99,4 @@
     <proxy area="authoring" ssl="false" 
url="http://www.host.com/lenya/default/authoring"/>
   </proxies>
   -->
-  <link-attribute xpath="//*[namespace-uri() = 
'http://www.w3.org/1999/xhtml']/@href"/>
 </publication>

Modified: lenya/branches/trunk-rework-pubconf/src/webapp/global-sitemap.xmap
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/webapp/global-sitemap.xmap?view=diff&rev=511770&r1=511769&r2=511770
==============================================================================
--- lenya/branches/trunk-rework-pubconf/src/webapp/global-sitemap.xmap 
(original)
+++ lenya/branches/trunk-rework-pubconf/src/webapp/global-sitemap.xmap Mon Feb 
26 02:17:59 2007
@@ -205,8 +205,9 @@
         <map:serialize type="xml"/>
       </map:match>
       
+    </map:pipeline>
       <!-- menus -->
-      
+    <map:pipeline type="profile-noncaching">  
       <!-- menu-xml/modules -->
       <!-- menu-xml/modules/{pub-id}/{area}.xml -->
       <map:match pattern="menu-xml/modules/*/*.xml">
@@ -217,8 +218,9 @@
         <map:transform type="xinclude"/>
         <map:serialize type="xml"/>
       </map:match>
+    </map:pipeline>
 
-
+    <map:pipeline>
       <!-- menu-xml/module/{area}/{module-id}.xml -->
       <map:match pattern="menu-xml/module/*/*.xml">
         <map:select type="resource-exists">

Modified: 
lenya/branches/trunk-rework-pubconf/src/webapp/lenya/xslt/modules/modules2xinclude.xsl
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/webapp/lenya/xslt/modules/modules2xinclude.xsl?view=diff&rev=511770&r1=511769&r2=511770
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/webapp/lenya/xslt/modules/modules2xinclude.xsl
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/webapp/lenya/xslt/modules/modules2xinclude.xsl
 Mon Feb 26 02:17:59 2007
@@ -19,25 +19,25 @@
 <!-- $Id: xinclude.xsl 123414 2004-12-27 14:52:24Z gregor $ -->
 
 <xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-    xmlns:xi="http://www.w3.org/2001/XInclude";
-    xmlns="http://apache.org/cocoon/lenya/publication/1.1";
     xmlns:dir="http://apache.org/cocoon/directory/2.0";
     xmlns:menu="http://apache.org/cocoon/lenya/menubar/1.0";
-    >
+    xmlns:xi="http://www.w3.org/2001/XInclude";
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+    xmlns="http://apache.org/cocoon/lenya/publication/1.1";
+>
 
   <xsl:param name="area"/>
 
-  <xsl:template match="publication">
-    <menu:menu>
-      <xsl:apply-templates select="modules/module"/>
-    </menu:menu>
+  <xsl:template match="publication">
+    <menu:menu>
+      <xsl:apply-templates select="modules/module"/>
+    </menu:menu>
   </xsl:template>
 
-  <xsl:template match="module">
-    <xsl:if test="not(preceding-sibling::module[@name = current()/@name])">
+  <xsl:template match="module">
+    <xsl:if test="not(preceding-sibling::module[@name = current()/@name])">
       <xi:include href="cocoon:/menu-xml/module/{$area}/{@name}.xml" 
xpointer="xpointer(/*/*)"/>
-    </xsl:if>
+    </xsl:if>
   </xsl:template>
 
 </xsl:stylesheet>