lenya/src/webapp/lenya usecase.xmap,1.7,1.8
Christian Egli <[email protected]> Wed, 21 May 2003 10:48:33 +0200
| Newsgroups | gmane.comp.cms.wyona.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /repository/lenya/src/webapp/lenya
In directory erbium:/tmp/cvs-serv29050
Modified Files:
usecase.xmap
Log Message:
Readded a step matcher that should not have been deleted in the
previous checkin.
Index: usecase.xmap
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/usecase.xmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** usecase.xmap 20 May 2003 18:22:34 -0000 1.7
--- usecase.xmap 21 May 2003 08:48:30 -0000 1.8
***************
*** 37,41 ****
<map:resource name="scheduler-page">
! <map:aggregate element="scheduler" prefix="sch" ns="http://www.lenya.org/2002/sch" label="aggregation">
<map:part src="cocoon:/document-types/{publication-id}"/>
<map:part src="cocoon:/tasks/{publication-id}"/>
--- 37,42 ----
<map:resource name="scheduler-page">
! <map:aggregate element="scheduler" prefix="sch"
! ns="http://www.lenya.org/2002/sch" label="aggregation">
<map:part src="cocoon:/document-types/{publication-id}"/>
<map:part src="cocoon:/tasks/{publication-id}"/>
***************
*** 127,137 ****
</map:act>
! <!--
! Scheduler
! -->
<!-- Schedule Document: View, Add, Edit, Delete Jobs -->
<map:match type="usecase" pattern="schedule">
<map:call resource="scheduler-page">
<map:parameter name="publication-id" value="{../1}"/>
--- 128,148 ----
</map:act>
! <!-- Scheduler -->
<!-- Schedule Document: View, Add, Edit, Delete Jobs -->
<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}"/>
***************
*** 163,169 ****
</map:match> <!-- usecase -->
! <!--
! View Logs
! -->
<map:match type="usecase" pattern="view-logs">
--- 174,178 ----
</map:match> <!-- usecase -->
! <!-- View Logs -->
<map:match type="usecase" pattern="view-logs">
***************
*** 201,211 ****
<map:match pattern="*/*/**">
! <!--
! Publish
! -->
<map:match type="usecase" pattern="publish">
<map:match type="step" pattern="showscreen">
! <map:act type="resource-exists" src="pubs/{../../1}/lenya/content/publishing/publish-screen.xsp">
<map:generate type="serverpages" label="xsp"
src="pubs/{../../../1}/lenya/content/publishing/publish-screen.xsp"/>
--- 210,219 ----
<map:match pattern="*/*/**">
! <!-- Publish -->
<map:match type="usecase" pattern="publish">
<map:match type="step" pattern="showscreen">
! <map:act type="resource-exists"
! src="pubs/{../../1}/lenya/content/publishing/publish-screen.xsp">
<map:generate type="serverpages" label="xsp"
src="pubs/{../../../1}/lenya/content/publishing/publish-screen.xsp"/>
***************
*** 272,300 ****
<!--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: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">
--- 280,308 ----
<!--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: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">
***************
*** 306,315 ****
</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">
--- 314,323 ----
</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">
***************
*** 322,332 ****
</map:act>
<map:redirect-to uri="{}" session="true"/>
! </map:match>
</map:match>
- </map:match>
</map:pipeline>
</map:pipelines>
!
</map:sitemap>
--- 330,340 ----
</map:act>
<map:redirect-to uri="{}" session="true"/>
! </map:match>
! </map:match>
</map:match>
</map:pipeline>
</map:pipelines>
!
</map:sitemap>