lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap,1.21,1.22

Update of /repository/lenya/src/webapp/lenya/pubs/default
In directory erbium:/tmp/cvs-serv14519/src/webapp/lenya/pubs/default

Modified Files:
	publication-sitemap.xmap 
Log Message:
Menu integrated

Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** publication-sitemap.xmap	8 May 2003 12:38:38 -0000	1.21
--- publication-sitemap.xmap	9 May 2003 13:26:15 -0000	1.22
***************
*** 32,36 ****
    <map:views>
      <map:view name="aggregation" from-label="aggregation">
!       <map:serialize/>
      </map:view>
    </map:views>
--- 32,36 ----
    <map:views>
      <map:view name="aggregation" from-label="aggregation">
!       <map:serialize type="xml"/>
      </map:view>
    </map:views>
***************
*** 122,125 ****
--- 122,156 ----
      </map:pipeline>
  
+ 
+     <!-- Menubar -->
+     <map:pipeline>
+       <map:match pattern="lenyamenubar/authoring/article.xml">
+         <map:generate type="serverpages" src="config/menus/generic.xsp"/>
+         <map:serialize type="xml"/>
+       </map:match>
+       <map:match pattern="lenyamenubar/live/article.xml">
+         <map:generate type="serverpages" src="../../content/menus/live.xsp"/>
+         <map:serialize type="xml"/>
+       </map:match>
+     </map:pipeline>
+ 
+ 
+ 
+     <map:pipeline>
+     <map:match pattern="lenyabody/*/*/*/*">
+           <map:aggregate element="cmsbody">
+ <!--
+           <map:aggregate element="body" prefix="page" ns="http://www.lenya.org/2003/page" label="aggregation">
+ -->
+ 	    <!-- /lenya.body/{publication-id}/{area}/{doctype}/{document-id} -->
+             <map:part src="cocoon://navigation/{1}/{2}/breadcrumb/{4}.xml"/>
+             <map:part src="cocoon://navigation/{1}/{2}/tabs/{4}.xml"/>
+             <map:part src="cocoon://navigation/{1}/{2}/menu/{4}.xml"/>
+             <map:part src="cocoon://{1}/{2}/{3}/{4}.xml"/>
+           </map:aggregate>
+       <map:serialize type="xml"/>
+     </map:match>
+     </map:pipeline>
+ 
      <map:pipeline>
      <map:match pattern="**.html">
***************
*** 128,137 ****
            <map:parameter name="doctype" value="cocoon://uri-parameter/{publication-id}/doctype"/>
            <map:parameter name="document-id" value="cocoon://uri-parameter/{publication-id}/document-id"/>
!           <map:aggregate element="page" prefix="page" ns="http://www.lenya.org/2003/page" label="aggregation">
! 	    <!-- /navigation/{publication-id}/{area}/tabs/{document-id}.html.xml -->
!             <map:part src="cocoon://navigation/{../publication-id}/{../area}/breadcrumb/{document-id}.xml"/>
!             <map:part src="cocoon://navigation/{../publication-id}/{../area}/tabs/{document-id}.xml"/>
!             <map:part src="cocoon://navigation/{../publication-id}/{../area}/menu/{document-id}.xml"/>
!             <map:part src="cocoon://{../publication-id}/{../area}/{doctype}/{document-id}.xml"/>
            </map:aggregate>
            <map:transform src="xslt/page2xhtml.xsl">
--- 159,165 ----
            <map:parameter name="doctype" value="cocoon://uri-parameter/{publication-id}/doctype"/>
            <map:parameter name="document-id" value="cocoon://uri-parameter/{publication-id}/document-id"/>
!           <map:aggregate element="lenya" label="aggregation">
!             <map:part src="cocoon:/lenyamenubar/{../area}/article.xml"/>
!             <map:part src="cocoon:/lenyabody/{../publication-id}/{../area}/{doctype}/{document-id}"/>
            </map:aggregate>
            <map:transform src="xslt/page2xhtml.xsl">
***************
*** 142,164 ****
        <map:serialize type="html"/>
      </map:match>
- 
      </map:pipeline>
  
  
!     <!-- Menubar -->
!     <map:pipeline>
!       <map:match pattern="authoring/menus/article.xml">
!         <map:generate type="serverpages" src="config/menus/generic.xsp"/>
!         <map:serialize type="xml"/>
!       </map:match>
!       <map:match pattern="live/menus/article.xml">
!         <map:generate type="serverpages" src="../../content/menus/live.xsp"/>
!         <map:serialize type="xml"/>
!       </map:match>
!     </map:pipeline>
  
  
      <!-- Redirect to introduction -->
      <!-- FIXME: Factor out to root sitemap -->
      <map:pipeline>
        <map:match pattern="">
--- 170,183 ----
        <map:serialize type="html"/>
      </map:match>
      </map:pipeline>
  
  
! 
! 
  
  
      <!-- Redirect to introduction -->
      <!-- FIXME: Factor out to root sitemap -->
+ <!--
      <map:pipeline>
        <map:match pattern="">
***************
*** 169,172 ****
--- 188,192 ----
        </map:match>
      </map:pipeline>
+ -->
  
    </map:pipelines>