juergen 01/04/04 09:33:07
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java MoveMethod.java
src/share/org/apache/slide/macro MacroImpl.java
Log:
if a move or copy is executed with (parts of the) destination uri does not exist a
response code of 409 is generated.
Revision Changes Path
1.10 +7 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CopyMethod.java 2001/04/04 15:44:32 1.9
+++ CopyMethod.java 2001/04/04 16:33:05 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.9 2001/04/04 15:44:32 juergen Exp $
- * $Revision: 1.9 $
- * $Date: 2001/04/04 15:44:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.10 2001/04/04 16:33:05 juergen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/04/04 16:33:05 $
*
* ====================================================================
*
@@ -279,6 +279,9 @@
} catch(ForbiddenException e) {
generateStatusText(errorMessage, e.getObjectUri(),
WebdavStatus.SC_FORBIDDEN);
+ } catch(ConflictException e) {
+ generateStatusText(errorMessage, e.getObjectUri(),
+ WebdavStatus.SC_CONFLICT);
} catch(ObjectAlreadyExistsException e) {
generateStatusText(errorMessage, e.getObjectUri(),
WebdavStatus.SC_INTERNAL_SERVER_ERROR);
@@ -341,3 +344,4 @@
}
+
1.10 +7 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MoveMethod.java 2001/04/04 15:44:32 1.9
+++ MoveMethod.java 2001/04/04 16:33:05 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.9 2001/04/04 15:44:32 juergen Exp $
- * $Revision: 1.9 $
- * $Date: 2001/04/04 15:44:32 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.10 2001/04/04 16:33:05 juergen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/04/04 16:33:05 $
*
* ====================================================================
*
@@ -281,6 +281,9 @@
} catch(ForbiddenException e) {
generateStatusText(errorMessage, e.getObjectUri(),
WebdavStatus.SC_FORBIDDEN);
+ } catch(ConflictException e) {
+ generateStatusText(errorMessage, e.getObjectUri(),
+ WebdavStatus.SC_CONFLICT);
} catch(ObjectAlreadyExistsException e) {
generateStatusText(errorMessage, e.getObjectUri(),
WebdavStatus.SC_INTERNAL_SERVER_ERROR);
@@ -342,3 +345,4 @@
}
+
1.14 +12 -7 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MacroImpl.java 2001/04/04 15:44:35 1.13
+++ MacroImpl.java 2001/04/04 16:33:07 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.13
2001/04/04 15:44:35 juergen Exp $
- * $Revision: 1.13 $
- * $Date: 2001/04/04 15:44:35 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.14
2001/04/04 16:33:07 juergen Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/04/04 16:33:07 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Macro helper class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public final class MacroImpl implements Macro {
@@ -316,8 +316,12 @@
ObjectNode object = structureHelper.retrieve(token, sourceUri);
// Creating the copy
- structureHelper.create(token, object.copyObject(),
- destinationUri);
+ try {
+ structureHelper.create(token, object.copyObject(), destinationUri);
+ }
+ catch (ObjectNotFoundException s){
+ throw new ConflictException(s.getObjectUri());
+ }
// Trying to recreate permissions
try {
@@ -398,7 +402,7 @@
}
} catch(SlideException ex) {
- ex.printStackTrace();
+ // ex.printStackTrace(); the exception is packed and (hopefully)
reported in the response
e.addException(ex);
}
@@ -473,5 +477,6 @@
}
}
+
