pnever 2002/10/31 06:50:21
Modified: src/webdav/server/org/apache/slide/webdav/method
CheckinMethod.java CopyMethod.java
PropPatchMethod.java PutMethod.java
UnlockMethod.java
Log:
Adapted to changed signature of VersioningHelper.checkin()
Revision Changes Path
1.19 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java
Index: CheckinMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CheckinMethod.java 23 Aug 2002 12:14:24 -0000 1.18
+++ CheckinMethod.java 31 Oct 2002 14:50:20 -0000 1.19
@@ -164,7 +164,7 @@
try {
VersioningHelper vh = VersioningHelper.getVersioningHelper(
slideToken, token, req, resp, getConfig() );
- locationValue = vh.checkin( resourcePath , forkOk, keepCheckedOut);
+ locationValue = vh.checkin( resourcePath , forkOk, keepCheckedOut,
false);
}
catch (PreconditionViolationException e) {
sendPreconditionViolation(e);
1.51 +4 -4
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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- CopyMethod.java 14 Oct 2002 16:03:42 -0000 1.50
+++ CopyMethod.java 31 Oct 2002 14:50:20 -0000 1.51
@@ -396,7 +396,7 @@
boolean mustCheckin =
versioningHelper.mustCheckinAutoVersionedVCR(slideToken,
destinationRevisionDescriptors, destinationRevisionDescriptor);
if (mustCheckin) {
try {
- versioningHelper.checkin(destinationUri, false, false );
//forkOk=false, keepCheckedOut=false
+ versioningHelper.checkin(destinationUri, false, false, true );
//forkOk=false, keepCheckedOut=false
}
catch (IOException e) {
throw new SlideException("Checkin failed: " + e.getMessage());
1.63 +4 -4
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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- PropPatchMethod.java 30 Oct 2002 10:02:45 -0000 1.62
+++ PropPatchMethod.java 31 Oct 2002 14:50:20 -0000 1.63
@@ -340,7 +340,7 @@
// Changed for DeltaV --start--
if( Configuration.useVersionControl() && mustCheckIn) {
- vHelp.checkin(revisionDescriptors, revisionDescriptor, false, false
); //forkOk=false, keepCheckedOut=false
+ vHelp.checkin(revisionDescriptors, revisionDescriptor, false,
false, true ); //forkOk=false, keepCheckedOut=false
}
// Changed for DeltaV --end--
1.61 +4 -4
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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- PutMethod.java 22 Oct 2002 07:11:24 -0000 1.60
+++ PutMethod.java 31 Oct 2002 14:50:20 -0000 1.61
@@ -303,7 +303,7 @@
versioningHelper.versionControl(resourcePath);
}
if( Configuration.useVersionControl() && mustCheckIn) {
- versioningHelper.checkin(revisionDescriptors,
revisionDescriptor, false, false ); //forkOk=false, keepCheckedOut=false
+ versioningHelper.checkin(revisionDescriptors,
revisionDescriptor, false, false, true ); //forkOk=false, keepCheckedOut=false
}
// Changed for DeltaV --end--
1.26 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- UnlockMethod.java 16 Oct 2002 12:23:58 -0000 1.25
+++ UnlockMethod.java 31 Oct 2002 14:50:20 -0000 1.26
@@ -207,7 +207,7 @@
if ( (checkinLocktokenProperty != null) &&
(checkinLocktokenProperty.getValue() != null) &&
lockId.equals(checkinLocktokenProperty.getValue().toString()) ) {
VersioningHelper versionHelper =
VersioningHelper.getVersioningHelper(slideToken, token, req, resp, config);
- versionHelper.checkin(revisionDescriptors,
revisionDescriptor, false, false);
+ versionHelper.checkin(revisionDescriptors, revisionDescriptor,
false, false, true);
}
}
--
To unsubscribe, e-mail: <mailto:slide-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@;jakarta.apache.org>
