Author: rfrovarp
Date: Fri Oct 19 08:13:36 2007
New Revision: 586495
URL: http://svn.apache.org/viewvc?rev=586495&view=rev
Log:
Substitute document-uuid for document-id as document-id is deprecated. See bug 43038.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentURLModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentIdToPathMapper.java
lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/src/modules/editors/sitemap.xmap
lenya/trunk/src/modules/fckeditor/sitemap.xmap
lenya/trunk/src/modules/linkcheck/sitemap.xmap
lenya/trunk/src/modules/lucene/sitemap.xmap
lenya/trunk/src/modules/menubar/sitemap.xmap
lenya/trunk/src/modules/opendocument/sitemap.xmap
lenya/trunk/src/modules/svg/sitemap.xmap
lenya/trunk/src/modules/webdav/sitemap.xmap
lenya/trunk/src/modules/xopus/sitemap.xmap
lenya/trunk/src/pubs/default/config/menus/generic.xsp
lenya/trunk/src/pubs/default/lenya/content/publishing/publish-screen.xsp
lenya/trunk/src/webapp/global-sitemap.xmap
lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
lenya/trunk/src/webapp/lenya/usecase.xmap
lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentURLModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentURLModule.java?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentURLModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/DocumentURLModule.java Fri Oct 19 08:13:36 2007
@@ -52,7 +52,7 @@
if (attributes.length < 3) {
throw new ConfigurationException("Invalid number of parameters: " + attributes.length
- + ". Expected 3 (area, document-id, language)");
+ + ". Expected 3 (area, document-uuid, language)");
}
final String area = attributes[0];
@@ -88,4 +88,4 @@
return objects;
}
-}
\ No newline at end of file
+}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java Fri Oct 19 08:13:36 2007
@@ -42,7 +42,7 @@
/**
* Input module wrapping the page envelope. This module provides publication
- * related information such as document-id, area, publication-id.
+ * related information such as document-uuid, area, publication-id.
*
* @see org.apache.lenya.cms.publication.PageEnvelope
* @deprecated use DocumentInfoModule instead.
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java Fri Oct 19 08:13:36 2007
@@ -97,7 +97,7 @@
* Returns all the languages this document is available in.
* A document has one associated language (@see Document#getLanguage)
* but there are possibly a number of other languages for which a
- * document with the same document-id is also available in.
+ * document with the same document-uuid is also available in.
*
* @return An array of strings denoting the languages.
*
@@ -138,7 +138,7 @@
String getUUID();
/**
- * Check if a document with the given document-id, language and in the given
+ * Check if a document with the given document-uuid, language and in the given
* area actually exists.
*
* @return true if the document exists, false otherwise
@@ -148,10 +148,10 @@
boolean exists() throws DocumentException;
/**
- * Check if a document exists with the given document-id and the given area
+ * Check if a document exists with the given document-uuid and the given area
* independently of the given language.
*
- * @return true if a document with the given document-id and area exists, false otherwise
+ * @return true if a document with the given document-uuid and area exists, false otherwise
*
* @throws DocumentException if an error occurs
*/
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentIdToPathMapper.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentIdToPathMapper.java?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentIdToPathMapper.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentIdToPathMapper.java Fri Oct 19 08:13:36 2007
@@ -28,7 +28,7 @@
public interface DocumentIdToPathMapper {
/**
- * Compute the document-path for a given publication, area and document-id. The file separator
+ * Compute the document-path for a given publication, area and document-uuid. The file separator
* is the slash (/).
*
* @param uuid the UUID of the document
@@ -39,7 +39,7 @@
String getPath(String uuid, String language);
/**
- * Compute the document-path for a given publication, area, document-id and language
+ * Compute the document-path for a given publication, area, document-uuid and language
*
* @param publication the publication of the document
* @param area the area of the document
Modified: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java Fri Oct 19 08:13:36 2007
@@ -43,7 +43,7 @@
* Action to invoke a workflow transition independently from the request document URL. Parameters:
* <ul>
* <li><strong>area: </strong> The area.</li>
- * <li><strong>document-id: </strong> The document id.</li>
+ * <li><strong>document-uuid: </strong> The document uuid.</li>
* <li><strong>language: </strong> The language.</li>
* <li><strong>event: </strong> The event to invoke.</li>
* </ul>
@@ -55,9 +55,9 @@
*/
public static final String AREA = "area";
/**
- * <code>DOCUMENT_ID</code> The document id
+ * <code>DOCUMENT_UUID</code> The document id
*/
- public static final String DOCUMENT_ID = "document-id";
+ public static final String DOCUMENT_UUID = "document-uuid";
/**
* <code>LANGUAGE</code> The language
*/
@@ -76,7 +76,7 @@
Parameters parameters) throws Exception {
String area = parameters.getParameter(AREA);
- String documentId = parameters.getParameter(DOCUMENT_ID);
+ String documentId = parameters.getParameter(DOCUMENT_UUID);
String language = parameters.getParameter(LANGUAGE);
String eventName = parameters.getParameter(EVENT);
@@ -108,4 +108,4 @@
return Collections.EMPTY_MAP;
}
-}
\ No newline at end of file
+}
Modified: lenya/trunk/src/modules/editors/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/sitemap.xmap (original)
+++ lenya/trunk/src/modules/editors/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -73,7 +73,7 @@
</map:otherwise>
</map:select>
<map:transform src="fallback://lenya/modules/editors/usecases/forms/oneform.xsl">
- <map:parameter name="docid" value="{page-envelope:document-id}"/>
+ <map:parameter name="docid" value="{page-envelope:document-uuid}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
</map:transform>
<map:serialize type="xml"/>
Modified: lenya/trunk/src/modules/fckeditor/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/fckeditor/sitemap.xmap (original)
+++ lenya/trunk/src/modules/fckeditor/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -57,7 +57,7 @@
</map:match>
<map:match pattern="content">
- <map:generate src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}"/>
+ <map:generate src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}"/>
<map:transform type="uuid2url">
<map:parameter name="urls" value="absolute"/>
</map:transform>
Modified: lenya/trunk/src/modules/linkcheck/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/linkcheck/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/linkcheck/sitemap.xmap (original)
+++ lenya/trunk/src/modules/linkcheck/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -42,18 +42,18 @@
<map:parameter name="compare-to" value="lenya://lenya/pubs/{page-envelope:publication-id}/content/{page-envelope:area}/{page-envelope:document-path}"/>
<!-- Read from cache -->
<!-- If configured within Apache then mod_lenya will nevertheless read from cache -->
- <map:when test="context://lenya/pubs/{page-envelope:publication-id}/work/cache/{page-envelope:area}/{page-envelope:document-id}.linkreport">
- <map:generate src="context://lenya/pubs/{page-envelope:publication-id}/work/cache/{page-envelope:area}/{page-envelope:document-id}.linkreport" mime-type="text/xml; charset=utf-8"/>
+ <map:when test="context://lenya/pubs/{page-envelope:publication-id}/work/cache/{page-envelope:area}/{page-envelope:document-uuid}.linkreport">
+ <map:generate src="context://lenya/pubs/{page-envelope:publication-id}/work/cache/{page-envelope:area}/{page-envelope:document-uuid}.linkreport" mime-type="text/xml; charset=utf-8"/>
<map:serialize type="xml"/>
</map:when>
<!-- Write to cache and serialize -->
<map:otherwise>
- <map:generate type="linkStatus" src="/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-id}.html">
+ <map:generate type="linkStatus" src="/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-uuid}.html">
<map:parameter name="depth" value="1"/>
</map:generate>
<map:transform src="fallback://lenya/xslt/util/strip_namespaces.xsl"/>
<map:transform src="fallback://lenya/xslt/authoring/edit/addSourceTags.xsl">
- <map:parameter name="source" value="context://lenya/pubs/{page-envelope:publication-id}/work/cache/{page-envelope:area}/{page-envelope:document-id}.linkreport"/>
+ <map:parameter name="source" value="context://lenya/pubs/{page-envelope:publication-id}/work/cache/{page-envelope:area}/{page-envelope:document-uuid}.linkreport"/>
</map:transform>
<map:transform type="write-source">
<map:parameter name="serializer" value="xml"/>
@@ -68,4 +68,4 @@
</map:pipelines>
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>
Modified: lenya/trunk/src/modules/lucene/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/lucene/sitemap.xmap (original)
+++ lenya/trunk/src/modules/lucene/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -54,7 +54,7 @@
<map:transform src="fallback://lenya/modules/lucene/xslt/search2opensearch.xsl">
<map:parameter name="root" value="/{page-envelope:publication-id}/{page-envelope:area}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="document-uuid" value="{page-envelope:document-uuid}"/>
<map:parameter name="publication-id" value="{page-envelope:publication-id}"/>
<map:parameter name="document-type" value="{page-envelope:document-type}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
@@ -82,7 +82,7 @@
<map:transform src="fallback://xslt/page2xhtml-{page-envelope:document-type}.xsl">
<map:parameter name="root" value="{proxy:/{page-envelope:publication-id}/{page-envelope:area}}"/>
- <map:parameter name="document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="document-uuid" value="{page-envelope:document-uuid}"/>
<map:parameter name="document-type" value="{page-envelope:document-type}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
<map:parameter name="url" value="{page-envelope:document-url}"/>
Modified: lenya/trunk/src/modules/menubar/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/menubar/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/menubar/sitemap.xmap (original)
+++ lenya/trunk/src/modules/menubar/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -30,7 +30,7 @@
<map:parameter name="publicationid" value="{1}"/>
<map:parameter name="area" value="{2}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="userid" value="{access-control:user-id}"/>
<map:parameter name="servertime" value="{date-i18n:currentDate}"/>
<map:parameter name="workflowstate" value="{workflow:state}"/>
@@ -119,7 +119,7 @@
<map:parameter name="publicationid" value="{1}"/>
<map:parameter name="area" value="{2}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="userid" value="{access-control:user-id}"/>
<map:parameter name="servertime" value="{date-i18n:currentDate}"/>
<map:parameter name="workflowstate" value="{workflow:state}"/>
Modified: lenya/trunk/src/modules/opendocument/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/opendocument/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/opendocument/sitemap.xmap (original)
+++ lenya/trunk/src/modules/opendocument/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -26,7 +26,7 @@
<map:match pattern="davget.xml">
<map:act type="set-header">
<map:parameter name="Last-Modified" value="{date-iso8601-rfc822:{page-envelope:document-lastmodified}}" />
- <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}" mime-type="application/vnd.oasis.opendocument.text"/>
+ <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}" mime-type="application/vnd.oasis.opendocument.text"/>
</map:act>
</map:match>
@@ -34,11 +34,11 @@
<!-- pattern="{rendertype}" -->
<map:match pattern="*.xml">
- <map:generate src="zip:lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}!/content.xml"/>
+ <map:generate src="zip:lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}!/content.xml"/>
<!--
- <map:parameter name="metaFileURL" value="{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-id}/{page-envelope:document-language}/meta.xml"/>
- <map:parameter name="stylesFileURL" value="{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-id}/{page-envelope:document-language}/styles.xml"/>
+ <map:parameter name="metaFileURL" value="{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-uuid}/{page-envelope:document-language}/meta.xml"/>
+ <map:parameter name="stylesFileURL" value="{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-uuid}/{page-envelope:document-language}/styles.xml"/>
-->
<map:transform src="fallback://lenya/modules/opendocument/xslt/opendocument2xhtml.xsl">
@@ -50,7 +50,7 @@
</map:match>
<map:match pattern="**.odt">
- <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}" mime-type="application/vnd.oasis.opendocument.text"/>
+ <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}" mime-type="application/vnd.oasis.opendocument.text"/>
</map:match>
</map:pipeline>
Modified: lenya/trunk/src/modules/svg/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/svg/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/svg/sitemap.xmap (original)
+++ lenya/trunk/src/modules/svg/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -83,7 +83,7 @@
<map:read src="fallback://resources/shared/{../../3}.{../../4}" mime-type="image/gif" />
</map:act>
<map:act type="language-exists">
- <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-id}" mime-type="image/gif"/>
+ <map:read src="lenyadoc:/{page-envelope:document-language}/{page-envelope:document-uuid}" mime-type="image/gif"/>
</map:act>
</map:match>
Modified: lenya/trunk/src/modules/webdav/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/webdav/sitemap.xmap (original)
+++ lenya/trunk/src/modules/webdav/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -284,7 +284,7 @@
<map:generate type="file" src="cocoon:/request/generate"/>
<map:transform type="xslt" src="fallback://lenya/modules/webdav/xslt/lock.xsl">
<map:parameter name="userid" value="{access-control:user-id}"/>
- <map:parameter name="docid" value="{page-envelope:document-id}"/>
+ <map:parameter name="docid" value="{page-envelope:document-uuid}"/>
</map:transform>
<map:serialize type="xml" status-code="200" />
</map:when>
Modified: lenya/trunk/src/modules/xopus/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/xopus/sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/modules/xopus/sitemap.xmap (original)
+++ lenya/trunk/src/modules/xopus/sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -82,7 +82,7 @@
<map:parameter name="publicationId" value="{page-envelope:publication-id}"/>
<map:parameter name="completeArea" value="authoring"/>
<map:parameter name="documentUrl" value="{page-envelope:document-url}"/>
- <map:parameter name="documentId" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentId" value="{page-envelope:document-uuid}"/>
<map:parameter name="xopusContext" value="{xopus:context}"/>
</map:transform>
<!-- NOTE: IE or Xopus doesn't appreciate the DTD which is being inserted by Cocoon -->
Modified: lenya/trunk/src/pubs/default/config/menus/generic.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/menus/generic.xsp?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/config/menus/generic.xsp (original)
+++ lenya/trunk/src/pubs/default/config/menus/generic.xsp Fri Oct 19 08:13:36 2007
@@ -37,7 +37,7 @@
<menu>
<xsp:logic>
- String documentId = <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/authoring" + <input:get-attribute module="page-envelope" as="string" name="document-id"/> + "_" + <input:get-attribute module="page-envelope" as="string" name="document-language"/>;
+ String documentId = <input:get-attribute module="page-envelope" as="string" name="context-prefix"/> + "/" + <input:get-attribute module="page-envelope" as="string" name="publication-id"/> + "/authoring" + <input:get-attribute module="page-envelope" as="string" name="document-uuid"/> + "_" + <input:get-attribute module="page-envelope" as="string" name="document-language"/>;
String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
Object documentObject = <input:get-attribute as="object" module="page-envelope" name="document"/>;
Modified: lenya/trunk/src/pubs/default/lenya/content/publishing/publish-screen.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/lenya/content/publishing/publish-screen.xsp?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/lenya/content/publishing/publish-screen.xsp (original)
+++ lenya/trunk/src/pubs/default/lenya/content/publishing/publish-screen.xsp Fri Oct 19 08:13:36 2007
@@ -29,7 +29,7 @@
<usecase:publish>
- <usecase:document-id><input:get-attribute module="page-envelope" name="document-id" as="string"/></usecase:document-id>
+ <usecase:document-uuid><input:get-attribute module="page-envelope" name="document-uuid" as="string"/></usecase:document-uuid>
<usecase:uris><xsp-request:get-uri/></usecase:uris>
<usecase:sources><input:get-attribute module="page-envelope" as="string" name="document-path"/></usecase:sources>
<usecase:publication-id><input:get-attribute module="page-envelope" name="publication-id" as="string"/></usecase:publication-id>
Modified: lenya/trunk/src/webapp/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/global-sitemap.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ lenya/trunk/src/webapp/global-sitemap.xmap Fri Oct 19 08:13:36 2007
@@ -184,7 +184,7 @@
<map:parameter name="publicationid" value="{1}"/>
<map:parameter name="area" value="{2}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="userid" value="{access-control:user-id}"/>
<map:parameter name="servertime" value="{date-i18n:currentDate}"/>
<map:parameter name="workflowstate" value="{workflow:state}"/>
@@ -199,7 +199,7 @@
<map:parameter name="publicationid" value="{1}"/>
<map:parameter name="area" value="{2}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="userid" value="{access-control:user-id}"/>
<map:parameter name="servertime" value="{date-i18n:currentDate}"/>
<map:parameter name="workflowstate" value="{workflow:state}"/>
Modified: lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/pipelines.xmap Fri Oct 19 08:13:36 2007
@@ -81,7 +81,7 @@
<map:parameter name="WWW-Authenticate" value="Basic Realm=lenya" />
<map:generate src="context://lenya/content/util/empty.xml" />
<map:transform src="fallback://lenya/xslt/exception/forbidden.xsl">
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
<map:parameter name="area" value="{page-envelope:area}"/>
</map:transform>
@@ -92,7 +92,7 @@
<map:parameter name="WWW-Authenticate" value="Basic Realm=lenya" />
<map:generate src="context://lenya/content/util/empty.xml" />
<map:transform src="fallback://lenya/xslt/exception/forbidden.xsl">
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
<map:parameter name="area" value="{page-envelope:area}"/>
</map:transform>
@@ -111,7 +111,7 @@
<map:handle-errors>
<map:generate type="notifying"/>
<map:transform src="fallback://lenya/xslt/exception/generic.xsl">
- <map:parameter name="documentid" value="{page-envelope:document-id}"/>
+ <map:parameter name="documentid" value="{page-envelope:document-uuid}"/>
<map:parameter name="documenturl" value="{page-envelope:document-url}"/>
</map:transform>
<map:call resource="style-cms-page" />
Modified: lenya/trunk/src/webapp/lenya/usecase.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/usecase.xmap?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecase.xmap (original)
+++ lenya/trunk/src/webapp/lenya/usecase.xmap Fri Oct 19 08:13:36 2007
@@ -163,7 +163,7 @@
<map:act type="task">
<map:parameter name="task-id" value="ant"/>
<map:parameter name="target" value="initworkflow"/>
- <map:parameter name="properties.initworkflow.document-id" value="{page-envelope:document-id}"/>
+ <map:parameter name="properties.initworkflow.document-uuid" value="{page-envelope:document-uuid}"/>
<map:parameter name="properties.initworkflow.document-type" value="{page-envelope:document-type}"/>
<map:parameter name="properties.initworkflow.language" value="{page-envelope:document-language}"/>
<map:parameter name="properties.initworkflow.user-id" value="{access-control:user-id}"/>
Modified: lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl?rev=586495&r1=586494&r2=586495&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl Fri Oct 19 08:13:36 2007
@@ -71,7 +71,7 @@
<input type="hidden" name="task-id" value="insert-asset"/>
<input type="hidden" name="uploadtype" value="asset"/>
<input type="hidden" name="properties.asset.date" value="{/lenya-info:info/lenya-info:assets/lenya-info:date}"/>
- <input type="hidden" name="properties.insert.asset.document-id" value="{/lenya-info:info/lenya-info:assets/lenya-info:document-id}"/>
+ <input type="hidden" name="properties.insert.asset.document-uuid" value="{/lenya-info:info/lenya-info:assets/lenya-info:document-uuid}"/>
<input type="hidden" name="properties.insert.asset.language" value="{/lenya-info:info/lenya-info:assets/lenya-info:language}"/>
<table class="lenya-table-noborder">
<xsl:if test="$error = 'true'">
@@ -168,4 +168,4 @@
<xsl:template name="library-buttons"/>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.