lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap,1.25,1.26 sitemap.xmap,1.11,1.12 xopus.xmap,1.5,1.6

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

Modified Files:
	publication-sitemap.xmap sitemap.xmap xopus.xmap 
Log Message:
getting tired of this xopus business..

Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** publication-sitemap.xmap	12 May 2003 16:44:22 -0000	1.25
--- publication-sitemap.xmap	13 May 2003 14:33:18 -0000	1.26
***************
*** 104,107 ****
--- 104,127 ----
      </map:pipeline>
  
+     <!-- Edit Article with Xopus2 -->
+     <map:pipeline>
+       <map:match pattern="authoring/xopus2/**.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:pipeline>
+ 
  
      <!-- Menubar -->

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

Index: xopus.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/xopus.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xopus.xmap	13 May 2003 13:02:18 -0000	1.5
--- xopus.xmap	13 May 2003 14:33:18 -0000	1.6
***************
*** 18,22 ****
  
      <map:pipeline>
!       <map:match pattern="**.html">
        <map:act type="page-envelope">
  	<map:act type="uriparametrizer" src="authoring/{../1}.html">
--- 18,22 ----
  
      <map:pipeline>
! <!--      <map:match pattern="**.html">
        <map:act type="page-envelope">
  	<map:act type="uriparametrizer" src="authoring/{../1}.html">
***************
*** 26,43 ****
               <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"/>
--- 26,38 ----
               <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="xml" />
  	</map:act>
        </map:act>
        </map:match>
! --> 
        <map:match pattern="simple2html.xsl">
          <map:generate src="xslt/simple2html.xsl"/>
***************
*** 49,55 ****
        </map:match>
      </map:pipeline>
! 
      <!-- POST to Xopus: open and save -->
- <!-- FIXME: Factor out to root xopus sitemap -->
      <map:pipeline>
        <map:match pattern="XopusInterface">
--- 44,49 ----
        </map:match>
      </map:pipeline>
!     
      <!-- POST to Xopus: open and save -->
      <map:pipeline>
        <map:match pattern="XopusInterface">