You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2004/11/15 10:29:34 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report VersionTreeReport.java
luetzkendorf 2004/11/15 01:29:34
Modified: src/webdav/server/org/apache/slide/webdav/method/report Tag:
SLIDE_2_1_RELEASE_BRANCH VersionTreeReport.java
Log:
fix for version-tree-report on version history resorces
(testcase DeltaV\functional\Version_history_feature\Version-tree_report\version-tree_report.xml)
Revision Changes Path
No revision
No revision
1.8.2.1 +29 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/VersionTreeReport.java
Index: VersionTreeReport.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/VersionTreeReport.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- VersionTreeReport.java 5 Aug 2004 14:43:34 -0000 1.8
+++ VersionTreeReport.java 15 Nov 2004 09:29:33 -0000 1.8.2.1
@@ -52,6 +52,7 @@
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
import org.apache.slide.webdav.util.resourcekind.Version;
import org.apache.slide.webdav.util.resourcekind.VersionControlled;
+import org.apache.slide.webdav.util.resourcekind.VersionHistory;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -152,6 +153,31 @@
nrd = content.retrieve(slideToken, nrds);
resourceKind =
AbstractResourceKind.determineResourceKind(token, nrds, nrd);
+ }
+ else if (resourceKind instanceof VersionHistory) {
+ NodeProperty rootVersion = nrd.getProperty(P_ROOT_VERSION);
+ if (rootVersion != null) {
+ XMLValue value;
+ if (rootVersion.getValue() instanceof XMLValue) {
+ value = (XMLValue)rootVersion.getValue();
+ } else {
+ try {
+ value = new XMLValue(rootVersion.getValue().toString());
+ } catch (JDOMException e) {
+ throw new SlideException("Could not parse DAV:root-version: "+nrds.getUri());
+ }
+ }
+ Iterator i = value.iterator();
+ if (i.hasNext()) {
+ resourcePath = ((Element)i.next()).getText();
+ }
+ }
+ resourcePath += "/";
+ resourcePath += nrds.getInitialRevision();
+ nrds = content.retrieve(slideToken, resourcePath);
+ nrd = content.retrieve(slideToken, nrds);
+ resourceKind =
+ AbstractResourceKind.determineResourceKind(token, nrds, nrd);
}
if ( Configuration.useVersionControl() && (resourceKind instanceof Version) ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org