From 856ec615f43aba6ec9bb46c84f9300038658bfad Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 27 Oct 2010 14:20:09 +0000 Subject: [PATCH] Monotone-Parent: 08ff4ed5c2f1ac739d34cf7fe2a75f3b3ac2d7dd Monotone-Revision: 05e312bc2aff1f30bb0ce98944cb16c89ee15b86 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-27T14:20:09 Monotone-Branch: ca.inverse.sogo --- SoObjects/Contacts/SOGoContactFolders.m | 2 +- SoObjects/SOGo/SOGoUserFolder.m | 2 +- Tests/Integration/test-contact-categories.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m index c6e700714..146594c75 100644 --- a/SoObjects/Contacts/SOGoContactFolders.m +++ b/SoObjects/Contacts/SOGoContactFolders.m @@ -46,7 +46,7 @@ #import "SOGoContactSourceFolder.h" #import "SOGoContactFolders.h" -#define XMLNS_INVERSEDAV @"urn:ietf:params:xml:ns:inverse-dav" +#define XMLNS_INVERSEDAV @"urn:inverse:params:xml:ns:inverse-dav" @implementation SOGoContactFolders + (NSString *) gcsFolderType diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index 072ebb7b0..b98b2dc70 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -374,7 +374,7 @@ r = [context response]; [r prepareDAVResponse]; [r appendContentString: @""]; + @" xmlns=\"urn:inverse:params:xml:ns:inverse-dav\">"]; document = [[context request] contentAsDOMDocument]; filter = [self _parseCollectionFilters: document]; diff --git a/Tests/Integration/test-contact-categories.py b/Tests/Integration/test-contact-categories.py index 6e3896d05..df5734243 100755 --- a/Tests/Integration/test-contact-categories.py +++ b/Tests/Integration/test-contact-categories.py @@ -11,9 +11,9 @@ class HTTPContactCategoriesTest(unittest.TestCase): resource = '/SOGo/dav/%s/Contacts/' % user if categories is None: categories = [] - elements = [ { "{urn:ietf:params:xml:ns:inverse-dav}category": x } + elements = [ { "{urn:inverse:params:xml:ns:inverse-dav}category": x } for x in categories ] - props = { "{urn:ietf:params:xml:ns:inverse-dav}contacts-categories": elements } + props = { "{urn:inverse:params:xml:ns:inverse-dav}contacts-categories": elements } proppatch = webdavlib.WebDAVPROPPATCH(resource, props) client = webdavlib.WebDAVClient(hostname, port, username, password) client.execute(proppatch) @@ -24,7 +24,7 @@ class HTTPContactCategoriesTest(unittest.TestCase): def _getCategories(self, user): resource = '/SOGo/dav/%s/Contacts/' % user - props = [ "{urn:ietf:params:xml:ns:inverse-dav}contacts-categories" ] + props = [ "{urn:inverse:params:xml:ns:inverse-dav}contacts-categories" ] propfind = webdavlib.WebDAVPROPFIND(resource, props, "0") client = webdavlib.WebDAVClient(hostname, port, username, password) client.execute(propfind) @@ -33,9 +33,9 @@ class HTTPContactCategoriesTest(unittest.TestCase): % (propfind.response["status"], user)) categories = [] - prop_nodes = propfind.response["document"].findall("{DAV:}response/{DAV:}propstat/{DAV:}prop/{urn:ietf:params:xml:ns:inverse-dav}contacts-categories") + prop_nodes = propfind.response["document"].findall("{DAV:}response/{DAV:}propstat/{DAV:}prop/{urn:inverse:params:xml:ns:inverse-dav}contacts-categories") for prop_node in prop_nodes: - cat_nodes = prop_node.findall("{urn:ietf:params:xml:ns:inverse-dav}category") + cat_nodes = prop_node.findall("{urn:inverse:params:xml:ns:inverse-dav}category") if cat_nodes is not None: for cat_node in cat_nodes: categories.append(cat_node.text)