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 2006/08/22 15:29:14 UTC
svn commit: r433624 -
/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
Author: andreas
Date: Tue Aug 22 06:29:14 2006
New Revision: 433624
URL: http://svn.apache.org/viewvc?rev=433624&view=rev
Log:
DocumentManager.copyToVersion(): copy content also when destination doc exists
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?rev=433624&r1=433623&r2=433624&view=diff
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Tue Aug 22 06:29:14 2006
@@ -16,6 +16,7 @@
*/
package org.apache.lenya.cms.publication;
+import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -82,12 +83,12 @@
return document;
}
- protected void copyMetaData(Document sourceDocument, Document document)
+ protected void copyMetaData(Document source, Document destination)
throws PublicationException {
try {
- String[] uris = sourceDocument.getMetaDataNamespaceUris();
+ String[] uris = source.getMetaDataNamespaceUris();
for (int i = 0; i < uris.length; i++) {
- document.getMetaData(uris[i]).replaceBy(sourceDocument.getMetaData(uris[i]));
+ destination.getMetaData(uris[i]).replaceBy(source.getMetaData(uris[i]));
}
} catch (MetaDataException e) {
throw new PublicationException(e);
@@ -336,6 +337,7 @@
Document destinationDoc;
if (sourceDoc.existsAreaVersion(destinationArea)) {
destinationDoc = sourceDoc.getAreaVersion(destinationArea);
+ copyContent(sourceDoc, destinationDoc);
} else {
destinationDoc = addVersion(sourceDoc, destinationArea, language);
}
@@ -352,7 +354,22 @@
}
}
- copyResources(sourceDoc, destinationDoc);
+ }
+
+ /**
+ * Copies content, resources, and meta data.
+ * @param sourceDoc The source document.
+ * @param destinationDoc The destination document.
+ * @throws PublicationException if an error occurs.
+ */
+ protected void copyContent(Document sourceDoc, Document destinationDoc) throws PublicationException {
+ try {
+ SourceUtil.copy(this.manager, sourceDoc.getSourceURI(), destinationDoc.getSourceURI());
+ copyMetaData(sourceDoc, destinationDoc);
+ copyResources(sourceDoc, destinationDoc);
+ } catch (Exception e) {
+ throw new PublicationException(e);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org