lenya/src/webapp/lenya/pubs/default sitemap.xmap,1.10,1.11 xopus.xmap,1.4,1.5

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

Modified Files:
	sitemap.xmap xopus.xmap 
Log Message:
further work on xopus support for the default publication.

since our documents now contain namespaces, the matchers have to change. see xslt/authoring/xopus2-simple.xsl

Index: sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/sitemap.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sitemap.xmap	12 May 2003 12:01:08 -0000	1.10
--- sitemap.xmap	13 May 2003 13:02:18 -0000	1.11
***************
*** 83,88 ****
          <!-- Xopus Interface -->
  
!            <map:match pattern="authoring/xopus/**">
!                <map:mount uri-prefix="authoring/xopus" src="xopus.xmap"/>
             </map:match>
  
--- 83,88 ----
          <!-- Xopus Interface -->
  
!            <map:match pattern="authoring/xopus2/**">
!                <map:mount uri-prefix="authoring/xopus2" src="xopus.xmap"/>
             </map:match>
  

Index: xopus.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/xopus.xmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xopus.xmap	12 May 2003 12:46:56 -0000	1.4
--- xopus.xmap	13 May 2003 13:02:18 -0000	1.5
***************
*** 20,34 ****
        <map:match pattern="**.html">
        <map:act type="page-envelope">
! 	<map:act type="uriparametrizer" src="{../1}.html">
            <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:generate src="content/authoring/{../1}.xml"/>
!         <map:transform src="xslt/authoring/xopus2-{doctype}.xsl">
!           <map:parameter name="articleid" value="{1}"/>
          </map:transform>
  	</map:act>
        </map:act>
        </map:match>
  
        <map:match pattern="simple2html.xsl">
          <map:generate src="xslt/simple2html.xsl"/>
--- 20,43 ----
        <map:match pattern="**.html">
        <map:act type="page-envelope">
! 	<map:act type="uriparametrizer" src="authoring/{../1}.html">
            <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/authoring/article.xml"/>
!              <map:part src="content/authoring/{../../1}.xml" element="cmsbody"/>
!           </map:aggregate>         
!        <map:transform src="xslt/authoring/xopus2-{doctype}.xsl">
!         <map:parameter name="articleid" value="{../../1}"/>
          </map:transform>
+ <map:serialize type="html" />
  	</map:act>
        </map:act>
        </map:match>
  
+       <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="simple2html.xsl">
          <map:generate src="xslt/simple2html.xsl"/>
***************
*** 58,62 ****
          <map:serialize type="xml"/>
        </map:match>
!       <map:handle-errors>
          <map:serialize type="xml"/>
        </map:handle-errors>
--- 67,71 ----
          <map:serialize type="xml"/>
        </map:match>
!       <map:handle-errors type="500">
          <map:serialize type="xml"/>
        </map:handle-errors>