lenya/src/webapp/lenya usecase.xmap,1.5,1.6

Edith Chevrier <[email protected]> Tue, 20 May 2003 18:45:22 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /usr/local/repositories/lenya/src/webapp/lenya
In directory erbium:/tmp/cvs-serv19453/src/webapp/lenya

Modified Files:
	usecase.xmap 
Log Message:
Revision Controller in the usecase sitemap

Index: usecase.xmap
===================================================================
RCS file: /usr/local/repositories/lenya/src/webapp/lenya/usecase.xmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** usecase.xmap	20 May 2003 12:06:48 -0000	1.5
--- usecase.xmap	20 May 2003 16:45:19 -0000	1.6
***************
*** 92,96 ****
        <!-- create the current job snapshot -->
        <map:match pattern="scheduler-servlet">
!         <map:generate type="servletproxy" src="{request:contextPath}/servlet/QuartzSchedulerServlet"/>
          <map:transform src="xslt/scheduler/sort.xsl"/>
          <map:serialize type="xml"/>
--- 92,96 ----
        <!-- create the current job snapshot -->
        <map:match pattern="scheduler-servlet">
!         <map:generate type="servletproxy" src="/lenya/servlet/QuartzSchedulerServlet"/>
          <map:transform src="xslt/scheduler/sort.xsl"/>
          <map:serialize type="xml"/>
***************
*** 98,102 ****
        
      </map:pipeline>
!     
      <map:pipeline>
      
--- 98,102 ----
        
      </map:pipeline>
! 
      <map:pipeline>
      
***************
*** 120,135 ****
        <map:match type="usecase" pattern="schedule">
        
-         <!-- add job: redirect to page -->
-         <map:match type="step" pattern="add">
-           <map:call resource="scheduler-page">
-             <map:parameter name="publication-id" value="{../../1}"/>
-             <map:parameter name="uri" value="{../../2}/{../../3}"/>
-           </map:call>
-           <map:transform src="xslt/util/redirect.xsl">
-             <map:parameter name="url" value="{request:requestURI}"/>
-           </map:transform>
-           <map:serialize/>
-         </map:match>
-       
            <map:call resource="scheduler-page">
              <map:parameter name="publication-id" value="{../1}"/>
--- 120,123 ----
***************
*** 238,241 ****
--- 226,287 ----
      </map:pipeline>
      
+     <!--Rollback-->
+     <map:pipeline>
+     <!-- {publication-id}/{area}/{uri}-->
+     <map:match pattern="*/*/**">
+       <map:match type="usecase" pattern="rollback">
+         <map:match type="step" pattern="showscreen">
+           <map:generate type="serverpages" src="content/rc/versions-screen.xsp"/>
+           <map:transform src="xslt/rc/rollback.xsl"/>
+           <map:serialize type="html"/>
+ <!--
+           <map:serialize type="xml"/>
+ -->
+         </map:match>
+         <map:match type="step" pattern="view">
+           <map:mount uri-prefix="{../../1}" src="pubs/{../../1}/sitemap.xmap" check-reload="true" reload-method="synchron"/>
+         </map:match>
+         <map:match type="step" pattern="rollback">
+             <map:act type="rollback">
+               <map:redirect-to uri="{location}" session="true"/>
+             </map:act>
+             <map:redirect-to uri="{}" session="true"/>
+         </map:match>
+       </map:match>
+       
+       <!-- CheckOut -->
+       <map:match type="usecase" pattern="checkout">
+         <map:match type="step" pattern="checkout">
+             <map:act type="reserved-checkout">
+               <map:generate type="serverpages" src="content/rc/{exception}.xsp">
+                 <map:parameter name="user" value="{user}"/>
+                 <map:parameter name="filename" value="{filename}"/>
+                 <map:parameter name="date" value="{date}"/>
+               </map:generate>
+               <map:serialize type="xml"/>
+             </map:act>
+             <map:redirect-to uri="{}" session="true"/>
+         </map:match>
+       </map:match>
+ 
+       <!-- CheckIn -->
+       <map:match type="usecase" pattern="checkin">
+         <map:match type="step" pattern="checkin">
+             <map:act type="reserved-checkin">
+               <map:generate type="serverpages" src="content/rc/{exception}.xsp">
+                 <map:parameter name="user" value="{user}"/>
+                 <map:parameter name="filename" value="{filename}"/>
+                 <map:parameter name="checkType" value="{checkType}"/>
+                 <map:parameter name="date" value="{date}"/>
+               </map:generate>
+               <map:serialize type="xml"/>
+             </map:act>
+             <map:redirect-to uri="{}" session="true"/>
+         </map:match>
+       </map:match>
+     </map:match>
+ 
+     </map:pipeline>
+ 
    </map:pipelines>