You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ts...@apache.org on 2005/03/24 17:54:33 UTC
svn commit: r158926 - in lenya/trunk/src/webapp/lenya:
pubs/default/usecase-bxe.xmap usecases/edit-document.js
Author: tschlabach
Date: Thu Mar 24 08:54:31 2005
New Revision: 158926
URL: http://svn.apache.org/viewcvs?view=rev&rev=158926
Log:
added some comments and formatting
Modified:
lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
lenya/trunk/src/webapp/lenya/usecases/edit-document.js
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?view=diff&r1=158925&r2=158926
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap Thu Mar 24 08:54:31 2005
@@ -65,7 +65,7 @@
</map:flow>
<!-- =========================== Pipelines ================================ -->
- <map:pipelines>
+ <map:pipelines>
<map:pipeline type="noncaching">
@@ -79,34 +79,44 @@
<map:match type="usecase" pattern="bxe">
- <map:match type="step" pattern="open">
- <!-- Check for bxe -->
- <map:act type="resource-exists" src="../../resources/bxe/bxeLoader.js">
- <map:act type="reserved-checkout">
- <map:generate type="serverpages" src="../../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="../../xslt/rc/rco-exception.xsl"/>
- <map:call resource="style-cms-page"/>
- </map:act>
- <map:aggregate element="bxe">
- <map:part src="../../resources/misc/bxe/index.xhtml"/>
- <map:part src="../../resources/misc/bxe/content-namespaces.xml"/>
- </map:aggregate>
- <map:transform src="../../xslt/bxe/aggregate.xsl"/>
- <map:transform src="../../xslt/bxe/index-xhtml.xsl">
- <map:parameter name="configfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=config"/>
- <map:parameter name="context" value="{request:contextPath}"/>
- </map:transform>
- <map:transform src="../../xslt/util/strip_namespaces.xsl"/>
- <map:serialize type="xhtml"/>
- </map:act>
- <map:generate src="../../resources/misc/bxe/download.xhtml"/>
- <map:call resource="style-cms-page"/>
- <map:serialize type="xhtml"/>
+ <map:match type="step" pattern="open">
+
+ <!--+
+ | Check if BXE is installed
+ +-->
+ <map:act type="resource-exists" src="../../resources/bxe/bxeLoader.js">
+
+ <map:act type="reserved-checkout">
+ <map:generate type="serverpages" src="../../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="../../xslt/rc/rco-exception.xsl"/>
+ <map:call resource="style-cms-page"/>
+ </map:act>
+
+ <map:aggregate element="bxe">
+ <map:part src="../../resources/misc/bxe/index.xhtml"/>
+ <map:part src="../../resources/misc/bxe/content-namespaces.xml"/>
+ </map:aggregate>
+ <map:transform src="../../xslt/bxe/aggregate.xsl"/>
+ <map:transform src="../../xslt/bxe/index-xhtml.xsl">
+ <map:parameter name="configfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=config"/>
+ <map:parameter name="context" value="{request:contextPath}"/>
+ </map:transform>
+ <map:transform src="../../xslt/util/strip_namespaces.xsl"/>
+ <map:serialize type="xhtml"/>
+ </map:act>
+
+ <!--+
+ | BXE is not installed - generate info page for the user
+ +-->
+ <map:generate src="../../resources/misc/bxe/download.xhtml"/>
+ <map:call resource="style-cms-page"/>
+ <map:serialize type="xhtml"/>
+
</map:match>
<map:match pattern="image-upload-show" type="step">
@@ -207,7 +217,11 @@
</map:match>
<map:match pattern="**/*.html">
- <!-- configuration -->
+
+ <!--+
+ | Build the BXE configuration
+ +-->
+
<map:match type="step" pattern="config">
<map:generate src="../../resources/misc/bxe/inc/config.xml"/>
<map:transform src="../../xslt/bxe/config-xml.xsl">
@@ -229,6 +243,7 @@
<map:transform type="cinclude"/>
<map:serialize type="xml"/>
</map:match>
+
</map:match>
<map:match pattern="*/**.html">
@@ -238,22 +253,26 @@
<map:select type="request-method">
<map:when test="PUT">
- <!-- before we save, we must be sure that the document is well checked out
- -->
- <map:act type="reserved-checkout-test">
- <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
- <map:parameter name="user" value="{user}"/>
- <map:parameter name="filename" value="{filename}"/>
- <map:parameter name="date" value="{date}"/>
- </map:generate>
- <map:transform src="../../xslt/rc/rco-exception.xsl"/>
- <map:call resource="style-cms-page"/>
- </map:act>
+
+ <!--+
+ | before we save, we must be sure that the document is well checked out
+ +-->
+
+ <map:act type="reserved-checkout-test">
+ <map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
+ <map:parameter name="user" value="{user}"/>
+ <map:parameter name="filename" value="{filename}"/>
+ <map:parameter name="date" value="{date}"/>
+ </map:generate>
+ <map:transform src="../../xslt/rc/rco-exception.xsl"/>
+ <map:call resource="style-cms-page"/>
+ </map:act>
- <map:call function="editDocument">
- <map:parameter name="sourceUri" value="cocoon:/request2document"/>
- <map:parameter name="noCheckin" value="true"/>
- </map:call>
+ <map:call function="editDocument">
+ <map:parameter name="sourceUri" value="cocoon:/request2document"/>
+ <map:parameter name="noCheckin" value="true"/>
+ </map:call>
+
</map:when>
<map:otherwise> <!-- GET -->
@@ -298,4 +317,4 @@
</map:pipelines>
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>
Modified: lenya/trunk/src/webapp/lenya/usecases/edit-document.js
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/edit-document.js?view=diff&r1=158925&r2=158926
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/edit-document.js (original)
+++ lenya/trunk/src/webapp/lenya/usecases/edit-document.js Thu Mar 24 08:54:31 2005
@@ -42,20 +42,34 @@
var resolver = cocoon.getComponent(SourceResolver.ROLE);
var dstUri = flowHelper.getPageEnvelope(cocoon).getDocument().getSourceURI();
+
+ /* do the actual copying */
+
SourceUtil.copy(resolver, cocoon.parameters["sourceUri"], dstUri, _getParameter("useBuffer", "false") == "true");
+
+ /* are we supposed to check the document in after saving ? */
+
if(_getParameter("noCheckin", "false") == "false")
flowHelper.reservedCheckIn(cocoon, _getParameter("backup", "true") == "true");
+
+ /* do we need to trigger any worklow on the just saved document? */
+
if(_getParameter("noWorkflow", "false") == "false")
flowHelper.triggerWorkflow(cocoon, _getParameter("workflowEvent", "edit"));
+
if(_getParameter("noStatus", "false") == "false")
cocoon.sendStatus(_getParameter("status", 204));
else
cocoon.redirectTo(_getParameter("redirectUrl", "FIXME"));
} catch (exception) {
+
+ /* FIXME: This is unclean because the flow will not return a value
+ if there is an exception */
+
cocoon.log.error("Can not edit document.", exception.toString());
} finally {
if(resolver != null)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org