juergen 02/03/21 22:40:55
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Optimized checkout/uncheckout:
No need to backup content of VCR since it can be restored from the associated VR.
(ralf)
Revision Changes Path
1.13 +14 -18
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VersioningHelper.java 21 Mar 2002 14:05:25 -0000 1.12
+++ VersioningHelper.java 22 Mar 2002 06:40:55 -0000 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.12 2002/03/21 14:05:25 juergen Exp $
- * $Revision: 1.12 $
- * $Date: 2002/03/21 14:05:25 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.13 2002/03/22 06:40:55 juergen Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/03/22 06:40:55 $
*
* ====================================================================
*
@@ -364,7 +364,7 @@
content.store(sToken, cinNrds.getUri(), cinNrd, null);
// do the checkout
- backupNodeRevisionDescriptor(rNrds, rNrd, vhrNrds);
+ backupProperties(rNrds, rNrd, vhrNrds);
rNrd.removeProperty( cinProp );
rNrd.setProperty(
new NodeProperty(P_CHECKED_OUT, cinProp.getValue()) );
@@ -495,7 +495,7 @@
content.store( sToken, coutNrds.getUri(), coutNrd, null);
// restore revision descriptor
- restoreNodeRevisionDescriptor(rNrds, rNrd, vhrNrds);
+ restoreProperties(rNrds, rNrd, vhrNrds);
rNrd.setLastModified(new Date());
rNrd.setProperty(new NodeProperty(P_CHECKED_IN, coutProp.getValue()) );
NodeRevisionContent oldContent = new NodeRevisionContent();
@@ -787,8 +787,8 @@
}
/**
- * Backups the given <code>revisionDescriptor</code> at the
- * {@link #VHR_BACKUP_REVISION_NUMBER special revision} of the
+ * Backups the properties of the given <code>revisionDescriptor</code>
+ * at the {@link #VHR_BACKUP_REVISION_NUMBER special revision} of the
* NodeRevisionDescriptors of the VHR associated with the VCR.
*
* @param revisionDescriptors the NodeRevisionDescriptors of the
@@ -800,24 +800,21 @@
*
* @throws SlideException
*/
- protected void backupNodeRevisionDescriptor(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor,
NodeRevisionDescriptors historyRevisionDescriptors) throws SlideException {
+ protected void backupProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor, NodeRevisionDescriptors
historyRevisionDescriptors) throws SlideException {
NodeRevisionDescriptor backup = cloneRevisionDescriptor(revisionDescriptor,
VHR_BACKUP_REVISION_NUMBER);
- NodeRevisionContent revisionContent = content.retrieve(sToken,
revisionDescriptors, revisionDescriptor);
- NodeRevisionContent backupContent = new NodeRevisionContent();
- backupContent.setContent(revisionContent.getContentBytes());
try {
content.retrieve(sToken, historyRevisionDescriptors,
backup.getRevisionNumber());
- content.store(sToken, historyRevisionDescriptors.getUri(), backup,
backupContent);
+ content.store(sToken, historyRevisionDescriptors.getUri(), backup,
null);
}
catch (RevisionDescriptorNotFoundException e) {
- content.create(sToken, historyRevisionDescriptors.getUri(),null,
backup, backupContent);
+ content.create(sToken, historyRevisionDescriptors.getUri(),null,
backup, null);
}
}
/**
- * Restores the given <code>revisionDescriptor</code> from the
- * {@link #VHR_BACKUP_REVISION_NUMBER special revision} of the
+ * Restores the properties of the given <code>revisionDescriptor</code>
+ * from the {@link #VHR_BACKUP_REVISION_NUMBER special revision} of the
* NodeRevisionDescriptors of the VHR associated with the VCR.
*
* @param revisionDescriptors the NodeRevisionDescriptors of the
@@ -829,12 +826,11 @@
*
* @throws SlideException
*/
- protected void restoreNodeRevisionDescriptor(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor,
NodeRevisionDescriptors historyRevisionDescriptors) throws SlideException {
+ protected void restoreProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor, NodeRevisionDescriptors
historyRevisionDescriptors) throws SlideException {
NodeRevisionDescriptor backup = content.retrieve(sToken,
historyRevisionDescriptors, VHR_BACKUP_REVISION_NUMBER);
- NodeRevisionContent backupContent = content.retrieve(sToken,
historyRevisionDescriptors, backup);
copyRevisionDescriptor(backup, revisionDescriptor);
- content.store(sToken, revisionDescriptors.getUri(), revisionDescriptor,
backupContent);
+ content.store(sToken, revisionDescriptors.getUri(), revisionDescriptor,
null);
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
