You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/01/10 04:43:35 UTC
svn commit: r124759 - in lenya/trunk/src: java/org/apache/lenya/cms/cocoon/components/modules/input java/org/apache/lenya/cms/publication java/org/apache/lenya/cms/site/usecases webapp/lenya/content/info webapp/lenya/pubs/default
Author: gregor
Date: Sun Jan 9 19:43:34 2005
New Revision: 124759
URL: http://svn.apache.org/viewcvs?view=rev&rev=124759
Log:
Replaced ocurrences of deprecated node-id with node-name
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/webapp/lenya/content/info/assets.xsp
lenya/trunk/src/webapp/lenya/content/info/rename.xsp
lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java?view=diff&rev=124759&p1=lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java&r1=124758&p2=lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/PageEnvelopeModule.java&r2=124759
==============================================================================
--- 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 Sun Jan 9 19:43:34 2005
@@ -74,8 +74,6 @@
value = envelope.getDocument().getId();
} else if (name.equals(PageEnvelope.DOCUMENT_NAME)) {
value = envelope.getDocument().getName();
- } else if (name.equals(PageEnvelope.DOCUMENT_NODE_ID)) { // FIXME: Why is this here?
- value = envelope.getDocument().getNodeId();
} else if (name.equals(PageEnvelope.DOCUMENT_LABEL)) { // FIXME: Why is this here?
value = envelope.getDocument().getLabel();
} else if (name.equals(PageEnvelope.DOCUMENT_URL)) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java?view=diff&rev=124759&p1=lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java&r1=124758&p2=lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java&r2=124759
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocument.java Sun Jan 9 19:43:34 2005
@@ -109,14 +109,6 @@
}
/**
- * @see org.apache.lenya.cms.publication.Document#getNodeId()
- * @deprecated replaced by getName()
- */
- public String getNodeId() {
- return getName();
- }
-
- /**
* @see org.apache.lenya.cms.publication.Document#getPublication()
*/
public Publication getPublication() {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java?view=diff&rev=124759&p1=lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java&r1=124758&p2=lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java&r2=124759
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/Document.java Sun Jan 9 19:43:34 2005
@@ -52,15 +52,6 @@
String getName();
/**
- * Instead of returning the full document-id for this
- * document it just returns the id of the particular
- * node, basically the basename of the document-id.
- *
- * @return the node id, i.e. the basename of the document-id
- */
- String getNodeId();
-
- /**
* Returns the publication this document belongs to.
* @return A publication object.
*/
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java?view=diff&rev=124759&p1=lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java&r1=124758&p2=lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java&r2=124759
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/PageEnvelope.java Sun Jan 9 19:43:34 2005
@@ -41,7 +41,6 @@
public static final String DOCUMENT_ID = "document-id";
public static final String DOCUMENT_NAME = "document-name";
public static final String DOCUMENT_TYPE = "document-type";
- public static final String DOCUMENT_NODE_ID = "document-node-id";
public static final String DOCUMENT_LABEL = "document-label";
public static final String DOCUMENT_URL = "document-url";
public static final String DOCUMENT_URL_WITHOUT_LANGUAGE = "document-url-without-language";
@@ -164,7 +163,7 @@
public static final String[] PARAMETER_NAMES = { PageEnvelope.AREA, PageEnvelope.CONTEXT,
PageEnvelope.PUBLICATION_ID, PageEnvelope.PUBLICATION,
PageEnvelope.PUBLICATION_LANGUAGES_CSV, PageEnvelope.DOCUMENT,
- PageEnvelope.DOCUMENT_ID, PageEnvelope.DOCUMENT_NAME, PageEnvelope.DOCUMENT_NODE_ID,
+ PageEnvelope.DOCUMENT_ID, PageEnvelope.DOCUMENT_NAME,
PageEnvelope.DOCUMENT_LABEL, PageEnvelope.DOCUMENT_URL,
PageEnvelope.DOCUMENT_URL_WITHOUT_LANGUAGE, PageEnvelope.DOCUMENT_PATH,
PageEnvelope.DOCUMENT_EXTENSION, PageEnvelope.DEFAULT_LANGUAGE,
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=124759&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java&r1=124758&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java&r2=124759
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java Sun Jan 9 19:43:34 2005
@@ -120,7 +120,7 @@
publication);
String parentId = parent.getId().substring(1);
- String childId = document.getNodeId();
+ String childId = document.getName();
File doctypesDirectory = new File(publication.getDirectory(),
DocumentTypeBuilder.DOCTYPE_DIRECTORY);
Modified: lenya/trunk/src/webapp/lenya/content/info/assets.xsp
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/content/info/assets.xsp?view=diff&rev=124759&p1=lenya/trunk/src/webapp/lenya/content/info/assets.xsp&r1=124758&p2=lenya/trunk/src/webapp/lenya/content/info/assets.xsp&r2=124759
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/info/assets.xsp (original)
+++ lenya/trunk/src/webapp/lenya/content/info/assets.xsp Sun Jan 9 19:43:34 2005
@@ -53,7 +53,7 @@
<lenya-info:request-uri><request:get-uri/></lenya-info:request-uri>
<lenya-info:area><input:get-attribute module="page-envelope" name="area"/></lenya-info:area>
<lenya-info:documentid><xsp:expr>documentId</xsp:expr></lenya-info:documentid>
- <lenya-info:documentnodeid><input:get-attribute module="page-envelope" name="document-node-id"/></lenya-info:documentnodeid>
+ <lenya-info:documentnodeid><input:get-attribute module="page-envelope" name="document-name"/></lenya-info:documentnodeid>
<lenya-info:date><input:get-attribute module="date" name="currentDate"/></lenya-info:date>
<lenya-info:creator><input:get-attribute module="access-control" name="user-name"/></lenya-info:creator>
<lenya-info:language><input:get-attribute module="page-envelope" name="document-language"/></lenya-info:language>
Modified: lenya/trunk/src/webapp/lenya/content/info/rename.xsp
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/content/info/rename.xsp?view=diff&rev=124759&p1=lenya/trunk/src/webapp/lenya/content/info/rename.xsp&r1=124758&p2=lenya/trunk/src/webapp/lenya/content/info/rename.xsp&r2=124759
==============================================================================
--- lenya/trunk/src/webapp/lenya/content/info/rename.xsp (original)
+++ lenya/trunk/src/webapp/lenya/content/info/rename.xsp Sun Jan 9 19:43:34 2005
@@ -41,7 +41,7 @@
<parent-url><xsp:expr>parentUrl</xsp:expr></parent-url>
</xsp:logic>
<request-uri><xsp-request:get-uri/></request-uri>
- <destination-id><input:get-attribute module="page-envelope" as="string" name="document-node-id"/></destination-id>
+ <destination-id><input:get-attribute module="page-envelope" as="string" name="document-name"/></destination-id>
<source-document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></source-document-id>
<ref-document-id><xsp:expr>refDocumentId</xsp:expr></ref-document-id>
<area><input:get-attribute module="page-envelope" as="string" name="area"/></area>
Modified: lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap?view=diff&rev=124759&p1=lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap&r1=124758&p2=lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap&r2=124759
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/doctypes.xmap Sun Jan 9 19:43:34 2005
@@ -30,7 +30,7 @@
<map:transform src="../../xslt/rc/toDoc.xsl"/>
<map:transform src="fallback://xslt/{../3}2xhtml.xsl">
<map:parameter name="rendertype" value="{1}"/>
- <map:parameter name="nodeid" value="{page-envelope:document-node-id}"/>
+ <map:parameter name="nodeid" value="{page-envelope:document-name}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
</map:transform>
<map:serialize type="xml"/>
@@ -43,7 +43,7 @@
<map:generate src="lenya:/{4}.xml"/>
<map:transform src="fallback://xslt/{3}2xhtml.xsl">
<map:parameter name="rendertype" value="{1}"/>
- <map:parameter name="nodeid" value="{page-envelope:document-node-id}"/>
+ <map:parameter name="nodeid" value="{page-envelope:document-name}"/>
<map:parameter name="language" value="{page-envelope:document-language}"/>
</map:transform>
<map:serialize type="xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org