You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ro...@apache.org on 2004/10/24 15:49:27 UTC
svn commit: rev 55436 - in incubator/lenya/trunk/src/webapp: WEB-INF lenya
Author: roku
Date: Sun Oct 24 06:49:26 2004
New Revision: 55436
Modified:
incubator/lenya/trunk/src/webapp/WEB-INF/web-xml.xsl
incubator/lenya/trunk/src/webapp/lenya/usecase.xmap
Log:
[Merged from 1.2.x]
- Extracted edit (forms editor) usecase to separte sitemap
- Switched form-encoding to UTF-8 for testing purposes. Lets rip all iso-* out. Please help testing. I guess I had a licky hand this time.
Modified: incubator/lenya/trunk/src/webapp/WEB-INF/web-xml.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/WEB-INF/web-xml.xsl (original)
+++ incubator/lenya/trunk/src/webapp/WEB-INF/web-xml.xsl Sun Oct 24 06:49:26 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: web-xml.xsl,v 1.9 2004/04/17 07:37:01 roku Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -86,7 +86,15 @@
<param-value>allow</param-value>
</init-param>
</xsl:template>
-
+
+ <xsl:template match="/web-app/servlet[position() = 1]/init-param[position() = last()]">
+ <xsl:copy-of select="."/>
+ <init-param>
+ <param-name>form-encoding</param-name>
+ <param-value>UTF-8</param-value>
+ </init-param>
+ </xsl:template>
+
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
Modified: incubator/lenya/trunk/src/webapp/lenya/usecase.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/usecase.xmap Sun Oct 24 06:49:26 2004
@@ -314,123 +314,7 @@
</map:match>
</map:match>
-
- <!-- ************************************************************** -->
- <!-- ** HTML Form Editor ** -->
- <!-- ** ** -->
- <!-- ** NOTE: page-envelope:document-path depends on the ** -->
- <!-- ** publication specific DocumentIdToPathMapper which ** -->
- <!-- ** is configured within config/publication.xconf ** -->
- <!-- ************************************************************** -->
- <map:match pattern="edit" type="usecase">
- <map:match pattern="open" type="step">
- <map:match pattern="*/authoring/**.html">
- <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:generate src="pubs/{1}/content/authoring/{page-envelope:document-path}"/>
- <map:transform src="xslt/authoring/edit/numberTags.xsl"/>
- <map:transform src="xslt/authoring/edit/addSourceTags.xsl">
- <map:parameter name="source" value="pubs/{1}/work/editor/authoring/{page-envelope:document-path}"/>
- </map:transform>
- <map:transform type="write-source">
- <map:parameter name="serializer" value="xml"/>
- </map:transform>
- <map:transform src="xslt/authoring/edit/removeSourceTags.xsl"/>
- <map:transform src="fallback://lenya/xslt/formeditor/{request-param:form}.xsl">
- <map:parameter name="docid" value="{page-envelope:document-path}"/>
- <map:parameter name="form" value="{request-param:form}"/>
- </map:transform>
- <map:transform src="fallback://lenya/xslt/authoring/edit/form-layout.xsl">
- <map:parameter name="contextPrefix" value="{page-envelope:context-prefix}"/>
- <map:parameter name="wfevent" value="{request-param:lenya.event}"/>
- </map:transform>
- <map:call resource="style-cms-page"/>
-
-
- </map:match>
- </map:match>
-
- <map:match pattern="close" type="step">
- <map:match pattern="*/authoring/**.html">
- <map:act type="save">
- <map:parameter name="file" value="pubs/{1}/work/editor/authoring/{page-envelope:document-path}"/>
- <map:parameter name="schema" value="fallback://config/doctypes/schemas/{request-param:form}.rng"/>
- <map:parameter name="unnumberTagsXSL" value="xslt/authoring/edit/unnumberTags.xsl"/>
- <map:parameter name="numberTagsXSL" value="xslt/authoring/edit/numberTags.xsl"/>
-
- <!-- Continue editing: Insert, Delete, etc. -->
- <map:generate src="pubs/{../1}/work/editor/authoring/{page-envelope:document-path}"/>
-
- <map:transform src="fallback://lenya/xslt/formeditor/{request-param:form}.xsl">
- <map:parameter name="docid" value="{page-envelope:document-path}"/>
- <map:parameter name="form" value="{request-param:form}"/>
- <map:parameter name="message" value="{message}"/>
- </map:transform>
- <map:transform src="fallback://lenya/xslt/authoring/edit/form-layout.xsl">
- <map:parameter name="contextPrefix" value="{page-envelope:context-prefix}"/>
- <map:parameter name="edit" value="{editSelect}"/>
- <map:parameter name="wfevent" value="{request-param:lenya.event}"/>
- </map:transform>
- <map:call resource="style-cms-page"/>
- </map:act>
-
- <!-- Stop Editing: Save and Cancel -->
- <!-- If temporary file exists, then SAVE else CANCEL -->
- <map:act type="resource-exists" src="pubs/{1}/work/editor/authoring/{page-envelope:document-path}">
- <map:generate src="pubs/{../1}/work/editor/authoring/{page-envelope:document-path}"/>
- <map:transform src="xslt/authoring/edit/unnumberTags.xsl"/>
-
- <map:transform src="xslt/authoring/edit/addSourceTags.xsl">
- <map:parameter name="source" value="pubs/{../1}/content/authoring/{page-envelope:document-path}"/>
- </map:transform>
- <map:transform type="write-source"/>
-
- <map:act type="workflow">
- <map:parameter name="area" value="{page-envelope:area}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
- <map:parameter name="language" value="{page-envelope:document-language}"/>
- <map:parameter name="event" value="{request-param:lenya.event}"/>
- </map:act>
-
- <map:transform src="xslt/authoring/edit/redirect-to.xsl">
- <map:parameter name="uri" value="{page-envelope:context-prefix}/{../1}/authoring/{../2}.html?lenya.usecase=checkin&lenya.step=checkin&backup=true"/>
- </map:transform>
- <map:serialize type="html" />
- </map:act>
-
- <!-- If CANCEL then the document also needs to be checked in -->
- <map:act type="reserved-checkin">
- <map:parameter name="backup" value="false"/>
- <map:generate src="content/rc/{exception}.xsp" type="serverpages">
- <map:parameter name="user" value="{user}"/>
- <map:parameter name="filename" value="{filename}"/>
- <map:parameter name="checkType" value="{checkType}"/>
- <map:parameter name="date" value="{date}"/>
- <map:parameter name="message" value="{message}"/>
- </map:generate>
- <map:transform src="xslt/rc/rco-exception.xsl"/>
- <map:serialize/>
- </map:act>
-
- <map:redirect-to uri="{request:requestURI}"/>
- </map:match>
- </map:match>
- </map:match>
- <!-- ************************************************************** -->
- <!-- ******** /HTML Form Editor ********************************** -->
- <!-- ************************************************************** -->
-
-
-
-
+
<!-- ************************************************************** -->
<!-- ** Xopus ** -->
<!-- ** ** -->
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org