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 2006/06/26 18:34:26 UTC
svn commit: r417228 - in /lenya/trunk/src/webapp/lenya/usecases:
edit-document.js kupu/usecase-kupu.xmap
Author: andreas
Date: Mon Jun 26 09:34:26 2006
New Revision: 417228
URL: http://svn.apache.org/viewvc?rev=417228&view=rev
Log:
Updated Kupu sitemap references to use resources from module, fixed API call n edit-document.js
Modified:
lenya/trunk/src/webapp/lenya/usecases/edit-document.js
lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap
Modified: lenya/trunk/src/webapp/lenya/usecases/edit-document.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/usecases/edit-document.js?rev=417228&r1=417227&r2=417228&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/edit-document.js (original)
+++ lenya/trunk/src/webapp/lenya/usecases/edit-document.js Mon Jun 26 09:34:26 2006
@@ -49,12 +49,12 @@
var usecase;
try {
- usecaseResolver = cocoon.getComponent("org.apache.lenya.cms.usecase.UsecaseResolver");
- usecase = usecaseResolver.resolve(usecaseName);
-
var flowHelper = cocoon.getComponent("org.apache.lenya.cms.cocoon.flow.FlowHelper");
var request = flowHelper.getRequest(cocoon);
var sourceUrl = Packages.org.apache.lenya.util.ServletHelper.getWebappURI(request);
+
+ usecaseResolver = cocoon.getComponent("org.apache.lenya.cms.usecase.UsecaseResolver");
+ usecase = usecaseResolver.resolve(sourceUrl, usecaseName);
if (cocoon.log.isDebugEnabled()) {
cocoon.log.debug("edit-document.js::editDocument() calling usecase methods, usecaseName [" + usecaseName + "], sourceUrl [" + sourceUrl + "]");
Modified: lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap?rev=417228&r1=417227&r2=417228&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecases/kupu/usecase-kupu.xmap Mon Jun 26 09:34:26 2006
@@ -68,13 +68,13 @@
<!-- Flow callbacks -->
<map:match pattern="sitetree_link_library_template">
- <map:generate src="fallback://lenya/resources/kupu/apache-lenya/lenya/drawers/sitetree_link_library.xml.jx" type="jx">
+ <map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/sitetree_link_library.xml.jx" type="jx">
<map:parameter name="resource-icon-url" value="{page-envelope:context-prefix}/kupu/apache-lenya/kupu/images/right_arrow.png"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="publication_image_library_template">
- <map:generate src="fallback://lenya/resources/kupu/apache-lenya/lenya/drawers/publication_image_library.xml.jx" type="jx">
+ <map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/publication_image_library.xml.jx" type="jx">
<map:parameter name="resource-icon-url" value="{page-envelope:context-prefix}/{global:resourceIconUrl}"/>
</map:generate>
<map:serialize type="xml"/>
@@ -85,7 +85,7 @@
<map:part element="original"
src="lenya://lenya/pubs/{page-envelope:publication-id}/content/authoring/{page-envelope:document-path}"/>
</map:aggregate>
- <map:transform src="fallback://lenya/resources/kupu/apache-lenya/lenya/kupusave.xsl"/>
+ <map:transform src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/kupusave.xsl"/>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
@@ -97,7 +97,7 @@
<map:match pattern="*/authoring/**.html">
<!-- Check if Kupu is installed -->
<map:act type="resource-exists"
- src="fallback://lenya/resources/kupu/apache-lenya/kupu/kupumacros.html">
+ src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/kupu/kupumacros.html">
<map:act type="reserved-checkout">
<map:generate type="serverpages"
src="fallback://lenya/content/rc/{exception}.xsp">
@@ -111,15 +111,15 @@
<map:serialize />
</map:act>
<map:generate
- src="fallback://lenya/resources/kupu/apache-lenya/kupu/kupumacros.html"/>
- <map:transform src="fallback://lenya/resources/kupu/apache-lenya/lenya/kupumacros.xsl">
+ 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">
<map:parameter name="contentfile"
value="{request:requestURI}?lenya.usecase=kupu&lenya.step=content"/>
<map:parameter name="context-prefix" value="{request:contextPath}"/>
<!-- Only used to display the document path of the edited doc -->
<map:parameter name="document-path" value="{page-envelope:document-path}"/>
<map:parameter name="save-destination"
- value="{request:requestURI}"/>
+ value="{request:requestURI}?lenya.usecase=kupu&lenya.step=save"/>
<map:parameter name="exit-destination"
value="{request:requestURI}?lenya.usecase=kupu&lenya.step=exit"/>
<map:parameter name="reload-after-save" value="1"/>
@@ -146,7 +146,7 @@
<map:match pattern="*/authoring/**">
<map:generate src="lenya://lenya/pubs/{1}/content/authoring/{page-envelope:document-path}"/>
<map:transform
- src="fallback://lenya/resources/kupu/apache-lenya/lenya/content2edit.xsl">
+ src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/content2edit.xsl">
<map:parameter name="css"
value="{page-envelope:context-prefix}/{1}/authoring/css/page.css"/>
<map:parameter name="nodeid" value="{page-envelope:document-name}"/>
@@ -158,7 +158,7 @@
<!-- Kupu Image Drawer -->
<map:match pattern="*drawerxsl" type="step">
- <map:generate type="jx" src="fallback://lenya/resources/kupu/apache-lenya/lenya/drawers/{1}drawer.xsl">
+ <map:generate type="jx" src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/{1}drawer.xsl">
<!-- We need to use the hole uri scheme i.e. http://servername:port/, since IE xslt processor
throws an access violation upon loading of xslts from the internet.
-->
@@ -169,7 +169,7 @@
</map:match>
<map:match pattern="image_libraries" type="step">
- <map:generate src="fallback://lenya/resources/kupu/apache-lenya/lenya/drawers/imagelibraries.xml.jx" type="jx">
+ <map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/imagelibraries.xml.jx" type="jx">
<map:parameter name="pubLibUrl" value="{request:requestURI}?lenya.usecase=kupu&lenya.step=publication_image_library"/>
<map:parameter name="pageLibUrl" value="{request:requestURI}?lenya.usecase=kupu&lenya.step=page_image_library"/>
<map:parameter name="imageBaseUrl" value="{page-envelope:context-prefix}/kupu/apache-lenya/kupu/images"/>
@@ -177,7 +177,7 @@
<map:serialize type="xml"/>
</map:match>
<map:match pattern="link_libraries" type="step">
- <map:generate src="fallback://lenya/resources/kupu/apache-lenya/lenya/drawers/linklibraries.xml.jx" type="jx">
+ <map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/linklibraries.xml.jx" type="jx">
<map:parameter name="pubLibUrl" value="{request:requestURI}?lenya.usecase=kupu&lenya.step=sitetree_link_library"/>
<map:parameter name="pageLibUrl" value="{request:requestURI}?lenya.usecase=kupu&lenya.step=other_link_library"/>
<map:parameter name="imageBaseUrl" value="{page-envelope:context-prefix}/kupu/apache-lenya/kupu/images"/>
@@ -187,7 +187,7 @@
<map:match pattern="page_image_library" type="step">
<map:generate src="fallback://lenya/content/info/assets.xsp" type="serverpages"/>
- <map:transform src="fallback://lenya/resources/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl">
+ <map:transform src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl">
<map:parameter name="iconUrl" value="{page-envelope:context-prefix}/{global:resourceIconUrl}"/>
<map:parameter name="resource-path-url" value="{page-envelope:document-id}/"/>
</map:transform>
@@ -204,7 +204,7 @@
</map:match>
<map:match pattern="*_library" type="step">
- <map:generate src="fallback://lenya/resources/kupu/apache-lenya/lenya/drawers/{1}_library.xml.jx" type="jx"/>
+ <map:generate src="fallback://lenya/modules/kupu/resources/kupu/apache-lenya/lenya/drawers/{1}_library.xml.jx" type="jx"/>
<map:serialize type="xml"/>
</map:match>
<!-- /Kupu Image Drawer -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org