You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/04/05 11:51:59 UTC
svn commit: r160149 - in
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms: ant/
cocoon/generation/ cocoon/transformation/ publication/
Author: michi
Date: Tue Apr 5 02:51:54 2005
New Revision: 160149
URL: http://svn.apache.org/viewcvs?view=rev&rev=160149
Log:
getSiteTree replaced by getTree because getSiteTree is deprecated
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/ChangeVisibilityTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeactivateResourcesTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteLanguageNodeTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteNodeTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteResourcesTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteSchedulerEntryTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DocumentOperationTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertCopyNode.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertLabelTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveDocumentTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveNode.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveSiteTreeNodeTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RemoveLabelTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RenameLabelTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SetIdentifier.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SiteTreeResetTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/TreePublisher.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SiteTreeGenerator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/ChangeVisibilityTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/ChangeVisibilityTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/ChangeVisibilityTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/ChangeVisibilityTask.java Tue Apr 5 02:51:54 2005
@@ -90,7 +90,7 @@
throws SiteTreeException, DocumentException {
SiteTree tree = null;
- tree = getPublication().getSiteTree(area);
+ tree = getPublication().getTree(area);
SiteTreeNode node = tree.getNode(documentid);
if (node == null) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeactivateResourcesTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeactivateResourcesTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeactivateResourcesTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeactivateResourcesTask.java Tue Apr 5 02:51:54 2005
@@ -69,7 +69,7 @@
SiteTree tree = null;
try {
- tree = publication.getSiteTree(area);
+ tree = publication.getTree(area);
SiteTreeNode node = tree.getNode(documentid);
Label[] labels = null;
if (node != null) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DeleteContentTask.java,v 1.8 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -110,7 +110,7 @@
log("area for the destination :" + this.getSecarea());
Publication publication = getPublication();
- SiteTree tree = publication.getSiteTree(this.getSecarea());
+ SiteTree tree = publication.getTree(this.getSecarea());
SiteTreeNode node = tree.getNode(this.getSecdocumentid());
node.acceptReverseSubtree(this);
} catch (Exception e) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteLanguageNodeTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteLanguageNodeTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteLanguageNodeTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteLanguageNodeTask.java Tue Apr 5 02:51:54 2005
@@ -56,7 +56,7 @@
SiteTree tree = null;
try {
- tree = getPublication().getSiteTree(area);
+ tree = getPublication().getTree(area);
SiteTreeNode node = tree.getNode(documentid);
node.removeLabel(node.getLabel(language));
Label[] labels = node.getLabels();
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteNodeTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteNodeTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteNodeTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteNodeTask.java Tue Apr 5 02:51:54 2005
@@ -87,7 +87,7 @@
SiteTree tree = null;
try {
- tree = getPublication().getSiteTree(area);
+ tree = getPublication().getTree(area);
SiteTreeNode node = tree.removeNode(documentid);
if (node == null) {
throw new SiteTreeException("Node " + node + " couldn't be removed");
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DeletePoliciesTask.java,v 1.4 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -201,7 +201,7 @@
log("area for the destination :" + this.getSecarea());
Publication publication = getPublication();
- SiteTree tree = publication.getSiteTree(this.getSecarea());
+ SiteTree tree = publication.getTree(this.getSecarea());
SiteTreeNode node = tree.getNode(this.getSecdocumentid());
node.acceptReverseSubtree(this);
} catch (Exception e) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DeleteRCTask.java,v 1.5 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -113,7 +113,7 @@
//visit the destination tree
Publication publication = getPublication();
- SiteTree tree = publication.getSiteTree(this.getSecarea());
+ SiteTree tree = publication.getTree(this.getSecarea());
SiteTreeNode node = tree.getNode(this.getSecdocumentid());
node.acceptReverseSubtree(this);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteResourcesTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteResourcesTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteResourcesTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteResourcesTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DeleteResourcesTask.java,v 1.3 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -89,7 +89,7 @@
log("area for the destination :" + this.getSecarea());
Publication publication = getPublication();
- SiteTree tree = publication.getSiteTree(this.getSecarea());
+ SiteTree tree = publication.getTree(this.getSecarea());
SiteTreeNode node = tree.getNode(this.getSecdocumentid());
node.acceptReverseSubtree(this);
} catch (Exception e) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteSchedulerEntryTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteSchedulerEntryTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteSchedulerEntryTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeleteSchedulerEntryTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DeleteSchedulerEntryTask.java,v 1.2 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -46,7 +46,7 @@
log("Area: [" + area + "]");
Publication publication = getPublication();
- SiteTree tree = publication.getSiteTree(area);
+ SiteTree tree = publication.getTree(area);
SiteTreeNode node = tree.getNode(documentId);
node.acceptSubtree(this);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DocumentOperationTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DocumentOperationTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DocumentOperationTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DocumentOperationTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DocumentOperationTask.java,v 1.3 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -86,7 +86,7 @@
log("area for the source" + this.getFirstarea());
Publication publication= getPublication();
- SiteTree tree = publication.getSiteTree(getFirstarea());
+ SiteTree tree = publication.getTree(getFirstarea());
SiteTreeNode node = tree.getNode(getFirstdocumentid());
node.acceptSubtree(this);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertCopyNode.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertCopyNode.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertCopyNode.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertCopyNode.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: InsertCopyNode.java,v 1.10 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -54,8 +54,8 @@
throws SiteTreeException {
Publication publication = getPublication();
- SiteTree firsttree = publication.getSiteTree(firstarea);
- SiteTree sectree = publication.getSiteTree(secarea);
+ SiteTree firsttree = publication.getTree(firstarea);
+ SiteTree sectree = publication.getTree(secarea);
String parentid = "";
StringTokenizer st = new StringTokenizer(secdocumentid, "/");
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertLabelTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertLabelTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertLabelTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/InsertLabelTask.java Tue Apr 5 02:51:54 2005
@@ -132,7 +132,7 @@
SiteTree tree = null;
Label label = null;
try {
- tree = getPublication().getSiteTree(area);
+ tree = getPublication().getTree(area);
label = new Label(labelName, language);
tree.addLabel(documentid, label);
tree.save();
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveDocumentTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveDocumentTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveDocumentTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveDocumentTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: MoveDocumentTask.java,v 1.6 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -168,7 +168,7 @@
log("area for the destination" + this.getSecarea());
Publication publication = getPublication();
- SiteTree tree = publication.getSiteTree(getFirstarea());
+ SiteTree tree = publication.getTree(getFirstarea());
SiteTreeNode node = tree.getNode(getFirstdocumentid());
node.acceptSubtree(this);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveNode.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveNode.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveNode.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveNode.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: MoveNode.java,v 1.9 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -55,8 +55,8 @@
throws SiteTreeException {
Publication publication = getPublication();
- SiteTree firsttree = publication.getSiteTree(firstarea);
- SiteTree sectree = publication.getSiteTree(secarea);
+ SiteTree firsttree = publication.getTree(firstarea);
+ SiteTree sectree = publication.getTree(secarea);
String parentid = "";
StringTokenizer st = new StringTokenizer(secdocumentid, "/");
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveSiteTreeNodeTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveSiteTreeNodeTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveSiteTreeNodeTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/MoveSiteTreeNodeTask.java Tue Apr 5 02:51:54 2005
@@ -73,7 +73,7 @@
log(" Direction: [" + getDirection() + "]");
try {
- SiteTree tree = getPublication().getSiteTree(Publication.AUTHORING_AREA);
+ SiteTree tree = getPublication().getTree(Publication.AUTHORING_AREA);
if (getDirection().equals(UP)) {
tree.moveUp(getDocumentId());
} else if (getDirection().equals(DOWN)) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RemoveLabelTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RemoveLabelTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RemoveLabelTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RemoveLabelTask.java Tue Apr 5 02:51:54 2005
@@ -143,7 +143,7 @@
SiteTree tree = null;
Label label = null;
try {
- tree = getPublication().getSiteTree(area);
+ tree = getPublication().getTree(area);
SiteTreeNode node = tree.getNode(documentid);
// if there is only one label left do not delete it.
if (node.getLabels().length > 1) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RenameLabelTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RenameLabelTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RenameLabelTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/RenameLabelTask.java Tue Apr 5 02:51:54 2005
@@ -140,7 +140,7 @@
String area)
throws SiteTreeException, DocumentException {
- SiteTree tree = getPublication().getSiteTree(area);
+ SiteTree tree = getPublication().getTree(area);
SiteTreeNode node = tree.getNode(documentid);
if (node == null) {
throw new DocumentException(
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SetIdentifier.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SetIdentifier.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SetIdentifier.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SetIdentifier.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: SetIdentifier.java,v 1.6 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -114,7 +114,7 @@
SiteTree tree;
try {
- tree = publication.getSiteTree(area);
+ tree = publication.getTree(area);
} catch (SiteTreeException e) {
throw new BuildException(e);
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SiteTreeResetTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SiteTreeResetTask.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SiteTreeResetTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/SiteTreeResetTask.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: SiteTreeResetTask.java,v 1.2 2004/03/03 12:56:30 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.ant;
@@ -58,7 +58,7 @@
try {
log("area : " + this.getArea());
Publication publication= getPublication();
- SiteTree tree = publication.getSiteTree(getArea());
+ SiteTree tree = publication.getTree(getArea());
SiteTreeNode node = tree.getNode("/");
node.removeChildren();
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/TreePublisher.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/TreePublisher.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/TreePublisher.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/TreePublisher.java Tue Apr 5 02:51:54 2005
@@ -91,8 +91,8 @@
SiteTree liveTree = null;
try {
- authoringTree = getPublication().getSiteTree(Publication.AUTHORING_AREA);
- liveTree = getPublication().getSiteTree(Publication.LIVE_AREA);
+ authoringTree = getPublication().getTree(Publication.AUTHORING_AREA);
+ liveTree = getPublication().getTree(Publication.LIVE_AREA);
SiteTreeNode authoringNode = authoringTree.getNode(documentId);
SiteTreeNode[] siblings = authoringNode.getNextSiblings();
@@ -174,4 +174,4 @@
throw new BuildException(e);
}
}
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SiteTreeGenerator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SiteTreeGenerator.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SiteTreeGenerator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SiteTreeGenerator.java Tue Apr 5 02:51:54 2005
@@ -82,7 +82,7 @@
try {
Publication publication = PublicationFactory.getPublication(objectModel);
area = par.getParameter(AREA_PARAMETER);
- sitetree = publication.getSiteTree(area);
+ sitetree = publication.getTree(area);
} catch (PublicationException e) {
throw new ProcessingException("Unable to get sitetree: publication exception.", e);
} catch (ParameterException e) {
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java Tue Apr 5 02:51:54 2005
@@ -244,7 +244,7 @@
&& !this.area.equals(Publication.LIVE_AREA)) {
throw new ProcessingException("Invalid area: " + this.area);
}
- siteTree = publication.getSiteTree(this.area);
+ siteTree = publication.getTree(this.area);
SiteTreeNode node = siteTree.getNode(this.documentid);
if (this.getLogger().isDebugEnabled()) {
@@ -277,7 +277,7 @@
protected void generateFragmentInitial(String siteArea)
throws SiteTreeException, SAXException, ProcessingException {
- SiteTree siteTree = publication.getSiteTree(siteArea);
+ SiteTree siteTree = publication.getTree(siteArea);
String label = "";
String isFolder = "";
@@ -493,4 +493,4 @@
+ NODE_LABEL);
}
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/transformation/DocumentIndexTransformer.java Tue Apr 5 02:51:54 2005
@@ -104,7 +104,7 @@
setPublication(document.getPublication());
setArea(document.getArea());
setBuilder(document.getPublication().getDocumentBuilder());
- setSiteTree(publication.getSiteTree(area));
+ setSiteTree(publication.getTree(area));
} catch (Exception e) {
throw new ProcessingException(e);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocument.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocument.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocument.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocument.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DefaultDocument.java,v 1.43 2004/08/16 12:21:37 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -180,7 +180,7 @@
ArrayList languages = new ArrayList();
SiteTree sitetree;
try {
- sitetree = getPublication().getSiteTree(getArea());
+ sitetree = getPublication().getTree(getArea());
if (sitetree != null) {
SiteTreeNode node = sitetree.getNode(getId());
if (node != null) {
@@ -214,7 +214,7 @@
public String getLabel() throws DocumentException {
String label = "";
try {
- SiteTree siteTree = getPublication().getSiteTree(getArea());
+ SiteTree siteTree = getPublication().getTree(getArea());
if (siteTree != null) {
label = siteTree.getNode(getId()).getLabel(getLanguage()).getLabel();
}
@@ -314,7 +314,7 @@
public boolean exists() throws DocumentException {
boolean exists;
try {
- SiteTree sitetree = getPublication().getSiteTree(getArea());
+ SiteTree sitetree = getPublication().getTree(getArea());
if (sitetree != null) {
SiteTreeNode node = sitetree.getNode(getId());
exists = (node != null) && (node.getLabel(getLanguage()) != null);
@@ -333,7 +333,7 @@
public boolean existsInAnyLanguage() throws DocumentException {
boolean exists = false;
try {
- SiteTree sitetree = getPublication().getSiteTree(getArea());
+ SiteTree sitetree = getPublication().getTree(getArea());
if (sitetree != null) {
SiteTreeNode node = sitetree.getNode(getId());
exists = node != null;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DublinCoreHelper.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DublinCoreHelper.java,v 1.6 2004/08/16 12:27:23 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -58,7 +58,7 @@
String url = null;
Document document = null;
- SiteTree tree = publication.getSiteTree(area);
+ SiteTree tree = publication.getTree(area);
SiteTreeNode node = tree.getNode(documentId);
DocumentBuilder builder = publication.getDocumentBuilder();
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java?view=diff&r1=160148&r2=160149
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/UniqueDocumentId.java Tue Apr 5 02:51:54 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: UniqueDocumentId.java,v 1.11 2004/08/16 13:01:46 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -38,7 +38,7 @@
String documentid) {
SiteTree tree;
try {
- tree = publication.getSiteTree(area);
+ tree = publication.getTree(area);
SiteTreeNode node = tree.getNode(documentid);
String suffix = null;
int version = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org