You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ed...@apache.org on 2003/09/17 21:00:15 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ant TreePublisher.java
edith 2003/09/17 12:00:15
Modified: src/java/org/apache/lenya/cms/ant TreePublisher.java
Log:
the node is inserted in the live tree at the right place
call method addNode with the document id corresponding to the
next sibling node
Revision Changes Path
1.10 +237 -224 cocoon-lenya/src/java/org/apache/lenya/cms/ant/TreePublisher.java
Index: TreePublisher.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ant/TreePublisher.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TreePublisher.java 28 Aug 2003 09:44:50 -0000 1.9
+++ TreePublisher.java 17 Sep 2003 19:00:15 -0000 1.10
@@ -1,224 +1,237 @@
-/*
-$Id$
-<License>
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
- used to endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <mi...@apache.org>. For more information on the Apache Soft-
- ware Foundation, please see <http://www.apache.org/>.
-
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
-*/
-package org.apache.lenya.cms.ant;
-
-import org.apache.lenya.cms.publication.DefaultSiteTree;
-import org.apache.lenya.cms.publication.Label;
-import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.SiteTreeException;
-import org.apache.lenya.cms.publication.SiteTreeNode;
-import org.apache.lenya.cms.publishing.ParentNodeNotFoundException;
-import org.apache.lenya.cms.publishing.PublishingException;
-
-import org.apache.tools.ant.BuildException;
-
-/**
- * Ant task to publish the tree, adding a node for the new published
- * document in the live tree
- */
-public class TreePublisher extends PublicationTask {
- private String documentid;
- private String language;
- /**
- * Creates a new instance of TreePublisher
- */
- public TreePublisher() {}
-
- /**
- * Returns the document id
- *
- * @return DOCUMENT ME!
- */
- protected String getDocumentid() {
- return documentid;
- }
-
- /**
- * Sets the document id
- *
- * @param documentid DOCUMENT ME!
- */
- public void setDocumentid(String documentid) {
- this.documentid = documentid;
- }
-
- /**
- * Get the language of the document to be published
- *
- * @return a <code>String</code> containing the ISO string for
- * this language, e.g. "de", "en"
- */
- public String getLanguage() {
- return language;
- }
-
- /**
- * Set the language of the document to be published
- *
- * @param string the ISO string for this language, e.g. "de", "en"
- */
- public void setLanguage(String string) {
- language = string;
- }
-
- /**
- * adds a node for the published document in the live tree
- *
- * @param documentId The id of the published document
- * @param language the language for which this document is to be published.
- * Can be null if all languages are to be published.
- *
- * @throws PublishingException if the publication failed.
- */
- public void publish(String documentId, String language)
- throws PublishingException {
- DefaultSiteTree authoringTree = null;
- DefaultSiteTree liveTree = null;
-
- try {
- authoringTree =
- getPublication().getSiteTree(Publication.AUTHORING_AREA);
- liveTree = getPublication().getSiteTree(Publication.LIVE_AREA);
-
- SiteTreeNode authoringNode = authoringTree.getNode(documentId);
-
- if (authoringNode != null) {
- if (language == null) {
- // no language was specified. Simply publish the
- // node including all languages.
- try {
- liveTree.addNode(authoringNode);
- } catch (SiteTreeException e1) {
- throw new ParentNodeNotFoundException(
- "Couldn't add document: "
- + documentId
- + " to live tree.",
- e1);
- }
- } else {
- // a language was specified. Let's see if this
- // node even has an entry for the specified
- // language.
- Label label = authoringNode.getLabel(language);
- if (label != null) {
- // check if this node has already been
- // published
- SiteTreeNode liveNode = liveTree.getNode(documentId);
- if (liveNode != null) {
- // if the node already exists in the live
- // tree simply insert the label in the
- // live tree
- liveTree.addLabel(documentId, label);
- } else {
- // if the node doesn't exist, add it and
- // add the specified label to it.
- Label[] labels = { label };
- try {
- liveTree.addNode(
- documentId,
- labels,
- authoringNode.getHref(),
- authoringNode.getSuffix(),
- authoringNode.hasLink());
- } catch (SiteTreeException e1) {
- throw new ParentNodeNotFoundException(
- "Couldn't add document: "
- + documentId
- + " to live tree.",
- e1);
- }
- }
- } else {
- // the node that we're trying to publish
- // doesn't have this language
- throw new PublishingException(
- "The node "
- + documentId
- + " doesn't contain a label for language "
- + language);
- }
- }
- } else {
- throw new PublishingException(
- "No node found for the document " + documentId);
- }
-
- liveTree.save();
- } catch (PublishingException e) {
- throw e;
- } catch (Exception e) {
- throw new PublishingException("Couldn't publish to live tree :", e);
- }
- }
-
- /**
- * Executes the task
- *
- * @throws BuildException DOCUMENT ME!
- */
- public void execute() throws BuildException {
- try {
- log("document id: " + getDocumentid());
- log("language: " + getLanguage());
-
- publish(
- getDocumentid(),
- getLanguage());
- } catch (Exception e) {
- throw new BuildException(e);
- }
- }
-}
+/*
+$Id$
+<License>
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ used to endorse or promote products derived from this software without
+ prior written permission. For written permission, please contact
+ apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the Apache Software Foundation and was originally created by
+ Michael Wechner <mi...@apache.org>. For more information on the Apache Soft-
+ ware Foundation, please see <http://www.apache.org/>.
+
+ Lenya includes software developed by the Apache Software Foundation, W3C,
+ DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
+</License>
+*/
+package org.apache.lenya.cms.ant;
+
+import org.apache.lenya.cms.publication.DefaultSiteTree;
+import org.apache.lenya.cms.publication.Label;
+import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.SiteTreeException;
+import org.apache.lenya.cms.publication.SiteTreeNode;
+import org.apache.lenya.cms.publishing.ParentNodeNotFoundException;
+import org.apache.lenya.cms.publishing.PublishingException;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ * Ant task to publish the tree, adding a node for the new published
+ * document in the live tree
+ */
+public class TreePublisher extends PublicationTask {
+ private String documentid;
+ private String language;
+ /**
+ * Creates a new instance of TreePublisher
+ */
+ public TreePublisher() {}
+
+ /**
+ * Returns the document id
+ *
+ * @return DOCUMENT ME!
+ */
+ protected String getDocumentid() {
+ return documentid;
+ }
+
+ /**
+ * Sets the document id
+ *
+ * @param documentid DOCUMENT ME!
+ */
+ public void setDocumentid(String documentid) {
+ this.documentid = documentid;
+ }
+
+ /**
+ * Get the language of the document to be published
+ *
+ * @return a <code>String</code> containing the ISO string for
+ * this language, e.g. "de", "en"
+ */
+ public String getLanguage() {
+ return language;
+ }
+
+ /**
+ * Set the language of the document to be published
+ *
+ * @param string the ISO string for this language, e.g. "de", "en"
+ */
+ public void setLanguage(String string) {
+ language = string;
+ }
+
+ /**
+ * adds a node for the published document in the live tree
+ *
+ * @param documentId The id of the published document
+ * @param language the language for which this document is to be published.
+ * Can be null if all languages are to be published.
+ *
+ * @throws PublishingException if the publication failed.
+ */
+ public void publish(String documentId, String language)
+ throws PublishingException {
+ DefaultSiteTree authoringTree = null;
+ DefaultSiteTree liveTree = null;
+
+ try {
+ authoringTree =
+ getPublication().getSiteTree(Publication.AUTHORING_AREA);
+ liveTree = getPublication().getSiteTree(Publication.LIVE_AREA);
+
+ SiteTreeNode authoringNode = authoringTree.getNode(documentId);
+ SiteTreeNode[] siblings = authoringNode.getNextSiblings();
+ String parentId = authoringNode.getAbsoluteParentId();
+ SiteTreeNode sibling = null;
+ String siblingDocId = null;
+ for (int i = 0; i < siblings.length; i++){
+ String docId=parentId+"/"+siblings[i].getId();
+ sibling =liveTree.getNode(docId);
+ if (sibling != null) {
+ siblingDocId = docId;
+ break;
+ }
+ }
+
+ if (authoringNode != null) {
+ if (language == null) {
+ // no language was specified. Simply publish the
+ // node including all languages.
+ try {
+ liveTree.addNode(authoringNode,siblingDocId);
+ } catch (SiteTreeException e1) {
+ throw new ParentNodeNotFoundException(
+ "Couldn't add document: "
+ + documentId
+ + " to live tree.",
+ e1);
+ }
+ } else {
+ // a language was specified. Let's see if this
+ // node even has an entry for the specified
+ // language.
+ Label label = authoringNode.getLabel(language);
+ if (label != null) {
+ // check if this node has already been
+ // published
+ SiteTreeNode liveNode = liveTree.getNode(documentId);
+ if (liveNode != null) {
+ // if the node already exists in the live
+ // tree simply insert the label in the
+ // live tree
+ liveTree.addLabel(documentId, label);
+ } else {
+ // if the node doesn't exist, add it and
+ // add the specified label to it.
+ Label[] labels = { label };
+ try {
+ liveTree.addNode(
+ documentId,
+ labels,
+ authoringNode.getHref(),
+ authoringNode.getSuffix(),
+ authoringNode.hasLink(),
+ siblingDocId);
+ } catch (SiteTreeException e1) {
+ throw new ParentNodeNotFoundException(
+ "Couldn't add document: "
+ + documentId
+ + " to live tree.",
+ e1);
+ }
+ }
+ } else {
+ // the node that we're trying to publish
+ // doesn't have this language
+ throw new PublishingException(
+ "The node "
+ + documentId
+ + " doesn't contain a label for language "
+ + language);
+ }
+ }
+ } else {
+ throw new PublishingException(
+ "No node found for the document " + documentId);
+ }
+
+ liveTree.save();
+ } catch (PublishingException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new PublishingException("Couldn't publish to live tree :", e);
+ }
+ }
+
+ /**
+ * Executes the task
+ *
+ * @throws BuildException DOCUMENT ME!
+ */
+ public void execute() throws BuildException {
+ try {
+ log("document id: " + getDocumentid());
+ log("language: " + getLanguage());
+
+ publish(
+ getDocumentid(),
+ getLanguage());
+ } catch (Exception e) {
+ throw new BuildException(e);
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org