juergen 02/05/02 04:26:32
Modified: src/webdav/server/org/apache/slide/webdav/method
PropPatchMethod.java PutMethod.java
src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
a ServiceAccessException must stop execution of a webdav command, so pass it to the
calling layer.
Revision Changes Path
1.38 +5 -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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- PropPatchMethod.java 30 Apr 2002 12:39:19 -0000 1.37
+++ PropPatchMethod.java 2 May 2002 11:26:31 -0000 1.38
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.37 2002/04/30 12:39:19 pnever Exp $
- * $Revision: 1.37 $
- * $Date: 2002/04/30 12:39:19 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.38 2002/05/02 11:26:31 juergen Exp $
+ * $Revision: 1.38 $
+ * $Date: 2002/05/02 11:26:31 $
*
* ====================================================================
*
@@ -651,7 +651,8 @@
*
* @return the precondition that has been violated (if any).
*/
- private ViolatedPrecondition getPreconditionViolation(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, ResourceKind
resourceKind) {
+ private ViolatedPrecondition getPreconditionViolation(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, ResourceKind
resourceKind)
+ throws ServiceAccessException {
if( Configuration.useVersionControl() ) {
1.46 +5 -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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- PutMethod.java 30 Apr 2002 12:39:19 -0000 1.45
+++ PutMethod.java 2 May 2002 11:26:31 -0000 1.46
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.45 2002/04/30 12:39:19 pnever Exp $
- * $Revision: 1.45 $
- * $Date: 2002/04/30 12:39:19 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.46 2002/05/02 11:26:31 juergen Exp $
+ * $Revision: 1.46 $
+ * $Date: 2002/05/02 11:26:31 $
*
* ====================================================================
*
@@ -431,7 +431,8 @@
*
* @return the precondition that has been violated (if any).
*/
- private ViolatedPrecondition getPreconditionViolation(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, ResourceKind
resourceKind) {
+ private ViolatedPrecondition getPreconditionViolation(NodeRevisionDescriptors
revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, ResourceKind
resourceKind)
+ throws ServiceAccessException {
if( Configuration.useVersionControl() ) {
1.43 +13 -9
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- VersioningHelper.java 1 May 2002 15:04:56 -0000 1.42
+++ VersioningHelper.java 2 May 2002 11:26:31 -0000 1.43
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.42 2002/05/01 15:04:56 pnever Exp $
- * $Revision: 1.42 $
- * $Date: 2002/05/01 15:04:56 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
1.43 2002/05/02 11:26:31 juergen Exp $
+ * $Revision: 1.43 $
+ * $Date: 2002/05/02 11:26:31 $
*
* ====================================================================
*
@@ -79,6 +79,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.slide.common.SlideToken;
+import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.common.Uri;
import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
@@ -1432,7 +1433,8 @@
* @return <code>true</code> if the resource must be checked in after
* modifying it.
*/
- public boolean mustCheckinAutoVersionedVCR(SlideToken slideToken,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor
revisionDescriptor) {
+ public boolean mustCheckinAutoVersionedVCR(SlideToken slideToken,
NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor)
+ throws ServiceAccessException {
boolean checkin = false;
String autoVersionValue = getAutoVersionElementName(revisionDescriptor);
@@ -1447,15 +1449,16 @@
/**
* Indicates if the resource specified by the given NodeRevisionDescriptors
- * is write locked.
+ * is write locked. Reads all URLs in read only mode
*
* @param slideToken the SlideToken to use.
* @param revisionDescriptors the NodeRevisionDescriptors of the resource.
*
* @return <code>true</code> if the resource is write locked.
*/
- public boolean isWriteLocked(SlideToken slideToken, NodeRevisionDescriptors
revisionDescriptors) {
- return (getWriteLock(slideToken, revisionDescriptors) != null);
+ public boolean isWriteLocked(SlideToken slideToken, NodeRevisionDescriptors
revisionDescriptors)
+ throws ServiceAccessException {
+ return (getWriteLock(new SlideTokenWrapper(slideToken, false),
revisionDescriptors) != null);
}
/**
@@ -1467,7 +1470,8 @@
*
* @return the write lock of the resource.
*/
- public NodeLock getWriteLock(SlideToken slideToken, NodeRevisionDescriptors
revisionDescriptors) {
+ private NodeLock getWriteLock(SlideToken slideToken, NodeRevisionDescriptors
revisionDescriptors)
+ throws ServiceAccessException {
NodeLock writeLock = null;
try {
@@ -1485,7 +1489,6 @@
}
}
}
- catch (ServiceAccessException e) {}
catch (ObjectNotFoundException e) {}
catch (LockTokenNotFoundException e) {}
@@ -1841,6 +1844,7 @@
}
}
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
