You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/01 01:33:43 UTC
svn commit: r155721 - in lenya/trunk/src: confpatch/actions.xmap
java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java
webapp/lenya/usecase.xmap
Author: gregor
Date: Mon Feb 28 16:33:41 2005
New Revision: 155721
URL: http://svn.apache.org/viewcvs?view=rev&rev=155721
Log:
Removed old-style create and deactivate usecases
Removed:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java
Modified:
lenya/trunk/src/confpatch/actions.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?view=diff&r1=155720&r2=155721
==============================================================================
--- lenya/trunk/src/confpatch/actions.xmap (original)
+++ lenya/trunk/src/confpatch/actions.xmap Mon Feb 28 16:33:41 2005
@@ -17,7 +17,6 @@
<xmap xpath="/sitemap/components/actions" unless="/sitemap/components/actions/action[@name = 'authenticator']">
<map:action name="authorizer" src="org.apache.lenya.cms.cocoon.acting.DelegatingAuthorizerAction" logger="lenya.sitemap.action.authorizer"/>
- <map:action name="document-id-exists" logger="sitemap.action.document-id-exists" src="org.apache.lenya.cms.cocoon.acting.DocumentIdExistsAction" />
<map:action name="language-exists" logger="lenya.sitemap.action.language-exists" src="org.apache.lenya.cms.cocoon.acting.LanguageExistsAction"/>
<map:action name="oneformeditorsave" logger="sitemap.action.oneformeditormsave" src="org.apache.lenya.cms.cocoon.acting.OneFormEditorSaveAction" />
<map:action name="request-parameter-exists" logger="sitemap.action.requestParameterExists" src="org.apache.cocoon.acting.RequestParameterExistsAction" />
Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecase.xmap?view=diff&r1=155720&r2=155721
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Mon Feb 28 16:33:41 2005
@@ -205,62 +205,7 @@
</map:match>
<!-- /Publish -->
-
- <!-- create -->
- <map:match pattern="create" type="usecase">
-
- <map:match pattern="showscreen" type="step">
- <map:generate type="serverpages" src="fallback://lenya/content/authoring/create.xsp"/>
- <map:transform src="fallback://lenya/xslt/authoring/create.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- <map:parameter name="contextprefix" value="{request:contextPath}"/>
- </map:transform>
- <map:call resource="style-cms-page"/>
- </map:match>
-
- <map:match pattern="create" type="step">
- <!-- Make sure the child-id doesn't exist yet -->
- <map:act type="document-id-exists">
- <map:parameter name="document-id" value="{request-param:properties.create.parent-id}/{request-param:properties.create.child-id}"/>
- <map:act type="task">
- <map:parameter name="task-id" value="create"/>
- <map:redirect-to uri="{document-url:{page-envelope:area}:{request-param:properties.create.parent-id}/{request-param:properties.create.child-id}:{request-param:properties.create.language}}"/>
- </map:act>
- <map:generate type="serverpages" src="fallback://lenya/content/authoring/create.xsp"/>
- <map:transform src="fallback://lenya/xslt/authoring/create.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- <map:parameter name="contextprefix" value="{request:contextPath}"/>
- </map:transform>
- <map:call resource="style-cms-page"/>
- </map:act>
- <map:redirect-to uri="{request:requestURI}?doctype={request-param:properties.create.doctype}&lenya.usecase=create&lenya.step=showscreen&status=duplicate-id"/>
- </map:match>
-
- </map:match>
-
-
- <!-- create-language -->
- <map:match pattern="create-language" type="usecase">
-
- <map:match pattern="showscreen" type="step">
- <map:generate type="serverpages" src="fallback://lenya/content/authoring/create-language.xsp"/>
- <map:transform src="fallback://lenya/xslt/authoring/create-language.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- <map:parameter name="contextprefix" value="{request:contextPath}"/>
- </map:transform>
- <map:call resource="style-cms-page"/>
- </map:match>
-
- <map:match pattern="create" type="step">
- <map:act type="task">
- <map:parameter name="task-id" value="create-language"/>
- <map:parameter name="properties.create.doctype" value="{page-envelope:document-type}"/>
- <map:redirect-to uri="{document-url:{page-envelope:area}:{page-envelope:document-id}:{request-param:properties.create.new.language}}"/>
- </map:act>
- </map:match>
-
- </map:match>
-
+
<!-- ************************************************************** -->
<!-- ** Xopus ** -->
<!-- ** ** -->
@@ -385,11 +330,6 @@
<map:call resource="style-cms-page"/>
</map:match>
- <map:match pattern="showdots" type="step">
- <map:generate src="cocoon://{../../1}/lenya-image-upload/{../../2}/{../../3}"/>
- <map:serialize type="html"/>
- </map:match>
-
<map:match pattern="upload" type="step">
<map:act type="upload">
<map:parameter name="task-id" value="{request-param:task-id}"/>
@@ -544,27 +484,6 @@
<map:match pattern="restore" type="step">
<map:act type="task">
<map:redirect-to session="true" uri="{request:contextPath}/{../../../1}/{../../../2}/"/>
- </map:act>
- </map:match>
-
- </map:match>
-
-
- <map:match pattern="deactivate" type="usecase">
-
- <map:match pattern="showscreen" type="step">
- <map:generate src="fallback://lenya/content/info/deactivate.xsp" type="serverpages"/>
- <map:transform src="fallback://lenya/xslt/info/deactivate.xsl">
- <map:parameter name="use-request-parameters" value="true"/>
- </map:transform>
- <map:transform src="cocoon:/notification/{../../1}/deactivate.xsl"/>
- <map:transform src="cocoon://scheduler/{../../1}/{page-envelope:area}/{../../3}.xsl"/>
- <map:call resource="style-cms-page"/>
- </map:match>
-
- <map:match pattern="deactivate" type="step">
- <map:act type="task">
- <map:redirect-to session="true" uri="{request:requestURI}"/>
</map:act>
</map:match>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org