You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/04/26 19:01:59 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method PutMethod.java
remm 01/04/26 10:01:59
Modified: src/webdav/server/org/apache/slide/webdav/method
PutMethod.java
Log:
- Normally assume the 'getcontentlanguage' and 'getcontenttype' are set,
however, before we clear the 'resourcetype' need to check for the case
when a 'lock-null' is created just before the initial PUT.
In that case need to add the missing properties.
Patch submitted by Martin Gronberg <martyg at everest.com>
Revision Changes Path
1.10 +25 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PutMethod.java 2001/04/25 01:57:14 1.9
+++ PutMethod.java 2001/04/26 17:01:59 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.9 2001/04/25 01:57:14 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2001/04/25 01:57:14 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v 1.10 2001/04/26 17:01:59 remm Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/04/26 17:01:59 $
*
* ====================================================================
*
@@ -190,6 +190,27 @@
property = new NodeProperty("getetag", etag, true);
revisionDescriptor.setProperty(property);
+ // Normally assume the 'getcontentlanguage' and
+ // 'getcontenttype' are set, however, before we clear the
+ // 'resourcetype' need to check for the case when a
+ // 'lock-null' is created just before the initial PUT. In
+ // that case need to add the missing properties.
+ property = revisionDescriptor.getProperty("resourcetype");
+ if (((String) property.getValue()).equals("<lock-null/>")) {
+ property =
+ new NodeProperty("getcontentlanguage", "en", true);
+ revisionDescriptor.setProperty(property);
+
+ String contentType =
+ servlet.getServletContext().getMimeType(resourcePath);
+ if (contentType == null) {
+ contentType = "text/plain";
+ }
+ property = new NodeProperty("getcontenttype", contentType,
+ true);
+ revisionDescriptor.setProperty(property);
+ }
+
// Resource type
property = new NodeProperty("resourcetype", "", true);
revisionDescriptor.setProperty(property);
@@ -236,7 +257,7 @@
String contentType =
servlet.getServletContext().getMimeType(resourcePath);
if (contentType == null) {
- contentType = "TEXT/PLAIN";
+ contentType = "text/plain";
}
property = new NodeProperty("getcontenttype", contentType,
true);