From 4d80841b7b2ac4a48637dbe6b86403db97ab81e1 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 31 Dec 2008 13:30:31 +0000
Subject: [PATCH] Caldav : remove ending / from URLs, breaks iCal ?

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@271 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/caldav/CaldavConnection.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index b127a71a..3de11c44 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -285,7 +285,7 @@ public class CaldavConnection extends AbstractConnection {
 
     public void appendCalendar(StringBuilder buffer, String principal, CaldavRequest request) throws IOException {
         buffer.append("    <D:response>\n");
-        buffer.append("        <D:href>/users/").append(principal).append("/calendar/</D:href>\n");
+        buffer.append("        <D:href>/users/").append(principal).append("/calendar</D:href>\n");
         buffer.append("        <D:propstat>\n");
         buffer.append("            <D:prop>\n");
 
@@ -316,7 +316,7 @@ public class CaldavConnection extends AbstractConnection {
 
     public void appendInbox(StringBuilder buffer, String principal, CaldavRequest request) throws IOException {
         buffer.append("    <D:response>\n");
-        buffer.append("        <D:href>/users/").append(principal).append("/inbox/</D:href>\n");
+        buffer.append("        <D:href>/users/").append(principal).append("/inbox</D:href>\n");
         buffer.append("        <D:propstat>\n");
         buffer.append("            <D:prop>\n");
 
@@ -340,7 +340,7 @@ public class CaldavConnection extends AbstractConnection {
 
     public void appendOutbox(StringBuilder buffer, String principal, CaldavRequest request) throws IOException {
         buffer.append("    <D:response>\n");
-        buffer.append("        <D:href>/users/").append(principal).append("/outbox/</D:href>\n");
+        buffer.append("        <D:href>/users/").append(principal).append("/outbox</D:href>\n");
         buffer.append("        <D:propstat>\n");
         buffer.append("            <D:prop>\n");
 
@@ -463,7 +463,7 @@ public class CaldavConnection extends AbstractConnection {
         buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
         buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n");
         buffer.append("    <D:response>\n");
-        buffer.append("        <D:href>/users/").append(principal).append("/</D:href>\n");
+        buffer.append("        <D:href>/users/").append(principal).append("</D:href>\n");
         buffer.append("        <D:propstat>\n");
         buffer.append("            <D:prop>\n");
 
@@ -517,7 +517,7 @@ public class CaldavConnection extends AbstractConnection {
         buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
         buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n");
         buffer.append("    <D:response>\n");
-        buffer.append("        <D:href>/principals/users/").append(principal).append("/</D:href>\n");
+        buffer.append("        <D:href>/principals/users/").append(principal).append("</D:href>\n");
         buffer.append("        <D:propstat>\n");
         buffer.append("            <D:prop>\n");
         if (request.hasProperty("calendar-home-set")) {
@@ -534,13 +534,13 @@ public class CaldavConnection extends AbstractConnection {
 
         if (request.hasProperty("schedule-inbox-URL")) {
             buffer.append("                <C:schedule-inbox-URL>\n");
-            buffer.append("                    <D:href>/users/").append(principal).append("/inbox/</D:href>\n");
+            buffer.append("                    <D:href>/users/").append(principal).append("/inbox</D:href>\n");
             buffer.append("                </C:schedule-inbox-URL>");
         }
 
         if (request.hasProperty("schedule-outbox-URL")) {
             buffer.append("                <C:schedule-outbox-URL>\n");
-            buffer.append("                    <D:href>/users/").append(principal).append("/outbox/</D:href>\n");
+            buffer.append("                    <D:href>/users/").append(principal).append("/outbox</D:href>\n");
             buffer.append("                </C:schedule-outbox-URL>");
         }