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 pn...@apache.org on 2002/05/14 17:33:43 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CopyMethod.java GetMethod.java LabelMethod.java MoveMethod.java PropFindMethod.java PropPatchMethod.java PutMethod.java ReportMethod.java UpdateMethod.java
pnever 02/05/14 08:33:43
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java GetMethod.java LabelMethod.java
MoveMethod.java PropFindMethod.java
PropPatchMethod.java PutMethod.java
ReportMethod.java UpdateMethod.java
Log:
Adapted to changed VersioningHelper (removed methods)
Revision Changes Path
1.34 +9 -9 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- CopyMethod.java 8 May 2002 16:04:33 -0000 1.33
+++ CopyMethod.java 14 May 2002 15:33:42 -0000 1.34
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.33 2002/05/08 16:04:33 pnever Exp $
- * $Revision: 1.33 $
- * $Date: 2002/05/08 16:04:33 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.34 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.34 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -313,8 +313,8 @@
// create a temporary NodeRevisionDescriptor(s) to be copied
// by the Macro helper (will be deleted in afterCopy())
- NodeRevisionDescriptors historyDescriptors = versioningHelper.retrieveRevisionDescriptors(sourceUri);
- NodeRevisionDescriptor vrDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(sourceUri, historyDescriptors);
+ NodeRevisionDescriptors historyDescriptors = content.retrieve( slideToken, sourceUri);
+ NodeRevisionDescriptor vrDescriptor = content.retrieve( slideToken, historyDescriptors);
NodeRevisionContent vrContent = content.retrieve(slideToken, historyDescriptors, vrDescriptor);
NodeRevisionDescriptor newRevisionDescriptor = cloneRevisionDescriptor(vrDescriptor, new NodeRevisionNumber(0, 0));
@@ -341,8 +341,8 @@
if(Configuration.useVersionControl()) {
- NodeRevisionDescriptors destinationRevisionDescriptors = versioningHelper.retrieveRevisionDescriptors(destinationUri);
- NodeRevisionDescriptor destinationRevisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(destinationUri, destinationRevisionDescriptors);
+ NodeRevisionDescriptors destinationRevisionDescriptors = content.retrieve( slideToken, destinationUri);
+ NodeRevisionDescriptor destinationRevisionDescriptor = content.retrieve( slideToken, destinationRevisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token, destinationUri, destinationRevisionDescriptor);
String checkedOutPropertyValue = (String)checkedOutDestinationsMap.get(destinationUri);
@@ -436,8 +436,8 @@
NodeRevisionDescriptors revisionDescriptors = null;
NodeRevisionDescriptor revisionDescriptor = null;
try {
- revisionDescriptors = versioningHelper.retrieveRevisionDescriptors(targetUri);
- revisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(targetUri, revisionDescriptors);
+ revisionDescriptors = content.retrieve( slideToken, targetUri);
+ revisionDescriptor = content.retrieve( slideToken, revisionDescriptors);
destinationExists = true;
}
catch (ObjectNotFoundException e) {}
1.28 +5 -28 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java
Index: GetMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- GetMethod.java 30 Apr 2002 13:00:23 -0000 1.27
+++ GetMethod.java 14 May 2002 15:33:42 -0000 1.28
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.27 2002/04/30 13:00:23 juergen Exp $
- * $Revision: 1.27 $
- * $Date: 2002/04/30 13:00:23 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.28 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.28 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -239,37 +239,14 @@
// Then we must get object contents ...
ObjectNode object = structure.retrieve(slideToken, resourcePath);
- // Changed for DeltaV --start--
-// NodeRevisionDescriptors revisionDescriptors =
-// content.retrieve(slideToken, resourcePath);
- NodeRevisionDescriptors revisionDescriptors;
-
- if( !Configuration.useVersionControl() ) {
- revisionDescriptors =
+ NodeRevisionDescriptors revisionDescriptors =
content.retrieve(slideToken, resourcePath);
- }
- else {
- revisionDescriptors =
- vHelp.retrieveRevisionDescriptors( resourcePath );
- }
- // Changed for DeltaV --end--
if (revisionDescriptors.hasRevisions()) {
// Retrieve latest revision descriptor
- // Changed for DeltaV --start--
-// NodeRevisionDescriptor revisionDescriptor =
-// content.retrieve(slideToken, revisionDescriptors);
- NodeRevisionDescriptor revisionDescriptor;
- if( !Configuration.useVersionControl() ) {
- revisionDescriptor =
+ NodeRevisionDescriptor revisionDescriptor =
content.retrieve(slideToken, revisionDescriptors);
- }
- else {
- revisionDescriptor = vHelp.retrieveLatestRevisionDescriptor(
- resourcePath, revisionDescriptors );
- }
- // Changed for DeltaV --end--
if (revisionDescriptor != null) {
1.4 +12 -13 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java
Index: LabelMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LabelMethod.java 7 May 2002 13:04:31 -0000 1.3
+++ LabelMethod.java 14 May 2002 15:33:42 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v 1.3 2002/05/07 13:04:31 juergen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/07 13:04:31 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v 1.4 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -115,7 +115,7 @@
/**
* LABEL method.
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*
* @author <a href="mailto:ralf.stuckert@softwareag.com">Ralf Stuckert</a>
*/
@@ -406,9 +406,9 @@
String labeledResourceUri = getResourceUri(resourcePath, req.getHeader(H_LABEL));
NodeRevisionDescriptors revisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(labeledResourceUri);
+ content.retrieve( slideToken, labeledResourceUri);
NodeRevisionDescriptor revisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(labeledResourceUri, revisionDescriptors);
+ content.retrieve( slideToken, revisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Version) {
@@ -466,10 +466,9 @@
ViolatedPrecondition violatedPrecondition = null;
NodeRevisionDescriptors revisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(resourcePath);
+ content.retrieve( slideToken, resourcePath);
NodeRevisionDescriptor revisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(resourcePath,
- revisionDescriptors);
+ content.retrieve( slideToken, revisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token, revisionDescriptors, revisionDescriptor);
// check <DAV:must-be-checked-in>
@@ -494,9 +493,9 @@
try {
String slideResourceUri = getResourceUri(resourcePath, labelHeader);
revisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(slideResourceUri);
+ content.retrieve( slideToken, slideResourceUri);
revisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(slideResourceUri, revisionDescriptors);
+ content.retrieve( slideToken, revisionDescriptors);
resourceKind = AbstractResourceKind.determineResourceKind(token, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Version) {
@@ -594,9 +593,9 @@
String labeledResourceUri = versioningHelper.getLabeledResourceUri(resourcePath,
label);
NodeRevisionDescriptors revisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(labeledResourceUri);
+ content.retrieve( slideToken,labeledResourceUri);
NodeRevisionDescriptor revisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(labeledResourceUri, revisionDescriptors);
+ content.retrieve( slideToken, revisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof VersionControlled) {
labeledResourceUri = versioningHelper.getUriOfAssociatedVR(resourcePath);
1.38 +11 -13 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- MoveMethod.java 8 May 2002 16:04:33 -0000 1.37
+++ MoveMethod.java 14 May 2002 15:33:42 -0000 1.38
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.37 2002/05/08 16:04:33 pnever Exp $
- * $Revision: 1.37 $
- * $Date: 2002/05/08 16:04:33 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.38 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.38 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -300,9 +300,8 @@
NodeRevisionDescriptors destinationRevisionDescriptors = null;
NodeRevisionDescriptor destinationRevisionDescriptor = null;
try {
- destinationRevisionDescriptors = versioningHelper.retrieveRevisionDescriptors(destinationUri);
- destinationRevisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(destinationUri,
- destinationRevisionDescriptors);
+ destinationRevisionDescriptors = content.retrieve( slideToken, destinationUri);
+ destinationRevisionDescriptor = content.retrieve( slideToken, destinationRevisionDescriptors);
}
catch( ObjectNotFoundException e ) {}; // can be ignored here!
@@ -358,9 +357,9 @@
}
NodeRevisionDescriptors sourceRevisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(sourceUri);
+ content.retrieve( slideToken, sourceUri);
NodeRevisionDescriptor sourceRevisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(sourceUri, sourceRevisionDescriptors);
+ content.retrieve( slideToken, sourceRevisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token,
sourceRevisionDescriptors,
sourceRevisionDescriptor);
@@ -384,9 +383,9 @@
if( Configuration.useVersionControl() ) {
NodeRevisionDescriptors destinationRevisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(destinationUri);
+ content.retrieve( slideToken, destinationUri);
NodeRevisionDescriptor destinationRevisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(destinationUri, destinationRevisionDescriptors);
+ content.retrieve( slideToken, destinationRevisionDescriptors);
// copy DeltaV-specific "0.0" revision if exists
try {
@@ -438,10 +437,9 @@
requestedResource = (RequestedResource)queryResultIterator.next();
workingResourceUri = requestedResource.getInternalHref();
workingResourceRevisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(workingResourceUri);
+ content.retrieve( slideToken, workingResourceUri);
workingResourceRevisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(workingResourceUri,
- workingResourceRevisionDescriptors);
+ content.retrieve( slideToken, workingResourceRevisionDescriptors);
autoUpdateProperty = new NodeProperty(P_AUTO_UPDATE,
propertyHelper.createHrefValue(destinationUri));
workingResourceRevisionDescriptor.setProperty(autoUpdateProperty);
1.68 +3 -15 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- PropFindMethod.java 7 May 2002 07:33:39 -0000 1.67
+++ PropFindMethod.java 14 May 2002 15:33:42 -0000 1.68
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.67 2002/05/07 07:33:39 juergen Exp $
- * $Revision: 1.67 $
- * $Date: 2002/05/07 07:33:39 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.68 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.68 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -462,24 +462,12 @@
slideToken, token, req, resp, getConfig() );
String resourcePath = object.getUri();
- if( !Configuration.useVersionControl() ) {
revisionDescriptors =
content.retrieve(slideToken, resourcePath);
- }
- else {
- revisionDescriptors =
- vHelp.retrieveRevisionDescriptors( resourcePath );
- }
try {
- if( !Configuration.useVersionControl() ) {
revisionDescriptor = content.retrieve(slideToken,
revisionDescriptors);
- }
- else {
- revisionDescriptor = vHelp.retrieveLatestRevisionDescriptor(
- resourcePath, revisionDescriptors );
- }
isCollection = WebdavUtils.isCollection(revisionDescriptor);
1.40 +4 -26 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- PropPatchMethod.java 7 May 2002 13:00:52 -0000 1.39
+++ PropPatchMethod.java 14 May 2002 15:33:42 -0000 1.40
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.39 2002/05/07 13:00:52 juergen Exp $
- * $Revision: 1.39 $
- * $Date: 2002/05/07 13:00:52 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v 1.40 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.40 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -276,38 +276,16 @@
VersioningHelper vHelp =
VersioningHelper.getVersioningHelper(slideToken, token, req, resp, getConfig() );
- // Changed for DeltaV --start--
- // NodeRevisionDescriptors revisionDescriptors =
- // content.retrieve(slideToken, resourcePath);
- NodeRevisionDescriptors revisionDescriptors;
-
- if( !Configuration.useVersionControl() ) {
- revisionDescriptors =
+ NodeRevisionDescriptors revisionDescriptors =
content.retrieve(slideToken, resourcePath);
- }
- else {
- revisionDescriptors =
- vHelp.retrieveRevisionDescriptors( resourcePath );
- }
- // Changed for DeltaV --end--
NodeRevisionNumber revisionNumber =
revisionDescriptors.getLatestRevision();
NodeRevisionDescriptor revisionDescriptor = null;
if (revisionNumber != null) {
try {
- // Changed for DeltaV --start--
- // oldRevisionDescriptor = content.retrieve
- // (slideToken, revisionDescriptors);
- if( !Configuration.useVersionControl() ) {
revisionDescriptor = content.retrieve
(slideToken, revisionDescriptors);
- }
- else {
- revisionDescriptor = vHelp.retrieveLatestRevisionDescriptor(
- resourcePath, revisionDescriptors );
- }
- // Changed for DeltaV --end--
} catch (RevisionDescriptorNotFoundException e) {
}
}
1.48 +4 -26 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- PutMethod.java 7 May 2002 13:00:52 -0000 1.47
+++ PutMethod.java 14 May 2002 15:33:42 -0000 1.48
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.47 2002/05/07 13:00:52 juergen Exp $
- * $Revision: 1.47 $
- * $Date: 2002/05/07 13:00:52 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.48 2002/05/14 15:33:42 pnever Exp $
+ * $Revision: 1.48 $
+ * $Date: 2002/05/14 15:33:42 $
*
* ====================================================================
*
@@ -177,38 +177,16 @@
try {
try {
- // Changed for DeltaV --start--
-// NodeRevisionDescriptors revisionDescriptors =
-// content.retrieve(slideToken, resourcePath);
- NodeRevisionDescriptors revisionDescriptors;
-
- if( !Configuration.useVersionControl() ) {
- revisionDescriptors =
+ NodeRevisionDescriptors revisionDescriptors =
content.retrieve(slideToken, resourcePath);
- }
- else {
- revisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors( resourcePath );
- }
- // Changed for DeltaV --end--
NodeRevisionNumber revisionNumber =
revisionDescriptors.getLatestRevision();
NodeRevisionDescriptor oldRevisionDescriptor = null;
if (revisionNumber != null) {
try {
- // Changed for DeltaV --start--
-// oldRevisionDescriptor = content.retrieve
-// (slideToken, revisionDescriptors);
- if( !Configuration.useVersionControl() ) {
oldRevisionDescriptor = content.retrieve
(slideToken, revisionDescriptors);
- }
- else {
- oldRevisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(
- resourcePath, revisionDescriptors );
- }
- // Changed for DeltaV --end--
} catch (RevisionDescriptorNotFoundException e) {
}
}
1.26 +6 -16 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ReportMethod.java 14 May 2002 14:15:51 -0000 1.25
+++ ReportMethod.java 14 May 2002 15:33:43 -0000 1.26
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v 1.25 2002/05/14 14:15:51 juergen Exp $
- * $Revision: 1.25 $
- * $Date: 2002/05/14 14:15:51 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v 1.26 2002/05/14 15:33:43 pnever Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/05/14 15:33:43 $
*
* ====================================================================
*
@@ -168,7 +168,7 @@
/**
* An implementation of the DeltaV <code>REPORT</code> method.
*
- * @version $Revision: 1.25 $
+ * @version $Revision: 1.26 $
*
* @author <a href="mailto:ralf.stuckert@softwareag.com">Ralf Stuckert</a>
*/
@@ -891,21 +891,11 @@
// get NodeRevisionDescriptor
try {
- if( !Configuration.useVersionControl() ) {
revisionDescriptors =
content.retrieve(slideToken, resourcePath);
- }
- else {
- revisionDescriptors = versioningHelper.retrieveRevisionDescriptors(resourcePath);
- }
try {
- if( !Configuration.useVersionControl() ) {
revisionDescriptor = content.retrieve(slideToken, revisionDescriptors);
- }
- else {
- revisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(resourcePath, revisionDescriptors);
- }
} catch (RevisionDescriptorNotFoundException e) {
@@ -1536,8 +1526,8 @@
writeLocateByHistoryReport(child.getUri(), parentElement, depth-1);
}
else {
- revisionDescriptors = versioningHelper.retrieveRevisionDescriptors(child.getUri());
- revisionDescriptor = versioningHelper.retrieveLatestRevisionDescriptor(child.getUri(), revisionDescriptors);
+ revisionDescriptors = content.retrieve(slideToken, child.getUri());
+ revisionDescriptor = content.retrieve(slideToken, revisionDescriptors);
resourceKind = AbstractResourceKind.determineResourceKind(token, child.getUri(), revisionDescriptor);
versionHistoryUri = null;
1.3 +5 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java
Index: UpdateMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UpdateMethod.java 7 May 2002 13:07:19 -0000 1.2
+++ UpdateMethod.java 14 May 2002 15:33:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v 1.2 2002/05/07 13:07:19 juergen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/07 13:07:19 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v 1.3 2002/05/14 15:33:43 pnever Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/14 15:33:43 $
*
* ====================================================================
*
@@ -451,9 +451,9 @@
ViolatedPrecondition violatedPrecondition = null;
NodeRevisionDescriptors revisionDescriptors =
- versioningHelper.retrieveRevisionDescriptors(resourcePath);
+ content.retrieve(slideToken, resourcePath);
NodeRevisionDescriptor revisionDescriptor =
- versioningHelper.retrieveLatestRevisionDescriptor(resourcePath, revisionDescriptors);
+ content.retrieve(slideToken, revisionDescriptors);
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(token,
revisionDescriptors,
revisionDescriptor);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>