juergen 2004/06/17 03:49:35
Modified: src/webdav/server/org/apache/slide/webdav/util/resourcekind
Tag: SLIDE_2_0_RELEASE_BRANCH
AbstractResourceKind.java
src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_2_0_RELEASE_BRANCH CopyMethod.java
PropPatchMethod.java PutMethod.java
src/webdav/server/org/apache/slide/webdav/util Tag:
SLIDE_2_0_RELEASE_BRANCH DeltavConstants.java
VersioningHelper.java
Log:
Added the auto-version feature 'checkout-ignore-unlock'. This value causes UNLOCK
not issuing an implicit checkin command.
Revision Changes Path
No revision
No revision
1.26.2.3 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java
Index: AbstractResourceKind.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/AbstractResourceKind.java,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -r1.26.2.2 -r1.26.2.3
--- AbstractResourceKind.java 5 Feb 2004 16:11:26 -0000 1.26.2.2
+++ AbstractResourceKind.java 17 Jun 2004 10:49:35 -0000 1.26.2.3
@@ -76,7 +76,7 @@
* e.g. <code>checkout-checkin</code>.
*/
protected final static String[] SUPPORTED_AUTO_VERSION_ELEMENTS =
- new String[] {EMPTY_STRING, E_CHECKOUT, E_CHECKOUT_CHECKIN,
E_CHECKOUT_UNLOCKED_CHECKIN, E_LOCKED_CHECKOUT};
+ new String[] {EMPTY_STRING, E_CHECKOUT, E_CHECKOUT_IGNORE_UNLOCK,
E_CHECKOUT_CHECKIN, E_CHECKOUT_UNLOCKED_CHECKIN, E_LOCKED_CHECKOUT};
/**
* A String array containing the names of the Elements supported as a
No revision
No revision
1.58.2.2 +4 -3
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.58.2.1
retrieving revision 1.58.2.2
diff -u -r1.58.2.1 -r1.58.2.2
--- CopyMethod.java 5 Feb 2004 16:11:23 -0000 1.58.2.1
+++ CopyMethod.java 17 Jun 2004 10:49:35 -0000 1.58.2.2
@@ -666,6 +666,7 @@
if ( !E_CHECKOUT_CHECKIN.equals(autoVersion) &&
!E_CHECKOUT_UNLOCKED_CHECKIN.equals(autoVersion) &&
!E_CHECKOUT.equals(autoVersion) &&
+ !E_CHECKOUT_IGNORE_UNLOCK.equals(autoVersion) &&
!E_LOCKED_CHECKOUT.equals(autoVersion) ) {
throw new PreconditionViolationException(new
ViolatedPrecondition(C_CANNOT_MODIFY_VERSION_CONTROLLED_CONTENT,
WebdavStatus.SC_FORBIDDEN), destinationUri);
1.72.2.3 +4 -3
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.72.2.2
retrieving revision 1.72.2.3
diff -u -r1.72.2.2 -r1.72.2.3
--- PropPatchMethod.java 5 Feb 2004 16:11:23 -0000 1.72.2.2
+++ PropPatchMethod.java 17 Jun 2004 10:49:35 -0000 1.72.2.3
@@ -590,6 +590,7 @@
if ( !E_CHECKOUT_CHECKIN.equals(autoVersion) &&
!E_CHECKOUT_UNLOCKED_CHECKIN.equals(autoVersion) &&
!E_CHECKOUT.equals(autoVersion) &&
+ !E_CHECKOUT_IGNORE_UNLOCK.equals(autoVersion) &&
!E_LOCKED_CHECKOUT.equals(autoVersion) ) {
return new
ViolatedPrecondition(C_CANNOT_MODIFY_VERSION_CONTROLLED_PROPERTY,
WebdavStatus.SC_FORBIDDEN);
1.69.2.3 +4 -3
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.69.2.2
retrieving revision 1.69.2.3
diff -u -r1.69.2.2 -r1.69.2.3
--- PutMethod.java 25 Apr 2004 17:34:27 -0000 1.69.2.2
+++ PutMethod.java 17 Jun 2004 10:49:35 -0000 1.69.2.3
@@ -457,6 +457,7 @@
if ( !E_CHECKOUT_CHECKIN.equals(autoVersion) &&
!E_CHECKOUT_UNLOCKED_CHECKIN.equals(autoVersion) &&
!E_CHECKOUT.equals(autoVersion) &&
+ !E_CHECKOUT_IGNORE_UNLOCK.equals(autoVersion) &&
!E_LOCKED_CHECKOUT.equals(autoVersion) ) {
return new
ViolatedPrecondition(C_CANNOT_MODIFY_VERSION_CONTROLLED_CONTENT,
WebdavStatus.SC_FORBIDDEN);
No revision
No revision
1.27.2.2 +4 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java
Index: DeltavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- DeltavConstants.java 5 Feb 2004 16:11:25 -0000 1.27.2.1
+++ DeltavConstants.java 17 Jun 2004 10:49:35 -0000 1.27.2.2
@@ -84,6 +84,7 @@
String E_CHECKIN_FORK =
"checkin-fork";
String E_CHECKIN_RESPONSE =
"checkin-response";
String E_CHECKOUT =
"checkout";
+ String E_CHECKOUT_IGNORE_UNLOCK =
"checkout-ignore-unlock";
String E_CHECKOUT_CHECKIN =
"checkout-checkin";
String E_CHECKOUT_FORK =
"checkout-fork";
String E_CHECKOUT_RESPONSE =
"checkout-response";
1.95.2.3 +6 -4
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.95.2.2
retrieving revision 1.95.2.3
diff -u -r1.95.2.2 -r1.95.2.3
--- VersioningHelper.java 5 Feb 2004 16:11:25 -0000 1.95.2.2
+++ VersioningHelper.java 17 Jun 2004 10:49:35 -0000 1.95.2.3
@@ -785,7 +785,8 @@
rNrd.setProperty(property);
}
- if (isAutoVersionCheckout) {
+ if (isAutoVersionCheckout &&
+
!(E_CHECKOUT_IGNORE_UNLOCK.equals(getAutoVersionElementName(rNrd)))) {
NodeLock writeLock = getWriteLock(readonlySlideToken(), rNrds);
if (writeLock != null) {
NodeProperty p =
@@ -1708,6 +1709,7 @@
( DeltavConstants.E_CHECKOUT_CHECKIN.equals(autoVersionValue) ||
DeltavConstants.E_CHECKOUT_UNLOCKED_CHECKIN.equals(autoVersionValue) ||
DeltavConstants.E_CHECKOUT.equals(autoVersionValue) ||
+
DeltavConstants.E_CHECKOUT_IGNORE_UNLOCK.equals(autoVersionValue) ||
DeltavConstants.E_LOCKED_CHECKOUT.equals(autoVersionValue)
) );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
