lenya/src/webapp/lenya/pubs/default publication-sitemap.xmap,1.35,1.36

Christian Egli <[email protected]> Wed, 21 May 2003 12:06:40 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /repository/lenya/src/webapp/lenya/pubs/default
In directory erbium:/tmp/cvs-serv29949/src/webapp/lenya/pubs/default

Modified Files:
	publication-sitemap.xmap 
Log Message:
Sitemap cleanup: 

* Replaced page-envelope action by page-envelope input module.
* Removed unused code.


Index: publication-sitemap.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** publication-sitemap.xmap	20 May 2003 18:22:34 -0000	1.35
--- publication-sitemap.xmap	21 May 2003 10:06:38 -0000	1.36
***************
*** 59,75 ****
  	</map:act>
  	
! 	<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>
--- 59,72 ----
  	</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">
! 	    <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:match>
***************
*** 109,144 ****
      <map:pipeline>
        <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: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">
! 	      <map:parameter name="root" value="{../context-prefix}/{../publication-id}"/>
! 	      <map:parameter name="document-id" value="{../area}/{doctype}/{document-id}"/>
! 	    </map:transform> 
! 	    <map:transform src="xslt/{doctype}-{../area}.xsl"/>
! 	    
! 	  </map:act>
  	</map:act>
  	<map:serialize type="html"/>
        </map:match>
        
- <!--
        <map:handle-errors type="500">
          <map:transform src="../../xslt/exception/not_published_yet.xsl"/>
  	<map:serialize/>
        </map:handle-errors>
- -->      
      </map:pipeline>
- 
- 
- 
- 
- 
  
      <!-- Redirect to introduction -->
--- 106,132 ----
      <map:pipeline>
        <map:match pattern="**.html">
! 	<map:act type="uriparametrizer" src="{1}.html">
! 	  <map:parameter name="doctype" value="cocoon://uri-parameter/{page-envelope:publication-id}/doctype"/>
! 	  <map:parameter name="document-id" value="cocoon://uri-parameter/{page-envelope:publication-id}/document-id"/>
! 	  <map:aggregate element="lenya" label="aggregation">
! 	    <map:part src="cocoon:/lenyamenubar/{page-envelope:area}/article.xml"/>
! 	    <map:part src="cocoon:/lenyabody/{page-envelope:publication-id}/{page-envelope:area}/{doctype}/{document-id}"/>
! 	  </map:aggregate>
! 	  
! 	  <map:transform src="xslt/page2xhtml.xsl">
! 	    <map:parameter name="root" value="{page-envelope:context-prefix}/{page-envelope:publication-id}"/>
! 	    <map:parameter name="document-id" value="{page-envelope:area}/{doctype}/{document-id}"/>
! 	  </map:transform> 
! 	  <map:transform src="xslt/{doctype}-{page-envelope:area}.xsl"/>
! 	  
  	</map:act>
  	<map:serialize type="html"/>
        </map:match>
        
        <map:handle-errors type="500">
          <map:transform src="../../xslt/exception/not_published_yet.xsl"/>
  	<map:serialize/>
        </map:handle-errors>
      </map:pipeline>
  
      <!-- Redirect to introduction -->