remm 01/01/31 16:27:11
Modified: catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
Log:
- Also rewrite display names in PROPFIND responses.
Revision Changes Path
1.12 +8 -9
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebdavServlet.java 2001/01/25 05:45:40 1.11
+++ WebdavServlet.java 2001/02/01 00:27:10 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.11 2001/01/25 05:45:40 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/01/25 05:45:40 $
+ * $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 $
*
* ====================================================================
*
@@ -124,7 +124,7 @@
* are handled by the DefaultServlet.
*
* @author Remy Maucherat
- * @version $Revision: 1.11 $ $Date: 2001/01/25 05:45:40 $
+ * @version $Revision: 1.12 $ $Date: 2001/02/01 00:27:10 $
*/
public class WebdavServlet
@@ -1914,7 +1914,7 @@
getISOCreationDate(resourceInfo.creationDate));
generatedXML.writeProperty
(null, "displayname",
- resourceInfo.path.replace('/', '_').replace('&', '_'));
+ rewriteUrl(resourceInfo.path.replace('/', '_')));
generatedXML.writeProperty(null, "getcontentlanguage",
Locale.getDefault().toString());
if (!resourceInfo.collection) {
@@ -2013,8 +2013,7 @@
} else if (property.equals("displayname")) {
generatedXML.writeProperty
(null, "displayname",
- resourceInfo.path.replace('/', '_')
- .replace('&', '_'));
+ rewriteUrl(resourceInfo.path.replace('/', '_')));
} else if (property.equals("getcontentlanguage")) {
if (resourceInfo.collection) {
propertiesNotFound.addElement(property);
@@ -2181,7 +2180,7 @@
getISOCreationDate(lock.creationDate.getTime()));
generatedXML.writeProperty
(null, "displayname",
- path.replace('/', '_').replace('&', '_'));
+ rewriteUrl(path.replace('/', '_')));
generatedXML.writeProperty(null, "getcontentlanguage",
Locale.getDefault().toString());
generatedXML.writeProperty(null, "getlastmodified",
@@ -2270,7 +2269,7 @@
} else if (property.equals("displayname")) {
generatedXML.writeProperty
(null, "displayname",
- path.replace('/', '_').replace('&', '_'));
+ rewriteUrl(path.replace('/', '_')));
} else if (property.equals("getcontentlanguage")) {
generatedXML.writeProperty
(null, "getcontentlanguage",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
