lenya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andr...@apache.org
Subject cvs commit: cocoon-lenya/src/webapp/lenya usecase.xmap
Date Fri, 29 Aug 2003 17:24:10 GMT
andreas     2003/08/29 10:24:10

  Modified:    src/webapp/lenya usecase.xmap
  Log:
  - reflecting scheduler changes
  - removed unused pipelines
  - notification: fallback to default config file
  
  Revision  Changes    Path
  1.84      +16 -31    cocoon-lenya/src/webapp/lenya/usecase.xmap
  
  Index: usecase.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/usecase.xmap,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- usecase.xmap	28 Aug 2003 11:33:24 -0000	1.83
  +++ usecase.xmap	29 Aug 2003 17:24:10 -0000	1.84
  @@ -52,18 +52,13 @@
       
       <map:resource name="scheduler-page">
         <map:aggregate element="scheduler" label="aggregation" ns="http://apache.org/cocoon/lenya/scheduler/1.0"
prefix="sch">
  -        <map:part src="cocoon:/document-types/{publication-id}"/>
           <map:part src="cocoon:/tasks/{publication-id}"/>
  -        <map:part src="cocoon:/scheduler-xsp" strip-root="true"/>
           <map:part src="cocoon:/scheduler-servlet" strip-root="true"/>
         </map:aggregate>
  -      <map:transform src="xslt/scheduler/filter.xsl"/>
  -      <map:act src="{uri}" type="uriparametrizer">
  -        <map:parameter name="doctype" value="cocoon://uri-parameter/{publication-id}/doctype"/>
  -        <map:transform src="xslt/scheduler/filterTasks-new.xsl">
  -          <map:parameter name="documentType" value="{doctype}"/>
  -        </map:transform>
  -      </map:act>
  +      <map:transform src="xslt/scheduler/filter.xsl">
  +      	<map:parameter name="publication-id" value="{publication-id}"/>
  +      	<map:parameter name="document-url" value="/{publication-id}{uri}"/>
  +      </map:transform>
       </map:resource>
       
       <map:resource name="cms-screen-xml">
  @@ -112,24 +107,12 @@
       
       <map:pipeline>
         
  -      <!-- load document types -->
  -      <map:match pattern="document-types/*">
  -        <map:generate src="pubs/{1}/config/doctypes/doctypes.xconf"/>
  -        <map:serialize type="xml"/>
  -      </map:match>
  -      
         <!-- load task list -->
         <map:match pattern="tasks/*">
           <map:generate src="pubs/{1}/config/tasks/tasks.xconf"/>
           <map:serialize type="xml"/>
         </map:match>
         
  -      <!-- create the current date -->
  -      <map:match pattern="scheduler-xsp">
  -        <map:generate src="content/scheduler/scheduler-new.xsp" type="serverpages"/>
  -        <map:serialize type="xml"/>
  -      </map:match>
  -      
         <!-- create the current job snapshot -->
         <map:match pattern="scheduler-servlet">
             <map:generate src="{request:contextPath}/servlet/QuartzSchedulerServlet" type="servletproxy"/>
  @@ -147,7 +130,14 @@
       	
       	<!-- notification/{publication-id}/{usecase}.xml -->
       	<map:match pattern="notification/*/*.xml">
  -    		<map:generate src="pubs/{1}/config/notification/notification.xconf"/>
  +    		<map:select type="resource-exists">
  +    			<map:when test="lenya/pubs/{1}/config/notification/notification.xconf">
  +            <map:generate src="pubs/{1}/config/notification/notification.xconf"/>
  +    			</map:when>
  +    			<map:otherwise>
  +            <map:generate src="config/notification/notification.xconf"/>
  +    			</map:otherwise>	
  +    		</map:select>
       		<map:transform src="xslt/notification/notification2message.xsl">
       			<map:parameter name="usecase" value="{2}"/>
       		</map:transform>
  @@ -163,13 +153,6 @@
       		<map:serialize type="xml"/>
       	</map:match>
       	
  -    	<!-- notification/{publication-id}/{usecase}.xsl -->
  -    	<map:match pattern="notification/*.xsl">
  -<!--    		<map:generate src="cocoon:/notification/{page-envelope:publication-id}/{1}.xsl"/>-->
  -    		<map:generate src="xslt/notification/{1}.xsl"/>
  -    		<map:serialize type="xml"/>
  -    	</map:match>
  -    	
       </map:pipeline>
       
       <!-- =================================================================== -->
  @@ -202,7 +185,9 @@
                 <map:parameter name="context-prefix" value="{request:contextPath}"/>
                 <map:parameter name="publication-id" value="{../../1}"/>
                 <map:parameter name="area" value="{../../2}"/>
  -              <map:parameter name="document-uri" value="{../../3}"/>
  +              <!--
  +              <map:parameter name="document-url" value="/{../../3}"/>
  +              -->
               </map:transform>
               <map:call resource="style-cms-page"/>
             </map:match>
  @@ -840,7 +825,7 @@
   
           <map:match pattern="info-workflow" type="usecase">
           	<map:act type="resource-exists" src="pubs/{page-envelope:publication-id}/content/workflow/history/{page-envelope:document-path}">
  -						<map:generate src="pubs/{page-envelope:publication-id}/content/workflow/history/{page-envelope:document-path}"/>
  +						<map:generate src="pubs/{page-envelope:publication-id}/content/workflow/history/{page-envelope:area}/{page-envelope:document-path}"/>
   						<map:transform src="xslt/info/workflow2info.xsl"/>
   						<map:transform src="xslt/info/info.xsl">
   							<map:parameter name="tab" value="{../../1}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org


Mime
View raw message