Major CaldavConnection refactoring to support iCal and prepare shared calendars support

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@265 3d1905a2-6b24-0410-a738-b14d5a86fcbd

src/java/davmail/caldav/CaldavConnection.java

@@ -120,8 +120,10 @@ public class CaldavConnection extends AbstractConnection {
                                     sendErr(HttpStatus.SC_UNAUTHORIZED, e.getMessage());
                                 }
                             }
+                            if (session != null) {
                                 handleRequest(command, path, headers, content);
                             }
+                        }
                     } else {
                         sendErr(HttpStatus.SC_NOT_IMPLEMENTED, "Invalid URI");
                     }
@@ -161,65 +163,123 @@ public class CaldavConnection extends AbstractConnection {
 
     public void handleRequest(String command, String path, Map<String, String> headers, String body) throws IOException {
         int depth = getDepth(headers);
+        String[] paths = path.split("/");
+
         // full debug trace
         if (wireLogger.isDebugEnabled()) {
             wireLogger.debug("Caldav command: " + command + " " + path + " depth: " + depth + "\n" + body);
         }
 
+        CaldavRequest request = null;
+        if ("PROPFIND".equals(command) || "REPORT".equals(command)) {
+            request = new CaldavRequest(body);
+        }
         if ("OPTIONS".equals(command)) {
             sendOptions();
-        } else if ("PROPFIND".equals(command)
+            // redirect PROPFIND on / to current user principal
-                && ("/user/".equals(path) || "/user".equals(path))
+        } else if ("PROPFIND".equals(command) && (paths.length == 0 || paths.length == 1)) {
-                && body != null) {
+            sendRoot(request);
-            CaldavRequest request = new CaldavRequest(body);
+        } else if ("GET".equals(command) && (paths.length == 0 || paths.length == 1)) {
-            StringBuilder buffer = new StringBuilder();
+            sendGetRoot();
-            buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+            // return current user calendar
-            buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n");
+        } else if ("calendar".equals(paths[1])) {
-            buffer.append("    <D:response>\n");
+            StringBuilder message = new StringBuilder();
-            buffer.append("        <D:href>/user</D:href>\n");
+            message.append("/calendar no longer supported, recreate calendar with /users/")
+                    .append(session.getEmail()).append("/calendar");
+            DavGatewayTray.error(message.toString());
+            sendErr(HttpStatus.SC_BAD_REQUEST, message.toString());
+        } else if ("user".equals(paths[1])) {
+            sendRedirect(headers, "/principals/users/" + session.getEmail() + "/");
+            // principal namespace
+        } else if ("PROPFIND".equals(command) && "principals".equals(paths[1]) && paths.length == 4 &&
+                "users".equals(paths[2])) {
+            sendPrincipal(request, paths[3]);
+            // send back principal on search
+        } else if ("REPORT".equals(command) && "principals".equals(paths[1]) && paths.length == 3 &&
+                "users".equals(paths[2])) {
+            sendPrincipal(request, session.getEmail());
+            // user root
+        } else if ("PROPFIND".equals(command) && "users".equals(paths[1]) && paths.length == 3) {
+            sendUserRoot(request, depth, paths[2]);
+        } else if ("PROPFIND".equals(command) && "users".equals(paths[1]) && paths.length == 4 && "inbox".equals(paths[3])) {
+            sendInbox(request, paths[2]);
+        } else if ("REPORT".equals(command) && "users".equals(paths[1]) && paths.length == 4 && "inbox".equals(paths[3])) {
+            reportInbox();
+        } else if ("PROPFIND".equals(command) && "users".equals(paths[1]) && paths.length == 4 && "outbox".equals(paths[3])) {
+            sendOutbox(request, paths[2]);
+        } else if ("POST".equals(command) && "users".equals(paths[1]) && paths.length == 4 && "outbox".equals(paths[3])) {
+            sendFreeBusy(paths[2]);
+        } else if ("PROPFIND".equals(command) && "users".equals(paths[1]) && paths.length == 4 && "calendar".equals(paths[3])) {
+            sendCalendar(request, depth, paths[2]);
+        } else if ("REPORT".equals(command) && "users".equals(paths[1]) && paths.length == 4 && "calendar".equals(paths[3])
+                // only current user for now
+                && session.getEmail().equals(paths[2])) {
+            reportCalendar(request);
+
+        } else if ("PUT".equals(command) && "users".equals(paths[1]) && paths.length == 5 && "calendar".equals(paths[3])
+                // only current user for now
+                && session.getEmail().equals(paths[2])) {
+            String etag = headers.get("if-match");
+            int status = session.createOrUpdateEvent(paths[4], body, etag);
+            sendHttpResponse(status, true);
+
+        } else if ("DELETE".equals(command) && "users".equals(paths[1]) && paths.length == 5 && "calendar".equals(paths[3])
+                // only current user for now
+                && session.getEmail().equals(paths[2])) {
+            int status = session.deleteEvent(paths[4]);
+            sendHttpResponse(status, true);
+        } else if ("GET".equals(command) && "users".equals(paths[1]) && paths.length == 5 && "calendar".equals(paths[3])
+                // only current user for now
+                && session.getEmail().equals(paths[2])) {
+            ExchangeSession.Event event = session.getEvent(paths[4]);
+            sendHttpResponse(HttpStatus.SC_OK, null, "text/calendar;charset=UTF-8", event.getICS(), true);
+
+        } else {
+            StringBuilder message = new StringBuilder();
+            message.append("Unsupported request: ").append(command).append(" ").append(path);
+            message.append(" Depth: ").append(depth).append("\n").append(body);
+            DavGatewayTray.error(message.toString());
+            sendErr(HttpStatus.SC_BAD_REQUEST, message.toString());
+        }
+    }
+
+    protected void appendEventsResponses(StringBuilder buffer, CaldavRequest request, List<ExchangeSession.Event> events) throws IOException {
+        int size = events.size();
+        int count = 0;
+        for (ExchangeSession.Event event : events) {
+            DavGatewayTray.debug("Retrieving event " + (++count) + "/" + size);
+            appendEventResponse(buffer, request, event);
+        }
+    }
+
+    protected void appendEventResponse(StringBuilder buffer, CaldavRequest request, ExchangeSession.Event event) throws IOException {
+        String eventPath = event.getPath().replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+        buffer.append("<D:response>\n");
+        buffer.append("        <D:href>/users/").append(session.getEmail()).append("/calendar").append(eventPath).append("</D:href>\n");
         buffer.append("        <D:propstat>\n");
         buffer.append("            <D:prop>\n");
-            if (request.hasProperty("calendar-home-set")) {
+        if (request.hasProperty("calendar-data")) {
-                buffer.append("                <C:calendar-home-set>\n");
+            String ics = event.getICS();
-                buffer.append("                    <D:href>/calendar</D:href>\n");
+            if (ics != null && ics.length() > 0) {
-                buffer.append("                </C:calendar-home-set>");
+                ics = ics.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+                buffer.append("                <C:calendar-data xmlns:C=\"urn:ietf:params:xml:ns:caldav\"\n");
+                buffer.append("                    C:content-type=\"text/calendar\" C:version=\"2.0\">");
+                buffer.append(ics);
+                buffer.append("</C:calendar-data>\n");
             }
-
-            if (request.hasProperty("calendar-user-address-set")) {
-                buffer.append("                <C:calendar-user-address-set>\n");
-                buffer.append("                    <D:href>mailto:").append(session.getEmail()).append("</D:href>\n");
-                buffer.append("                </C:calendar-user-address-set>");
         }
-
+        if (request.hasProperty("getetag")) {
-            if (request.hasProperty("schedule-inbox-URL")) {
+            buffer.append("                <D:getetag>").append(event.getEtag()).append("</D:getetag>\n");
-                buffer.append("                <C:schedule-inbox-URL>\n");
-                buffer.append("                    <D:href>/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>/outbox</D:href>\n");
-                buffer.append("                </C:schedule-outbox-URL>");
-            }
-
         buffer.append("            </D:prop>\n");
         buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
         buffer.append("        </D:propstat>\n");
         buffer.append("    </D:response>\n");
-            buffer.append("</D:multistatus>\n");
+    }
-            sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
 
-        } else if ("PROPFIND".equals(command)
+    public void appendCalendar(StringBuilder buffer, String principal, CaldavRequest request) throws IOException {
-                && ("/calendar/".equals(path) || "/calendar".equals(path))
-                && body != null) {
-            CaldavRequest request = new CaldavRequest(body);
-
-            StringBuilder buffer = new StringBuilder();
-            buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-            buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:CS=\"http://calendarserver.org/ns/\">\n");
         buffer.append("    <D:response>\n");
-            buffer.append("        <D:href>/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");
 
@@ -231,11 +291,11 @@ public class CaldavConnection extends AbstractConnection {
         }
         if (request.hasProperty("owner")) {
             buffer.append("                <D:owner>\n");
-                buffer.append("                    <D:href>/user</D:href>\n");
+            buffer.append("                    <D:href>/principals/users/").append(principal).append("</D:href>\n");
             buffer.append("                </D:owner>\n");
         }
         if (request.hasProperty("getctag")) {
-                buffer.append("                <CS:getctag>")
+            buffer.append("                <CS:getctag xmlns:CS=\"http://calendarserver.org/ns/\">")
                     .append(base64Encode(session.getCalendarEtag()))
                     .append("</CS:getctag>\n");
         }
@@ -243,26 +303,11 @@ public class CaldavConnection extends AbstractConnection {
         buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
         buffer.append("        </D:propstat>\n");
         buffer.append("    </D:response>\n");
-            // if depth is 1, also send events
-            if (depth > 0) {
-                appendEventsResponses(buffer, request, session.getAllEvents());
     }
-            buffer.append("</D:multistatus>\n");
 
-            HashMap<String, String> responseHeaders = new HashMap<String, String>();
+    public void appendInbox(StringBuilder buffer, String principal, CaldavRequest request) throws IOException {
-            sendHttpResponse(HttpStatus.SC_MULTI_STATUS, responseHeaders, "text/xml;charset=UTF-8", buffer.toString(), true);
-
-            // inbox is always empty
-        } else if ("PROPFIND".equals(command)
-                && ("/inbox/".equals(path) || "/inbox".equals(path))
-                && body != null) {
-            CaldavRequest request = new CaldavRequest(body);
-
-            StringBuilder buffer = new StringBuilder();
-            buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-            buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:CS=\"http://calendarserver.org/ns/\">\n");
         buffer.append("    <D:response>\n");
-            buffer.append("        <D:href>/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");
 
@@ -273,28 +318,114 @@ public class CaldavConnection extends AbstractConnection {
             buffer.append("                </D:resourcetype>\n");
         }
         if (request.hasProperty("getctag")) {
-                buffer.append("                <CS:getctag>0</CS:getctag>\n");
+            buffer.append("                <CS:getctag xmlns:CS=\"http://calendarserver.org/ns/\">0</CS:getctag>\n");
         }
+
         buffer.append("            </D:prop>\n");
         buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
         buffer.append("        </D:propstat>\n");
         buffer.append("    </D:response>\n");
+    }
+
+    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:propstat>\n");
+        buffer.append("            <D:prop>\n");
+
+        if (request.hasProperty("resourcetype")) {
+            buffer.append("                <D:resourcetype>\n");
+            buffer.append("                    <D:collection/>\n");
+            buffer.append("                    <C:schedule-outbox xmlns:C=\"urn:ietf:params:xml:ns:caldav\"/>\n");
+            buffer.append("                </D:resourcetype>\n");
+        }
+        if (request.hasProperty("getctag")) {
+            buffer.append("                <CS:getctag xmlns:CS=\"http://calendarserver.org/ns/\">0</CS:getctag>\n");
+        }
+
+        buffer.append("            </D:prop>\n");
+        buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
+        buffer.append("        </D:propstat>\n");
+        buffer.append("    </D:response>\n");
+    }
+
+    public void sendErr(int status, Exception e) throws IOException {
+        String message = e.getMessage();
+        if (message == null) {
+            message = e.toString();
+        }
+        sendErr(status, message);
+    }
+
+    public void sendGetRoot() throws IOException {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append("Connected to DavMail<br/>");
+        buffer.append("UserName :").append(userName).append("<br/>");
+        buffer.append("Email :").append(session.getEmail()).append("<br/>");
+        sendHttpResponse(HttpStatus.SC_OK, null, "text/html;charset=UTF-8", buffer.toString(), true);
+    }
+
+    public void sendInbox(CaldavRequest request, String principal) throws IOException {
+        StringBuilder buffer = new StringBuilder();
+        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");
+        appendInbox(buffer, principal, request);
         buffer.append("</D:multistatus>\n");
+        sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
 
-            HashMap<String, String> responseHeaders = new HashMap<String, String>();
+    public void reportInbox() throws IOException {
-            sendHttpResponse(HttpStatus.SC_MULTI_STATUS, responseHeaders, "text/xml;charset=UTF-8", buffer.toString(), true);
+        // inbox is always empty
-        } else if ("REPORT".equals(command)
+        StringBuilder buffer = new StringBuilder();
-                && ("/calendar/".equals(path) || "/calendar".equals(path))
+        buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                && body != null) {
+                "<D:multistatus xmlns:D=\"DAV:\">\n");
-            CaldavRequest request = new CaldavRequest(body);
+        buffer.append("</D:multistatus>");
+        sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
 
+    public void sendOutbox(CaldavRequest request, String principal) throws IOException {
+        StringBuilder buffer = new StringBuilder();
+        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");
+        appendOutbox(buffer, principal, request);
+        buffer.append("</D:multistatus>\n");
+        sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
+
+    public void sendCalendar(CaldavRequest request, int depth, String principal) throws IOException {
+        StringBuilder buffer = new StringBuilder();
+        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");
+        appendCalendar(buffer, principal, request);
+        if (depth == 1) {
+            appendEventsResponses(buffer, request, session.getAllEvents());
+        }
+        buffer.append("</D:multistatus>\n");
+        sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
+
+    protected String getEventFileNameFromPath(String path) {
+        int index = path.indexOf("/calendar/");
+        if (index < 0) {
+            return null;
+        } else {
+            return path.substring(index + "/calendar/".length());
+        }
+    }
+
+    public void reportCalendar(CaldavRequest request) throws IOException {
         List<ExchangeSession.Event> events;
         List<String> notFound = new ArrayList<String>();
         if (request.isMultiGet()) {
             events = new ArrayList<ExchangeSession.Event>();
             for (String href : request.getHrefs()) {
                 try {
-                        events.add(session.getEvent(href.substring("/calendar/".length())));
+                    String eventName = getEventFileNameFromPath(href);
+                    if (eventName == null) {
+                        notFound.add(href);
+                    } else {
+                        events.add(session.getEvent(eventName));
+                    }
                 } catch (HttpException e) {
                     notFound.add(href);
                 }
@@ -320,34 +451,99 @@ public class CaldavConnection extends AbstractConnection {
         buffer.append("</D:multistatus>");
 
         sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
 
-        } else if ("REPORT".equals(command)
+    public void sendUserRoot(CaldavRequest request, int depth, String principal) throws IOException {
-                && ("/inbox/".equals(path) || "/inbox".equals(path))) {
-            // inbox is always empty
         StringBuilder buffer = new StringBuilder();
-            buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+        buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-                    "<D:multistatus xmlns:D=\"DAV:\">\n");
+        buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n");
-            buffer.append("</D:multistatus>");
+        buffer.append("    <D:response>\n");
+        buffer.append("        <D:href>/users/").append(principal).append("</D:href>\n");
+        buffer.append("        <D:propstat>\n");
+        buffer.append("            <D:prop>\n");
 
+        if (request.hasProperty("resourcetype")) {
+            buffer.append("                <D:resourcetype>\n");
+            buffer.append("                    <D:collection/>\n");
+            buffer.append("                </D:resourcetype>\n");
+        }
+
+        buffer.append("            </D:prop>\n");
+        buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
+        buffer.append("        </D:propstat>\n");
+        buffer.append("      </D:response>\n");
+        if (depth == 1) {
+            appendInbox(buffer, principal, request);
+            appendOutbox(buffer, principal, request);
+            appendCalendar(buffer, principal, request);
+        }
+        buffer.append("</D:multistatus>\n");
         sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
 
-        } else if ("PUT".equals(command) && path.startsWith("/calendar/")) {
+    public void sendRoot(CaldavRequest request) throws IOException {
-            String etag = headers.get("if-match");
-            int status = session.createOrUpdateEvent(path.substring("/calendar/".length()), body, etag);
-            sendHttpResponse(status, true);
-
-        } else if ("GET".equals(command) && path.startsWith("/calendar/")) {
-            ExchangeSession.Event event = session.getEvent(path.substring("/calendar/".length()));
-            sendHttpResponse(HttpStatus.SC_OK, null, "text/calendar;charset=UTF-8", event.getICS(), true);
-
-        } else if ("GET".equals(command) && path.equals("/")) {
         StringBuilder buffer = new StringBuilder();
-            buffer.append("Connected to DavMail<br/>");
+        buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-            buffer.append("UserName :").append(userName).append("<br/>");
+        buffer.append("<D:multistatus xmlns:D=\"DAV:\" xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n");
-            buffer.append("Email :").append(session.getEmail()).append("<br/>");
+        buffer.append("    <D:response>\n");
-            sendHttpResponse(HttpStatus.SC_OK, null, "text/html;charset=UTF-8", buffer.toString(), true);
+        buffer.append("        <D:href>/</D:href>\n");
+        buffer.append("        <D:propstat>\n");
+        buffer.append("            <D:prop>\n");
+        if (request.hasProperty("principal-collection-set")) {
+            buffer.append("                <D:principal-collection-set>\n");
+            buffer.append("                    <D:href>/principals/users/</D:href>\n");
+            buffer.append("                </D:principal-collection-set>");
+        }
 
-        } else if ("POST".equals(command) && path.startsWith("/outbox")) {
+        buffer.append("            </D:prop>\n");
+        buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
+        buffer.append("        </D:propstat>\n");
+        buffer.append("      </D:response>\n");
+        buffer.append("</D:multistatus>\n");
+        sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
+
+    public void sendPrincipal(CaldavRequest request, String principal) throws IOException {
+        StringBuilder buffer = new StringBuilder();
+        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:propstat>\n");
+        buffer.append("            <D:prop>\n");
+        if (request.hasProperty("calendar-home-set")) {
+            buffer.append("                <C:calendar-home-set>\n");
+            buffer.append("                    <D:href>/users/").append(principal).append("</D:href>\n");
+            buffer.append("                </C:calendar-home-set>");
+        }
+
+        if (request.hasProperty("calendar-user-address-set")) {
+            buffer.append("                <C:calendar-user-address-set>\n");
+            buffer.append("                    <D:href>mailto:").append(principal).append("</D:href>\n");
+            buffer.append("                </C:calendar-user-address-set>");
+        }
+
+        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("                </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("                </C:schedule-outbox-URL>");
+        }
+
+        buffer.append("            </D:prop>\n");
+        buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
+        buffer.append("        </D:propstat>\n");
+        buffer.append("      </D:response>\n");
+        buffer.append("</D:multistatus>\n");
+        sendHttpResponse(HttpStatus.SC_MULTI_STATUS, null, "text/xml;charset=UTF-8", buffer.toString(), true);
+    }
+
+    public void sendFreeBusy(String body) throws IOException {
         Map<String, String> valueMap = new HashMap<String, String>();
         Map<String, String> keyMap = new HashMap<String, String>();
         BufferedReader reader = new BufferedReader(new StringReader(body));
@@ -405,56 +601,18 @@ public class CaldavConnection extends AbstractConnection {
             sendHttpResponse(HttpStatus.SC_NOT_FOUND, null, "text/plain", "Unknown recipient: " + valueMap.get("ATTENDEE"), true);
         }
 
-        } else if ("DELETE".equals(command) && path.startsWith("/calendar/")) {
-            int status = session.deleteEvent(path.substring("/calendar/".length()));
-            sendHttpResponse(status, true);
-        } else {
-            DavGatewayTray.error("Unsupported command: " + command + " " + path + " Depth: " + depth + "\n" + body);
-            sendErr(HttpStatus.SC_BAD_REQUEST, "Unsupported command: " + command);
     }
 
-    }
 
-    protected void appendEventsResponses(StringBuilder buffer, CaldavRequest request, List<ExchangeSession.Event> events) throws IOException {
+    public void sendRedirect(Map<String, String> headers, String path) throws IOException {
-        int size = events.size();
+        StringBuilder buffer = new StringBuilder();
-        int count = 0;
+        if (headers.get("host") != null) {
-        for (ExchangeSession.Event event : events) {
+            buffer.append("http://").append(headers.get("host"));
-            DavGatewayTray.debug("Retrieving event " + (++count) + "/" + size);
-            appendEventResponse(buffer, request, event);
         }
-    }
+        buffer.append(path);
-
+        Map<String, String> responseHeaders = new HashMap<String, String>();
-    protected void appendEventResponse(StringBuilder buffer, CaldavRequest request, ExchangeSession.Event event) throws IOException {
+        responseHeaders.put("Location", buffer.toString());
-        String eventPath = event.getPath().replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+        sendHttpResponse(HttpStatus.SC_MOVED_PERMANENTLY, responseHeaders, null, null, true);
-        buffer.append("<D:response>\n");
-        buffer.append("        <D:href>/calendar").append(eventPath).append("</D:href>\n");
-        buffer.append("        <D:propstat>\n");
-        buffer.append("            <D:prop>\n");
-        if (request.hasProperty("calendar-data")) {
-            String ics = event.getICS();
-            if (ics != null && ics.length() > 0) {
-                ics = ics.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
-                buffer.append("                <C:calendar-data xmlns:C=\"urn:ietf:params:xml:ns:caldav\"\n");
-                buffer.append("                    C:content-type=\"text/calendar\" C:version=\"2.0\">");
-                buffer.append(ics);
-                buffer.append("</C:calendar-data>\n");
-            }
-        }
-        if (request.hasProperty("getetag")) {
-            buffer.append("                <D:getetag>").append(event.getEtag()).append("</D:getetag>\n");
-        }
-        buffer.append("            </D:prop>\n");
-        buffer.append("            <D:status>HTTP/1.1 200 OK</D:status>\n");
-        buffer.append("        </D:propstat>\n");
-        buffer.append("    </D:response>\n");
-    }
-
-    public void sendErr(int status, Exception e) throws IOException {
-        String message = e.getMessage();
-        if (message == null) {
-            message = e.toString();
-        }
-        sendErr(status, message);
     }
 
     public void sendErr(int status, String message) throws IOException {