lenya/src/webapp/lenya/pubs/default parameter-doctype.xmap,1.7,1.8 publication-sitemap.xmap,1.38,1.39

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

Modified Files:
	parameter-doctype.xmap publication-sitemap.xmap 
Log Message:
made xopus work again.

the notion of simple.html = simple/index.xml breaks code & assumptions in so many places its not even funny. that's why the final redirect upon saving in xopus fails. its just too much of a hack to constantly convert back and forth. alas

Index: parameter-doctype.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/parameter-doctype.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** parameter-doctype.xmap	15 May 2003 09:48:25 -0000	1.7
--- parameter-doctype.xmap	22 May 2003 13:14:54 -0000	1.8
***************
*** 42,48 ****
  	</map:act>
        </map:match>
-       
      </map:pipeline>
      
    </map:pipelines>
  </map:sitemap>
--- 42,59 ----
  	</map:act>
        </map:match>
      </map:pipeline>
      
+     <map:pipeline>
+       <!-- {area}/{uri} -->
+       <map:match pattern="*/**.xml">
+ 	<map:act type="sourcetype" src="content/{1}/{2}.xml">
+ 	  <map:generate type="serverpages" src="content/parameters/default.xsp">
+ 	    <map:parameter name="value" value="{sourcetype}"/>
+ 	  </map:generate>
+ 	  <map:serialize type="xml"/>
+ 	</map:act>
+       </map:match>
+     </map:pipeline>
+ 
    </map:pipelines>
  </map:sitemap>

Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** publication-sitemap.xmap	22 May 2003 11:47:36 -0000	1.38
--- publication-sitemap.xmap	22 May 2003 13:14:54 -0000	1.39
***************
*** 37,42 ****
      <!-- Edit Article with Xopus2 -->
      <map:pipeline>
!       <map:match pattern="authoring/xopus2/**.html">
! 	<map:act type="reserved-checkout">
  	  <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
  	    <map:parameter name="user" value="{user}"/>
--- 37,42 ----
      <!-- Edit Article with Xopus2 -->
      <map:pipeline>
!       <map:match pattern="authoring/xopus2/**.xml">
! 	<map:act type="reserved-checkout"> 
  	  <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
  	    <map:parameter name="user" value="{user}"/>
***************
*** 48,52 ****
  	</map:act>
  	
! 	<map:act type="uriparametrizer" src="authoring/{1}.html">
  	  <map:parameter name="doctype" value="cocoon://uri-parameter/{page-envelope:publication-id}/doctype"/>
  	  <map:aggregate element="lenya" label="aggregation">
--- 48,52 ----
  	</map:act>
  	
! 	<map:act type="uriparametrizer" src="authoring/{1}.xml">
  	  <map:parameter name="doctype" value="cocoon://uri-parameter/{page-envelope:publication-id}/doctype"/>
  	  <map:aggregate element="lenya" label="aggregation">
***************
*** 114,118 ****
  	<map:serialize type="html"/>
        </map:match>
!       
        <map:handle-errors type="500">
          <map:transform src="../../xslt/exception/not_published_yet.xsl"/>
--- 114,118 ----
  	<map:serialize type="html"/>
        </map:match>
!      
        <map:handle-errors type="500">
          <map:transform src="../../xslt/exception/not_published_yet.xsl"/>