lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap,1.22,1.23 sitemap.xmap,1.8,1.9 xopus.xmap,1.2,1.3

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

Modified Files:
	publication-sitemap.xmap sitemap.xmap xopus.xmap 
Log Message:
menu for default publication, xopus work

moved more stuff to root sitemap

Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** publication-sitemap.xmap	9 May 2003 13:26:15 -0000	1.22
--- publication-sitemap.xmap	10 May 2003 15:43:25 -0000	1.23
***************
*** 8,31 ****
      <map:generators default="file" />
      <map:matchers default="wildcard"/>
!     <map:actions>
!       <!-- FIXME: Factor out to root sitemap -->
! <!--
!       <map:action name="task" logger="sitemap.action.task"
! 	src="org.apache.lenya.cms.cocoon.acting.TaskAction"/>
!       <map:action name="page-envelope"
!       logger="sitemap.action.page-envelope"
! 	src="org.apache.lenya.cms.cocoon.acting.PageEnvelopeAction"/>
! -->
!       <map:action name="uriparametrizer"
! 	src="org.apache.lenya.cms.cocoon.acting.URIParametrizerAction"
! 	logger="sitemap.action.uriparametrizer"/>
!       <map:action name="default-create"
! 	src="org.apache.lenya.cms.cocoon.acting.DefaultCreatorAction"
! 	logger="sitemap.action.default-create">
!         <tree-authoring href="content/authoring/sitetree.xml"/>
!         <docs href="content/authoring"/>
!         <doctypes href="config/doctypes/"/>
!       </map:action>
!     </map:actions>
    </map:components>
  
--- 8,12 ----
      <map:generators default="file" />
      <map:matchers default="wildcard"/>
!     <map:actions />
    </map:components>
  
***************
*** 163,169 ****
              <map:part src="cocoon:/lenyabody/{../publication-id}/{../area}/{doctype}/{document-id}"/>
            </map:aggregate>
!           <map:transform src="xslt/page2xhtml.xsl">
              <map:parameter name="root" value="{../context-prefix}/{../publication-id}"/>
!           </map:transform>
  	</map:act>
        </map:act>
--- 144,152 ----
              <map:part src="cocoon:/lenyabody/{../publication-id}/{../area}/{doctype}/{document-id}"/>
            </map:aggregate>
! 
!         <map:transform src="xslt/{doctype}-{../area}.xsl">
              <map:parameter name="root" value="{../context-prefix}/{../publication-id}"/>
!             <map:parameter name="document-id" value="{../area}/{doctype}/{document-id}"/>
!           </map:transform> 
  	</map:act>
        </map:act>

Index: sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/sitemap.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sitemap.xmap	5 May 2003 15:32:45 -0000	1.8
--- sitemap.xmap	10 May 2003 15:43:25 -0000	1.9
***************
*** 81,84 ****
--- 81,90 ----
            <!--  ####################################################################### -->
  
+         <!-- Xopus Interface -->
+ 
+            <map:match pattern="xopus/**">
+                <map:mount uri-prefix="xopus" src="xopus.xmap"/>
+            </map:match>
+ 
            <map:match pattern="**">
              <map:mount uri-prefix="" src="publication-sitemap.xmap"/>

Index: xopus.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/xopus.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xopus.xmap	30 Apr 2003 09:44:24 -0000	1.2
--- xopus.xmap	10 May 2003 15:43:25 -0000	1.3
***************
*** 20,25 ****
        <map:match pattern="**.html">
          <map:generate src="content/authoring/{1}.xml"/>
!         <map:serialize type="xml"/>
        </map:match>
        <map:match pattern="simple2html.xsl">
          <map:generate src="xslt/simple2html.xsl"/>
--- 20,29 ----
        <map:match pattern="**.html">
          <map:generate src="content/authoring/{1}.xml"/>
!         <map:transform src="xslt/authoring/xopus2-simple.xsl">
!           <map:parameter name="articleid" value="{1}"/>
!         </map:transform>
!         <map:serialize type="html"/>
        </map:match>
+ 
        <map:match pattern="simple2html.xsl">
          <map:generate src="xslt/simple2html.xsl"/>