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 2005/02/23 16:27:32 UTC
svn commit: r155024 - in lenya/trunk/src:
java/org/apache/lenya/cms/publication/AbstractPublication.java
webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
Author: andreas
Date: Wed Feb 23 07:27:31 2005
New Revision: 155024
URL: http://svn.apache.org/viewcvs?view=rev&rev=155024
Log:
move resource handling to publication class
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java?view=diff&r1=155023&r2=155024
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/AbstractPublication.java Wed Feb 23 07:27:31 2005
@@ -334,6 +334,13 @@
copyDocumentSource(sourceDocument, destinationDocument);
getSiteManager(sourceDocument.getIdentityMap()).copy(sourceDocument, destinationDocument);
+
+ ResourcesManager resourcesManager = sourceDocument.getResourcesManager();
+ try {
+ resourcesManager.copyResourcesTo(destinationDocument);
+ } catch (Exception e) {
+ throw new PublicationException(e);
+ }
}
/**
@@ -354,6 +361,9 @@
}
getSiteManager(document.getIdentityMap()).delete(document);
deleteDocumentSource(document);
+
+ ResourcesManager resourcesManager = document.getResourcesManager();
+ resourcesManager.deleteResources();
}
/**
@@ -371,6 +381,14 @@
throws PublicationException {
copyDocument(sourceDocument, destinationDocument);
deleteDocument(sourceDocument);
+
+ ResourcesManager resourcesManager = sourceDocument.getResourcesManager();
+ try {
+ resourcesManager.copyResourcesTo(destinationDocument);
+ } catch (Exception e) {
+ throw new PublicationException(e);
+ }
+ resourcesManager.deleteResources();
}
private Map areaSsl2proxy = new HashMap();
Modified: lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java?view=diff&r1=155023&r2=155024
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java Wed Feb 23 07:27:31 2005
@@ -23,7 +23,6 @@
import org.apache.lenya.cms.publication.DocumentFactory;
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.util.DocumentVisitor;
import org.apache.lenya.cms.publication.util.OrderedDocumentSet;
import org.apache.lenya.cms.site.SiteManager;
@@ -35,7 +34,7 @@
/**
* Publish usecase handler.
*
- * @version $Id:$
+ * @version $Id$
*/
public class Publish extends DocumentUsecase implements DocumentVisitor {
@@ -43,7 +42,7 @@
protected static final String SUBTREE = "subtree";
/**
- * Checks if the workflow event "publish" is supported and the parent of the
+ * Checks if the workflow event is supported and the parent of the
* document exists in the live area.
*
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckPreconditions()
@@ -105,13 +104,6 @@
try {
publication.copyDocumentToArea(authoringDocument, Publication.LIVE_AREA);
-
- Document liveDocument = publication.getAreaVersion(authoringDocument,
- Publication.LIVE_AREA);
-
- ResourcesManager resourcesManager = authoringDocument.getResourcesManager();
- resourcesManager.copyResourcesTo(liveDocument);
-
triggerWorkflow(getEvent(), authoringDocument);
success = true;
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org