You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/07/18 18:05:05 UTC
svn commit: r557310 - in /lenya/trunk/src/modules/kupu:
config/cocoon-xconf/usecase-kupu.xconf sitemap.xmap usecases/
usecases/kupu.jx
Author: andreas
Date: Wed Jul 18 09:05:03 2007
New Revision: 557310
URL: http://svn.apache.org/viewvc?view=rev&rev=557310
Log:
Use JX template for Kupu. This allows to show error messages instead of starting Kupu.
Added:
lenya/trunk/src/modules/kupu/usecases/
lenya/trunk/src/modules/kupu/usecases/kupu.jx
Modified:
lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf
lenya/trunk/src/modules/kupu/sitemap.xmap
Modified: lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf?view=diff&rev=557310&r1=557309&r2=557310
==============================================================================
--- lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf (original)
+++ lenya/trunk/src/modules/kupu/config/cocoon-xconf/usecase-kupu.xconf Wed Jul 18 09:05:03 2007
@@ -22,8 +22,9 @@
<xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'kupu.edit']">
<component-instance name="kupu.edit" logger="lenya.publication"
- class="org.apache.lenya.cms.workflow.usecases.CheckWorkflow">
- <view uri="cocoon://modules/kupu/kupu.open" menu="false" createContinuation="false"/>
+ class="org.apache.lenya.cms.workflow.usecases.InvokeWorkflow">
+ <view template="modules/kupu/usecases/kupu.jx" menu="false" createContinuation="false"/>
+ <transaction policy="pessimistic"/>
<event id="edit"/>
</component-instance>
Modified: lenya/trunk/src/modules/kupu/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/kupu/sitemap.xmap?view=diff&rev=557310&r1=557309&r2=557310
==============================================================================
--- lenya/trunk/src/modules/kupu/sitemap.xmap (original)
+++ lenya/trunk/src/modules/kupu/sitemap.xmap Wed Jul 18 09:05:03 2007
@@ -94,18 +94,6 @@
<map:pipeline>
<map:match pattern="kupu.open">
- <map:act type="reserved-checkout">
- <map:generate type="serverpages"
- src="fallback://lenya/content/rc/{exception}.xsp">
- <map:parameter name="user" value="{user}"/>
- <map:parameter name="filename" value="{filename}"/>
- <map:parameter name="date" value="{date}"/>
- <map:parameter name="message" value="{message}"/>
- </map:generate>
- <map:transform src="fallback://lenya/xslt/rc/rco-exception.xsl"/>
- <map:call resource="style-cms-page"/>
- <map:serialize />
- </map:act>
<map:generate
src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html"/>
<map:transform src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/kupumacros.xsl">
@@ -113,7 +101,7 @@
value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=content"/>
<map:parameter name="context-prefix" value="{request:contextPath}/{page-envelope:publication-id}/modules/kupu"/>
<!-- Only used to display the document path of the edited doc -->
- <map:parameter name="document-path" value="{page-envelope:document-path}"/>
+ <map:parameter name="document-path" value=""{dublincore:title}""/>
<map:parameter name="save-destination" value="{proxy:{request:requestURI}}?lenya.event=edit"/>
<map:parameter name="exit-destination" value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=exit"/>
<map:parameter name="reload-after-save" value="1"/>
@@ -127,7 +115,7 @@
<map:parameter name="link-libraries-uri"
value="{proxy:{request:requestURI}}?lenya.module=kupu&lenya.step=link_libraries"/>
</map:transform>
- <map:serialize type="xhtml"/>
+ <map:serialize type="xml"/>
</map:match>
<!-- Requested by Kupu to load the document into the editor -->
Added: lenya/trunk/src/modules/kupu/usecases/kupu.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/kupu/usecases/kupu.jx?view=auto&rev=557310
==============================================================================
--- lenya/trunk/src/modules/kupu/usecases/kupu.jx (added)
+++ lenya/trunk/src/modules/kupu/usecases/kupu.jx Wed Jul 18 09:05:03 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<jx:choose
+ xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+ xmlns:ci="http://apache.org/cocoon/include/1.0">
+
+ <jx:when test="${usecase.hasErrors()}">
+ <page:page
+ xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+ >
+
+ <page:title><i18n:text>Kupu Editor</i18n:text></page:title>
+
+ <jx:set var="sourceUrl" value="${usecase.getSourceURL()}"/>
+ <jx:set var="steps" value="${sourceUrl.split('/')}"/>
+ <jx:set var="lastStep" value="${steps[steps.size() - 1]}"/>
+
+ <page:body>
+ <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+ </page:body>
+ </page:page>
+ </jx:when>
+ <jx:otherwise>
+ <ci:include src="cocoon://modules/kupu/kupu.open"/>
+ </jx:otherwise>
+</jx:choose>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org