remm 01/03/05 18:27:44
Modified: catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
Log:
- Use GMT date for creation date.
- status isn't a property.
- Removed some old code.
Revision Changes Path
1.13 +57 -26
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebdavServlet.java 2001/02/01 00:27:10 1.12
+++ WebdavServlet.java 2001/03/06 02:27:44 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.12 2001/02/01 00:27:10 remm Exp $
- * $Revision: 1.12 $
- * $Date: 2001/02/01 00:27:10 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.13 2001/03/06 02:27:44 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/03/06 02:27:44 $
*
* ====================================================================
*
@@ -84,6 +84,7 @@
import java.util.Locale;
import java.util.Hashtable;
import java.util.Calendar;
+import java.util.TimeZone;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.security.MessageDigest;
@@ -124,7 +125,7 @@
* are handled by the DefaultServlet.
*
* @author Remy Maucherat
- * @version $Revision: 1.12 $ $Date: 2001/02/01 00:27:10 $
+ * @version $Revision: 1.13 $ $Date: 2001/03/06 02:27:44 $
*/
public class WebdavServlet
@@ -202,9 +203,14 @@
* Simple date format for the creation date ISO representation (partial).
*/
protected static final SimpleDateFormat creationDateFormat =
- new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+ new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ static {
+ creationDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
+ }
+
+
// ----------------------------------------------------- Instance Variables
@@ -591,12 +597,6 @@
generatedXML.sendData();
- /*
- Writer writer = resp.getWriter();
- writer.write(generatedXML.toString());
- writer.flush();
- */
-
}
@@ -1948,12 +1948,18 @@
+ "<lockscope><shared/></lockscope>"
+ "<locktype><write/></locktype>"
+ "</lockentry>";
- generatedXML.writeProperty(null, "supportedlock", supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.OPENING);
+ generatedXML.writeText(supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.CLOSING);
generateLockDiscovery(path, generatedXML);
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
break;
@@ -1986,7 +1992,9 @@
XMLWriter.NO_CONTENT);
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
break;
@@ -2076,8 +2084,11 @@
+ "<lockscope><shared/></lockscope>"
+ "<locktype><write/></locktype>"
+ "</lockentry>";
- generatedXML.writeProperty(null, "supportedlock",
- supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.OPENING);
+ generatedXML.writeText(supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.CLOSING);
} else if (property.equals("lockdiscovery")) {
if (!generateLockDiscovery(path, generatedXML))
propertiesNotFound.addElement(property);
@@ -2088,7 +2099,9 @@
}
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
Enumeration propertiesNotFoundList = propertiesNotFound.elements();
@@ -2109,7 +2122,9 @@
}
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
}
@@ -2204,13 +2219,18 @@
+ "<lockscope><shared/></lockscope>"
+ "<locktype><write/></locktype>"
+ "</lockentry>";
- generatedXML.writeProperty(null, "supportedlock",
- supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.OPENING);
+ generatedXML.writeText(supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.CLOSING);
generateLockDiscovery(path, generatedXML);
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
break;
@@ -2242,7 +2262,9 @@
XMLWriter.NO_CONTENT);
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
break;
@@ -2303,8 +2325,11 @@
+ "<lockscope><shared/></lockscope>"
+ "<locktype><write/></locktype>"
+ "</lockentry>";
- generatedXML.writeProperty(null, "supportedlock",
- supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.OPENING);
+ generatedXML.writeText(supportedLocks);
+ generatedXML.writeElement(null, "supportedlock",
+ XMLWriter.CLOSING);
} else if (property.equals("lockdiscovery")) {
if (!generateLockDiscovery(path, generatedXML))
propertiesNotFound.addElement(property);
@@ -2315,7 +2340,9 @@
}
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
Enumeration propertiesNotFoundList = propertiesNotFound.elements();
@@ -2336,7 +2363,9 @@
}
generatedXML.writeElement(null, "prop", XMLWriter.CLOSING);
- generatedXML.writeProperty(null, "status", status);
+ generatedXML.writeElement(null, "status", XMLWriter.OPENING);
+ generatedXML.writeText(status);
+ generatedXML.writeElement(null, "status", XMLWriter.CLOSING);
generatedXML.writeElement(null, "propstat", XMLWriter.CLOSING);
}
@@ -2404,6 +2433,7 @@
StringBuffer creationDateValue = new StringBuffer
(creationDateFormat.format
(new Date(creationDate)));
+ /*
int offset = Calendar.getInstance().getTimeZone().getRawOffset()
/ 3600000; // FIXME ?
if (offset < 0) {
@@ -2419,6 +2449,7 @@
} else {
creationDateValue.append("Z");
}
+ */
return creationDateValue.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
