lenya/src/webapp/lenya usecase.xmap,1.1,1.2

Andreas Hartmann <[email protected]> Fri, 16 May 2003 17:36:12 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /repository/lenya/src/webapp/lenya
In directory erbium:/tmp/cvs-serv30323/src/webapp/lenya

Modified Files:
	usecase.xmap 
Log Message:
- removed publishing from default/publication-sitemap.xmap
- added error handling to usecase.xmap

Index: usecase.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/usecase.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** usecase.xmap	16 May 2003 15:29:30 -0000	1.1
--- usecase.xmap	16 May 2003 15:36:10 -0000	1.2
***************
*** 12,16 ****
      <map:matchers default="wildcard"/>
      <map:actions/>
!     <map:selectors/>
    </map:components>
    
--- 12,23 ----
      <map:matchers default="wildcard"/>
      <map:actions/>
!     <map:selectors>
!       <map:selector name="exception" logger="sitemap.selector.exception"
! 	src="org.apache.cocoon.selection.ExceptionSelector">
! 	<exception name="execution" class="org.apache.lenya.cms.task.ExecutionException" />
! 	<exception name="publishing" class="org.apache.lenya.cms.publishing.PublishingException"/>
! 	<exception name="sitetree" class="org.apache.lenya.cms.publication.SiteTreeException"/>
!       </map:selector>
!     </map:selectors>
    </map:components>
    
***************
*** 108,112 ****
            <map:serialize type="html"/>
  
!       </map:match>
        
        <!-- Schedule Publication -->
--- 115,119 ----
            <map:serialize type="html"/>
  
!       </map:match> <!-- usecase -->
        
        <!-- Schedule Publication -->
***************
*** 119,124 ****
            <map:transform src="xslt/scheduler/admin-publication.xsl"/>
            <map:serialize type="html"/>
!         </map:match>
!       </map:match>
        
        <!--
--- 126,131 ----
            <map:transform src="xslt/scheduler/admin-publication.xsl"/>
            <map:serialize type="html"/>
!         </map:match> <!-- step -->
!       </map:match> <!-- usecase -->
        
        <!--
***************
*** 134,138 ****
            </map:transform>
            <map:serialize/>
!         </map:match>
        
          <map:match type="step" pattern="log">
--- 141,145 ----
            </map:transform>
            <map:serialize/>
!         </map:match> <!-- step -->
        
          <map:match type="step" pattern="log">
***************
*** 147,153 ****
            </map:transform>
          <map:serialize/>
!         </map:match>
        
!       </map:match>
        
        <!--
--- 154,169 ----
            </map:transform>
          <map:serialize/>
!         </map:match> <!-- step -->
        
!       </map:match> <!-- usecase -->
!       
!     </map:match> <!-- uri -->
!     
!     </map:pipeline>
!       
!     <map:pipeline>
!     
!     <!-- {publication-id}/{area}/{uri}-->
!     <map:match pattern="*/*/**">
        
        <!--
***************
*** 186,189 ****
--- 202,214 ----
        </map:match>
        
+       <map:handle-errors>
+         <map:select type="exception">  
+           <map:when test="publishing">
+             <map:generate src= "sitetreeException.xml"/> 
+           </map:when>  
+         </map:select>  
+         <map:serialize/>
+       </map:handle-errors>
+         
      </map:pipeline>