juergen 02/04/10 01:09:19
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Store backup of properties (for checkout/uncheckout) in the VCR.
(ralf)
Revision Changes Path
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- VersioningHelper.java 10 Apr 2002 07:25:37 -0000 1.24
+++ VersioningHelper.java 10 Apr 2002 08:09:19 -0000 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.24 2002/04/10 07:25:37 juergen Exp $
- * $Revision: 1.24 $
- * $Date: 2002/04/10 07:25:37 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.25 2002/04/10 08:09:19 juergen Exp $
+ * $Revision: 1.25 $
+ * $Date: 2002/04/10 08:09:19 $
*
* ====================================================================
*
@@ -130,7 +130,7 @@
/**
* The NodeRevisionNumber of the VCR backup needed for checkout-uncheckout.
*/
- public static final NodeRevisionNumber VCR_BACKUP_REVISION_NUMBER = new
NodeRevisionNumber(0, 1);
+ public static final NodeRevisionNumber VCR_BACKUP_REVISION_NUMBER = new
NodeRevisionNumber(0, 0);
/**
* String constant for the name of the <code><checkin-locktoken></code>
@@ -460,7 +460,7 @@
content.store(sToken, cinNrds.getUri(), cinNrd, null);
// do the checkout
- backupProperties(rNrds, rNrd, vhrNrds);
+ backupProperties(rNrds, rNrd);
rNrd.removeProperty( cinProp );
rNrd.setProperty(
new NodeProperty(P_CHECKED_OUT, cinProp.getValue()) );
@@ -603,7 +603,7 @@
content.store( sToken, coutNrds.getUri(), coutNrd, null);
// restore revision descriptor
- restoreProperties(rNrds, rNrd, vhrNrds);
+ restoreProperties(rNrds, rNrd);
rNrd.setLastModified(new Date());
rNrd.setProperty(new NodeProperty(P_CHECKED_IN, coutProp.getValue()) );
NodeRevisionContent oldContent = new NodeRevisionContent();
@@ -909,46 +909,42 @@
/**
* Backups the properties of the given <code>revisionDescriptor</code>
* at the {@link #VCR_BACKUP_REVISION_NUMBER special revision} of the
- * NodeRevisionDescriptors of the VHR associated with the VCR.
+ * NodeRevisionDescriptors of the VCR.
*
* @param revisionDescriptors the NodeRevisionDescriptors of the
* VCR to backup.
* @param revisionDescriptor the NodeRevisionDescriptor of the
* VCR to backup.
- * @param historyRevisionDescriptors the NodeRevisionDescriptors of the
- * VHR associated with the VCR.
*
* @throws SlideException
*/
- protected void backupProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor, NodeRevisionDescriptors
historyRevisionDescriptors) throws SlideException {
+ protected void backupProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor) throws SlideException {
NodeRevisionDescriptor backup = cloneRevisionDescriptor(revisionDescriptor,
VCR_BACKUP_REVISION_NUMBER);
try {
- content.retrieve(sToken, historyRevisionDescriptors,
backup.getRevisionNumber());
- content.store(sToken, historyRevisionDescriptors.getUri(), backup,
null);
+ content.retrieve(sToken, revisionDescriptors,
backup.getRevisionNumber());
+ content.store(sToken, revisionDescriptors.getUri(), backup, null);
}
catch (RevisionDescriptorNotFoundException e) {
- content.create(sToken, historyRevisionDescriptors.getUri(),null,
backup, null);
+ content.create(sToken, revisionDescriptors.getUri(),null, backup,
null);
}
}
/**
* Restores the properties of the given <code>revisionDescriptor</code>
* from the {@link #VCR_BACKUP_REVISION_NUMBER special revision} of the
- * NodeRevisionDescriptors of the VHR associated with the VCR.
+ * NodeRevisionDescriptors of the VCR.
*
* @param revisionDescriptors the NodeRevisionDescriptors of the
* VCR to restore.
* @param revisionDescriptor the NodeRevisionDescriptor of the
* VCR to restore.
- * @param historyRevisionDescriptors the NodeRevisionDescriptors of the
- * VHR associated with the VCR.
*
* @throws SlideException
*/
- protected void restoreProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor, NodeRevisionDescriptors
historyRevisionDescriptors) throws SlideException {
+ protected void restoreProperties(NodeRevisionDescriptors revisionDescriptors,
NodeRevisionDescriptor revisionDescriptor) throws SlideException {
- NodeRevisionDescriptor backup = content.retrieve(sToken,
historyRevisionDescriptors, VCR_BACKUP_REVISION_NUMBER);
+ NodeRevisionDescriptor backup = content.retrieve(sToken,
revisionDescriptors, VCR_BACKUP_REVISION_NUMBER);
copyRevisionDescriptor(backup, revisionDescriptor);
content.store(sToken, revisionDescriptors.getUri(), revisionDescriptor,
null);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
