remm 01/10/11 01:24:52
Modified: src/webdav/server/org/apache/slide/webdav/method
PutMethod.java
Log:
- Remove lots of dead code.
- PUT when creating should return 201.
- PUT when overwriting should return 204.
Revision Changes Path
1.20 +11 -61
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PutMethod.java 2001/09/23 11:19:02 1.19
+++ PutMethod.java 2001/10/11 08:24:52 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.19 2001/09/23 11:19:02 dirkv Exp $
- * $Revision: 1.19 $
- * $Date: 2001/09/23 11:19:02 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.20 2001/10/11 08:24:52 remm Exp $
+ * $Revision: 1.20 $
+ * $Date: 2001/10/11 08:24:52 $
*
* ====================================================================
*
@@ -224,12 +224,15 @@
content.create(slideToken, resourcePath, revisionDescriptor,
revisionContent);
+ resp.setStatus(WebdavStatus.SC_NO_CONTENT);
+
} catch (LinkedObjectNotFoundException e) {
// Nothing we can do here ...
e.printStackTrace();
//
// make sure the transaction is aborted
- // throw any WebDAV exception to indicate the transaction wants to
be aborted
+ // throw any WebDAV exception to indicate
+ // the transaction wants to be aborted
//
throw new WebdavException(WebdavStatus.SC_ACCEPTED, false);
} catch (ObjectNotFoundException e) {
@@ -288,34 +291,13 @@
revisionDescriptor.setProperty(property);
// Owner
- String owner =
slideToken.getCredentialsToken().getPublicCredentials();
+ String owner =
+ slideToken.getCredentialsToken().getPublicCredentials();
property = new NodeProperty("owner", owner, true);
revisionDescriptor.setProperty(property);
if (isMsProprietarySupport()) {
- // Name
- /*
- property = new NodeProperty("name", resourcePath,
- "d", "DAV");
- revisionDescriptor.setProperty(property);
- */
-
- // ParentName
- // TODO : Fix this
- /*
- property = new NodeProperty("parentname", resourcePath,
- "ms", "MICROSOFT");
- revisionDescriptor.setProperty(property);
- */
-
- // Href
- /*
- property = new NodeProperty("href", resourcePath,
- "ms", "MICROSOFT");
- revisionDescriptor.setProperty(property);
- */
-
// Is hidden
property = new NodeProperty("ishidden", "0", "MICROSOFT");
revisionDescriptor.setProperty(property);
@@ -330,41 +312,12 @@
"MICROSOFT");
revisionDescriptor.setProperty(property);
- // Content class
- // TODO : Find what it is ...
- /*
- property = new NodeProperty("contentclass", "",
- "MICROSOFT");
- revisionDescriptor.setProperty(property);
- */
-
// Last accessed
property = new NodeProperty("lastaccessed",
(new Date()).toString(),
"MICROSOFT");
revisionDescriptor.setProperty(property);
- // Is structured document
- /*
- property = new NodeProperty("isstructureddocument",
- "false", "MICROSOFT");
- revisionDescriptor.setProperty(property);
- */
-
- // Default document
- /*
- property = new NodeProperty("defaultdocument",
- "", "MICROSOFT");
- revisionDescriptor.setProperty(property);
- */
-
- // Is root
- /*
- property = new NodeProperty("isroot", "false",
- "MICROSOFT");
- revisionDescriptor.setProperty(property);
- */
-
}
// Creating revisionDescriptor associated with the object
@@ -375,12 +328,9 @@
content.create(slideToken, resourcePath, revisionDescriptor,
revisionContent);
+ resp.setStatus(WebdavStatus.SC_CREATED);
+
}
-
- String status = new String("HTTP/1.1 " + WebdavStatus.SC_CREATED
- + " " + WebdavStatus.getStatusText
- (WebdavStatus.SC_CREATED));
-
} catch (Exception e) {
resp.setStatus(getErrorCode(e)); // special handling needed
