juergen 02/05/17 05:43:56
Modified: src/webdav/server/org/apache/slide/webdav/method
UnlockMethod.java
src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Internal property <checkin-locktoken> is now in the Slide namespace. Added code for
smooth migration.
(ralf)
Revision Changes Path
1.22 +13 -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- UnlockMethod.java 17 May 2002 04:56:25 -0000 1.21
+++ UnlockMethod.java 17 May 2002 12:43:56 -0000 1.22
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.22 2002/05/17 12:43:56 juergen Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/05/17 12:43:56 $
*
* ====================================================================
*
@@ -74,6 +74,7 @@
import org.apache.slide.macro.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.structure.*;
import org.apache.slide.webdav.util.WebdavUtils;
@@ -182,7 +183,15 @@
ResourceKind resourceKind =
AbstractResourceKind.determineResourceKind(token, requestUri, revisionDescriptor);
if( Configuration.useVersionControl() &&
(resourceKind instanceof CheckedOutVersionControlled) ) {
- NodeProperty checkinLocktokenProperty =
revisionDescriptor.getProperty(DeltavConstants.I_CHECKIN_LOCKTOKEN);
+ NodeProperty checkinLocktokenProperty =
+
revisionDescriptor.getProperty(DeltavConstants.I_CHECKIN_LOCKTOKEN,
+ NamespaceCache.SLIDE_URI);
+ if (checkinLocktokenProperty == null) {
+ // retry with default (DAV:) namespace which was the
+ // former namespace of this property
+ 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);
1.49 +10 -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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- VersioningHelper.java 17 May 2002 04:56:24 -0000 1.48
+++ VersioningHelper.java 17 May 2002 12:43:56 -0000 1.49
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.49 2002/05/17 12:43:56 juergen Exp $
+ * $Revision: 1.49 $
+ * $Date: 2002/05/17 12:43:56 $
*
* ====================================================================
*
@@ -87,6 +87,7 @@
import org.apache.slide.content.Content;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
@@ -648,7 +649,9 @@
NodeLock writeLock = getWriteLock(sToken, rNrds);
if (writeLock != null) {
NodeProperty p =
- new NodeProperty( I_CHECKIN_LOCKTOKEN,
writeLock.getLockId() );
+ new NodeProperty(I_CHECKIN_LOCKTOKEN,
+ writeLock.getLockId(),
+ NamespaceCache.SLIDE_URI);
p.setKind( NodeProperty.Kind.PROTECTED );
rNrd.setProperty( p );
}
@@ -1010,6 +1013,9 @@
rNrd.removeProperty( coutProp );
rNrd.setProperty(
new NodeProperty(P_CHECKED_IN,
pHelp.createHrefValue(vrUriNew)) );
+ rNrd.removeProperty( I_CHECKIN_LOCKTOKEN ,
NamespaceCache.SLIDE_URI);
+ // retry with default (DAV:) namespace which was the
+ // former namespace of this property
rNrd.removeProperty( I_CHECKIN_LOCKTOKEN );
rNrd.removeProperty(P_PREDECESSOR_SET);
rNrd.removeProperty(P_CHECKOUT_FORK);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
