You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jw...@apache.org on 2005/05/10 16:08:18 UTC

svn commit: r169473 - in /lenya/trunk/src: confpatch/actions.xmap java/org/apache/lenya/cms/cocoon/acting/UploadAction.java webapp/lenya/pubs/default/usecase-bxe.xmap webapp/lenya/usecase.xmap

Author: jwkaltz
Date: Tue May 10 07:08:18 2005
New Revision: 169473

URL: http://svn.apache.org/viewcvs?rev=169473&view=rev
Log:
removed obsolete action

Removed:
    lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java
Modified:
    lenya/trunk/src/confpatch/actions.xmap
    lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
    lenya/trunk/src/webapp/lenya/usecase.xmap

Modified: lenya/trunk/src/confpatch/actions.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/confpatch/actions.xmap?rev=169473&r1=169472&r2=169473&view=diff
==============================================================================
--- lenya/trunk/src/confpatch/actions.xmap (original)
+++ lenya/trunk/src/confpatch/actions.xmap Tue May 10 07:08:18 2005
@@ -27,12 +27,6 @@
    <map:action name="resource-exists-enhanced" logger="sitemap.action.resource-exists-enhanced" src="org.apache.lenya.cms.cocoon.acting.ResourceExistsAction"/>
    <map:action name="rollback" src="org.apache.lenya.cms.cocoon.acting.RollbackAction"/>
    <map:action name="task" logger="sitemap.action.task" src="org.apache.lenya.cms.cocoon.acting.TaskAction"/>
-   <map:action name="upload" logger="sitemap.action.upload" src="org.apache.lenya.cms.cocoon.acting.UploadAction">
-     <resources-root href="resources/images/live"/>
-     <docs-root href="content/authoring"/>
-     <meta-root href="content/authoring/"/>
-      <insert-image-before value="false"/>
-   </map:action>
    <map:action name="uriparametrizer" src="org.apache.lenya.cms.cocoon.acting.URIParametrizerAction" logger="sitemap.action.uriparametrizer"/>
    <map:action name="workflow" logger="sitemap.action.workflow" src="org.apache.lenya.cms.cocoon.acting.WorkflowInvokerAction"/>
    <map:action name="session-propagator" logger="sitemap.action.session-propagator" src="org.apache.cocoon.acting.SessionPropagatorAction"/>

Modified: lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap?rev=169473&r1=169472&r2=169473&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap Tue May 10 07:08:18 2005
@@ -142,9 +142,6 @@
       </map:match> 
       
           <map:match type="step" pattern="asset-upload">
-            <map:act type="upload">
-              <map:redirect-to uri="{request:requestURI}?lenya.usecase=bxe&amp;lenya.step=asset-upload-show"/>
-            </map:act>
             <map:call resource="cms-screen">
               <map:parameter name="serverpage" value="info/assets.xsp"/>
               <map:parameter name="stylesheet" value="bxe/asset.xsl"/>
@@ -152,9 +149,6 @@
           </map:match>
 
           <map:match type="step" pattern="image-upload">
-            <map:act type="upload">
-              <map:redirect-to uri="{request:requestURI}?lenya.usecase=bxe&amp;lenya.step=image-upload-show"/>
-            </map:act>
 	        <map:call resource="cms-screen">
 	           <map:parameter name="serverpage" value="info/assets.xsp"/>
 	           <map:parameter name="stylesheet" value="bxe/image.xsl"/>

Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecase.xmap?rev=169473&r1=169472&r2=169473&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Tue May 10 07:08:18 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -241,10 +241,6 @@
           </map:match>
 
           <map:match pattern="upload" type="step">
-            <map:act type="upload">
-              <map:parameter name="task-id" value="{request-param:task-id}"/>
-              <map:redirect-to session="true" uri="{request:requestURI}?lenya.usecase=info-assets&amp;lenya.step=showscreen"/>
-            </map:act>
             <map:generate src="fallback://lenya/content/authoring/asset.xsp" type="serverpages"/>
             <map:transform src="fallback://lenya/xslt/authoring/asset.xsl">
               <map:parameter name="contextprefix" value="{request:contextPath}"/>
@@ -262,13 +258,6 @@
           </map:match>
 
           <map:match pattern="upload-and-insert" type="step">
-            <map:act type="upload">
-              <map:parameter name="task-id" value="{request-param:task-id}"/>
-              <map:act type="task">
-                <map:parameter name="task-id" value="{request-param:task-id}"/>
-                <map:redirect-to session="true" uri="{request:requestURI}?lenya.usecase=checkin&amp;lenya.step=checkin&amp;backup=true"/>
-              </map:act>
-            </map:act>
             <map:act type="reserved-checkin">
               <map:parameter name="backup" value="false"/>
               <map:generate src="content/rc/{exception}.xsp" type="serverpages">



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