svn commit: r202184 - in /lenya/trunk/src/webapp: WEB-INF/cocoon-xconf.xsl global-sitemap.xmap

Author: andreas
Date: Tue Jun 28 06:55:21 2005
New Revision: 202184

URL: http://svn.apache.org/viewcvs?rev=202184&view=rev
Log:
Introducing publet infrastructure

Modified:
    lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
    lenya/trunk/src/webapp/global-sitemap.xmap

Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?rev=202184&r1=202183&r2=202184&view=diff
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Tue Jun 28 06:55:21 2005
@@ -526,6 +526,8 @@
       <view template="edit/kupu/kupu" menu="false"/>
     </component-instance>
   </usecases>
+  
+  <resource-types/>
 
   <component role="org.apache.cocoon.components.cron.CronJob/usecase"
              class="org.apache.lenya.cms.usecase.scheduling.UsecaseCronJob"

Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/global-sitemap.xmap?rev=202184&r1=202183&r2=202184&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Tue Jun 28 06:55:21 2005
@@ -146,7 +146,11 @@
       <!-- Lenya page transformation -->
       <!-- lenya-page/{publication-id}/{complete-area}/... -->
       <map:match pattern="lenya-page/*/*/**">
-        <map:generate src="cocoon:/menu-xml/{1}/{2}/{3}"/>
+        <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"/>
+          <map:part src="cocoon:/menu-xml/publets/{1}/{2}.xml" 
strip-root="true"/>
+        </map:aggregate>
+        <map:transform src="lenya/xslt/menu/merge-menus.xsl"/>
         
         <map:call resource="i18n"/>
         
@@ -223,6 +227,21 @@
         <map:serialize type="xml"/>
       </map:match>
       
+      <!-- menu-xml/publets -->
+      <!-- menu-xml/publets/{pub-id}/{area}.xml -->
+      <map:match pattern="menu-xml/publets/*/*.xml">
+        <map:generate src="lenya/pubs/{1}/config/publication.xconf"/>
+        <map:transform src="lenya/xslt/publets/publets2xinclude.xsl">
+          <map:parameter name="area" value="{2}"/>
+        </map:transform>
+        <map:transform type="xinclude"/>
+        <map:serialize type="xml"/>
+      </map:match>
+      <!-- menu-xml/publet/{publet-id}/{area}.xml -->
+      <map:match pattern="menu-xml/publet/*/*.xml">
+        <map:mount uri-prefix="menu-xml/publet/{1}/" 
src="lenya/publets/{2}/menus.xmap" check-reload="true" 
reload-method="synchron"/>
+      </map:match>
+      
       <!-- 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"/>
@@ -382,6 +401,11 @@
           <map:parameter name="type" value="file"/>
           <map:mount uri-prefix="" 
src="{fallback://lenya/resources-shared.xmap}" check-reload="true" 
reload-method="synchron"/>
         </map:act>
+      </map:match>
+
+      <!-- Enter a publet -->
+      <map:match pattern="publets/*/**">
+        <map:mount uri-prefix="publets/{1}/" 
src="lenya/publets/{1}/sitemap.xmap" check-reload="true" 
reload-method="synchron"/>
       </map:match>
       
       <!-- Enter the actual publication -->