juergen 02/05/16 21:56:25
Modified: src/webdav/server/org/apache/slide/webdav/util
DeltavConstants.java VersioningHelper.java
src/webdav/server/org/apache/slide/webdav/method
UnlockMethod.java
Log:
Renamed P_CHECKIN_LOCKTOKEN to I_CHECKIN_LOCKTOKEN and moved it from
VersioningHelper to DeltavConstants.
(ralf)
Revision Changes Path
1.19 +5 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DeltavConstants.java 7 May 2002 13:09:35 -0000 1.18
+++ DeltavConstants.java 17 May 2002 04:56:24 -0000 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
1.18 2002/05/07 13:09:35 juergen Exp $
- * $Revision: 1.18 $
- * $Date: 2002/05/07 13:09:35 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
1.19 2002/05/17 04:56:24 juergen Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/05/17 04:56:24 $
*
* ====================================================================
*
@@ -80,6 +80,8 @@
String I_INITIAL_HISTORY_NAME = "1";
String I_NEXT_WORKINGRESOURCE_NAME =
"next-workingresource-name"; //property
String I_INITIAL_WORKINGRESOURCE_NAME = "1";
+ String I_CHECKIN_LOCKTOKEN =
"checkin-locktoken";
+
/** Features */
String F_ACTIVITY =
"activity";
1.48 +7 -11
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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- VersioningHelper.java 14 May 2002 15:33:20 -0000 1.47
+++ VersioningHelper.java 17 May 2002 04:56:24 -0000 1.48
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.47 2002/05/14 15:33:20 pnever Exp $
- * $Revision: 1.47 $
- * $Date: 2002/05/14 15:33:20 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.48 2002/05/17 04:56:24 juergen Exp $
+ * $Revision: 1.48 $
+ * $Date: 2002/05/17 04:56:24 $
*
* ====================================================================
*
@@ -137,12 +137,6 @@
*/
public static final NodeRevisionNumber VCR_BACKUP_REVISION_NUMBER = new
NodeRevisionNumber(0, 0);
- /**
- * String constant for the name of the <code><checkin-locktoken></code>
- * property.
- */
- public static final String P_CHECKIN_LOCKTOKEN = "checkin-locktoken";
-
/**
@@ -654,7 +648,7 @@
NodeLock writeLock = getWriteLock(sToken, rNrds);
if (writeLock != null) {
NodeProperty p =
- new NodeProperty( VersioningHelper.P_CHECKIN_LOCKTOKEN,
writeLock.getLockId() );
+ new NodeProperty( I_CHECKIN_LOCKTOKEN,
writeLock.getLockId() );
p.setKind( NodeProperty.Kind.PROTECTED );
rNrd.setProperty( p );
}
@@ -711,6 +705,8 @@
ViolatedPrecondition violatedPrecondition =
getCheckoutPreconditionViolation(rNrds, rNrd, forkOk);
if (violatedPrecondition != null) {
throw new PreconditionViolationException(violatedPrecondition,
rNrds.getUri());
+
+
}
NodeRevisionDescriptors vhrNrds = content.retrieve(sToken, vhUri);
@@ -1014,7 +1010,7 @@
rNrd.removeProperty( coutProp );
rNrd.setProperty(
new NodeProperty(P_CHECKED_IN,
pHelp.createHrefValue(vrUriNew)) );
- rNrd.removeProperty( VersioningHelper.P_CHECKIN_LOCKTOKEN );
+ rNrd.removeProperty( I_CHECKIN_LOCKTOKEN );
rNrd.removeProperty(P_PREDECESSOR_SET);
rNrd.removeProperty(P_CHECKOUT_FORK);
rNrd.removeProperty(P_CHECKIN_FORK);
1.21 +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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- UnlockMethod.java 30 Apr 2002 12:39:19 -0000 1.20
+++ UnlockMethod.java 17 May 2002 04:56:25 -0000 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.20 2002/04/30 12:39:19 pnever Exp $
- * $Revision: 1.20 $
- * $Date: 2002/04/30 12:39:19 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.21 2002/05/17 04:56:25 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2002/05/17 04:56:25 $
*
* ====================================================================
*
@@ -182,7 +182,7 @@
ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, requestUri, revisionDescriptor);
if( Configuration.useVersionControl() &&
(resourceKind instanceof CheckedOutVersionControlled) ) {
- NodeProperty checkinLocktokenProperty =
revisionDescriptor.getProperty(VersioningHelper.P_CHECKIN_LOCKTOKEN);
+ NodeProperty checkinLocktokenProperty =
revisionDescriptor.getProperty(DeltavConstants.I_CHECKIN_LOCKTOKEN);
if ( (checkinLocktokenProperty != null) &&
(checkinLocktokenProperty.getValue() != null) &&
lockId.equals(checkinLocktokenProperty.getValue().toString()) ) {
VersioningHelper versionHelper =
VersioningHelper.getVersioningHelper(slideToken, token, req, resp, config);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
