You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/09/16 22:06:15 UTC
svn commit: rev 46205 - in incubator/lenya/trunk/src/webapp/lenya: content/exception content/info pubs/default/java/src/org/apache/lenya/defaultpub/cms/task
Author: andreas
Date: Thu Sep 16 13:06:15 2004
New Revision: 46205
Modified:
incubator/lenya/trunk/src/webapp/lenya/content/exception/missing-language.xsp
incubator/lenya/trunk/src/webapp/lenya/content/info/overview.xsp
incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java
incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java
Log:
re-organize site management, using DocumentIdentityMap
Modified: incubator/lenya/trunk/src/webapp/lenya/content/exception/missing-language.xsp
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/exception/missing-language.xsp (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/exception/missing-language.xsp Thu Sep 16 13:06:15 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: missing-language.xsp,v 1.3 2004/03/13 12:31:35 gregor Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -35,7 +35,7 @@
<available-languages>
<xsp:logic>
Document doc = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
- DocumentLanguagesHelper helper = new DocumentLanguagesHelper(objectModel);
+ DocumentLanguagesHelper helper = new DocumentLanguagesHelper(doc.getIdentityMap(), objectModel);
try {
String[] availableLanguages = doc.getLanguages();
String language = null;
Modified: incubator/lenya/trunk/src/webapp/lenya/content/info/overview.xsp
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/info/overview.xsp (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/info/overview.xsp Thu Sep 16 13:06:15 2004
@@ -57,7 +57,7 @@
if (existsLanguage) {
<lenya-info:languages>
<xsp:logic>
- DocumentLanguagesHelper helper = new DocumentLanguagesHelper(objectModel);
+ DocumentLanguagesHelper helper = new DocumentLanguagesHelper(doc.getIdentityMap(), objectModel);
try {
String[] documentLanguages = (String[]) doc.getLanguages();
for (int i = 0; i < documentLanguages.length; i++) {
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Deactivate.java Thu Sep 16 13:06:15 2004
@@ -24,14 +24,13 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
-import org.apache.lenya.cms.publication.DocumentBuilder;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.ResourcesManager;
import org.apache.lenya.cms.publication.task.PublicationTask;
+import org.apache.lenya.cms.site.Label;
import org.apache.lenya.cms.site.SiteException;
-import org.apache.lenya.cms.site.tree.Label;
import org.apache.lenya.cms.site.tree.SiteTree;
import org.apache.lenya.cms.site.tree.SiteTreeNode;
import org.apache.lenya.cms.task.ExecutionException;
@@ -98,7 +97,7 @@
Document authoringDocument = getPublication().getAreaVersion(liveDocument, Publication.AUTHORING_AREA);
OK = OK && canWorkflowFire(authoringDocument);
- SiteTree tree = getPublication().getSiteTree(liveDocument.getArea());
+ SiteTree tree = getSiteTree(liveDocument.getArea());
SiteTreeNode node = tree.getNode(liveDocument.getId());
if (node == null) {
@@ -160,10 +159,7 @@
throws ParameterException, DocumentBuildException, ExecutionException {
String id = getParameters().getParameter(PARAMETER_DOCUMENT_ID);
String language = getParameters().getParameter(PARAMETER_DOCUMENT_LANGUAGE);
- DocumentBuilder builder = getPublication().getDocumentBuilder();
- String url =
- builder.buildCanonicalUrl(getPublication(), Publication.LIVE_AREA, id, language);
- Document document = builder.buildDocument(getPublication(), url);
+ Document document = getIdentityMap().get(Publication.LIVE_AREA, id, language);
return document;
}
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/task/Publish.java Thu Sep 16 13:06:15 2004
@@ -25,7 +25,6 @@
import org.apache.cocoon.ProcessingException;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
-import org.apache.lenya.cms.publication.DocumentBuilder;
import org.apache.lenya.cms.publication.DocumentException;
import org.apache.lenya.cms.publication.DocumentHelper;
import org.apache.lenya.cms.publication.Publication;
@@ -103,7 +102,7 @@
Document liveDocument = getPublication().getAreaVersion(document, Publication.LIVE_AREA);
Document liveParent = DocumentHelper.getParentDocument(liveDocument);
if (liveParent != null) {
- SiteTree liveTree = getPublication().getSiteTree(Publication.LIVE_AREA);
+ SiteTree liveTree = getSiteTree(Publication.LIVE_AREA);
SiteTreeNode liveParentNode = liveTree.getNode(liveParent.getId());
if (liveParentNode == null) {
log.error("Cannot execute task: live parent node does not exist.");
@@ -147,10 +146,7 @@
throws ParameterException, DocumentBuildException, ExecutionException {
String id = getParameters().getParameter(PARAMETER_DOCUMENT_ID);
String language = getParameters().getParameter(PARAMETER_DOCUMENT_LANGUAGE);
- DocumentBuilder builder = getPublication().getDocumentBuilder();
- String url =
- builder.buildCanonicalUrl(getPublication(), Publication.AUTHORING_AREA, id, language);
- Document document = builder.buildDocument(getPublication(), url);
+ Document document = getIdentityMap().get(Publication.AUTHORING_AREA, id, language);
return document;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org