[CalendarServer-changes] [1067] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jan 18 17:24:24 PST 2007
Revision: 1067
http://trac.macosforge.org/projects/calendarserver/changeset/1067
Author: wsanchez at apple.com
Date: 2007-01-18 17:24:24 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
Add some XML GUID action.
Modified Paths:
--------------
CalendarServer/trunk/conf/accounts.dtd
CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
CalendarServer/trunk/twistedcaldav/directory/xmlfile.py
Modified: CalendarServer/trunk/conf/accounts.dtd
===================================================================
--- CalendarServer/trunk/conf/accounts.dtd 2007-01-19 01:12:34 UTC (rev 1066)
+++ CalendarServer/trunk/conf/accounts.dtd 2007-01-19 01:24:24 UTC (rev 1067)
@@ -19,22 +19,23 @@
<!ELEMENT accounts (user*, group*, resource*) >
<!ATTLIST accounts realm CDATA "">
- <!ELEMENT user (uid, password, name, cuaddr*, calendar*, quota?, autorespond?)>
+ <!ELEMENT user (uid, guid, password, name, cuaddr*, calendar*, quota?, autorespond?)>
<!ATTLIST user repeat CDATA "1">
- <!ELEMENT group (uid, password, name, members, cuaddr*, calendar*, quota?)>
+ <!ELEMENT group (uid, guid, password, name, members, cuaddr*, calendar*, quota?)>
<!ATTLIST group repeat CDATA "1">
- <!ELEMENT resource (uid, password, name, cuaddr*, calendar*, quota?, autorespond?)>
+ <!ELEMENT resource (uid, guid, password, name, cuaddr*, calendar*, quota?, autorespond?)>
<!ATTLIST resource repeat CDATA "1">
- <!ELEMENT location (uid, password, name, cuaddr*, calendar*, quota?, autorespond?)>
+ <!ELEMENT location (uid, guid, password, name, cuaddr*, calendar*, quota?, autorespond?)>
<!ATTLIST location repeat CDATA "1">
<!ELEMENT member (#PCDATA)>
<!ATTLIST member type (users|groups|locations|resources) "users">
- <!ELEMENT uid (#PCDATA)>
+ <!ELEMENT uid (#PCDATA)>
+ <!ELEMENT guid (#PCDATA)>
<!ELEMENT password (#PCDATA)>
<!ELEMENT name (#PCDATA)>
<!ELEMENT cuaddr (#PCDATA)>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2007-01-19 01:12:34 UTC (rev 1066)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2007-01-19 01:24:24 UTC (rev 1067)
@@ -21,29 +21,34 @@
<accounts realm="Test">
<user>
<uid>admin</uid>
+ <guid>D11F03A0-97EA-48AF-9A6C-FAC7F3975766</guid>
<password>nimda</password>
<name>Administrators</name>
</user>
<user>
<uid>wsanchez</uid>
+ <guid>6423F94A-6B76-4A3A-815B-D52CFD77935D</guid>
<password>zehcnasw</password>
<name>Wilfredo Sanchez</name>
<cuaddr>mailto:wsanchez at example.com</cuaddr>
</user>
<user>
<uid>cdaboo</uid>
+ <guid>5A985493-EE2C-4665-94CF-4DFEA3A89500</guid>
<password>oobadc</password>
<name>Cyrus Daboo</name>
<cuaddr>mailto:cdaboo at example.com</cuaddr>
</user>
<user>
<uid>lecroy</uid>
+ <guid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</guid>
<password>yorcel</password>
<name>Chris Lecroy</name>
<cuaddr>mailto:lecroy at example.com</cuaddr>
</user>
<user>
<uid>dreid</uid>
+ <guid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</guid>
<password>dierd</password>
<name>David Reid</name>
<cuaddr>mailto:dreid at example.com</cuaddr>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py 2007-01-19 01:12:34 UTC (rev 1066)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py 2007-01-19 01:24:24 UTC (rev 1067)
@@ -37,25 +37,25 @@
))
users = {
- "admin" : { "password": "nimda", "guid": None, "addresses": () },
- "wsanchez": { "password": "zehcnasw", "guid": None, "addresses": ("mailto:wsanchez at example.com",) },
- "cdaboo" : { "password": "oobadc", "guid": None, "addresses": ("mailto:cdaboo at example.com",) },
- "lecroy" : { "password": "yorcel", "guid": None, "addresses": ("mailto:lecroy at example.com",) },
- "dreid" : { "password": "dierd", "guid": None, "addresses": ("mailto:dreid at example.com",) },
- "user01" : { "password": "01user", "guid": None, "addresses": () },
- "user02" : { "password": "02user", "guid": None, "addresses": () },
+ "admin" : { "password": "nimda", "guid": "D11F03A0-97EA-48AF-9A6C-FAC7F3975766", "addresses": () },
+ "wsanchez": { "password": "zehcnasw", "guid": "6423F94A-6B76-4A3A-815B-D52CFD77935D", "addresses": ("mailto:wsanchez at example.com",) },
+ "cdaboo" : { "password": "oobadc", "guid": "5A985493-EE2C-4665-94CF-4DFEA3A89500", "addresses": ("mailto:cdaboo at example.com",) },
+ "lecroy" : { "password": "yorcel", "guid": "8B4288F6-CC82-491D-8EF9-642EF4F3E7D0", "addresses": ("mailto:lecroy at example.com",) },
+ "dreid" : { "password": "dierd", "guid": "5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1", "addresses": ("mailto:dreid at example.com",) },
+ "user01" : { "password": "01user", "guid": None , "addresses": () },
+ "user02" : { "password": "02user", "guid": None , "addresses": () },
}
groups = {
"admin" : { "password": "admin", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_groups, "managers"),) },
- "managers" : { "password": "managers", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users, "lecroy"),) },
- "grunts" : { "password": "grunts", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users, "wsanchez"),
- (DirectoryService.recordType_users, "cdaboo"),
- (DirectoryService.recordType_users, "dreid")) },
- "right_coast": { "password": "right_coast", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users, "cdaboo"),) },
- "left_coast" : { "password": "left_coast", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users, "wsanchez"),
- (DirectoryService.recordType_users, "dreid"),
- (DirectoryService.recordType_users, "lecroy")) },
+ "managers" : { "password": "managers", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users , "lecroy"),) },
+ "grunts" : { "password": "grunts", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users , "wsanchez"),
+ (DirectoryService.recordType_users , "cdaboo"),
+ (DirectoryService.recordType_users , "dreid")) },
+ "right_coast": { "password": "right_coast", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users , "cdaboo"),) },
+ "left_coast" : { "password": "left_coast", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_users , "wsanchez"),
+ (DirectoryService.recordType_users , "dreid"),
+ (DirectoryService.recordType_users , "lecroy")) },
"both_coasts": { "password": "both_coasts", "guid": None, "addresses": (), "members": ((DirectoryService.recordType_groups, "right_coast"),
(DirectoryService.recordType_groups, "left_coast")) },
}
Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2007-01-19 01:12:34 UTC (rev 1066)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2007-01-19 01:24:24 UTC (rev 1067)
@@ -39,6 +39,7 @@
ELEMENT_RESOURCE = "resource"
ELEMENT_SHORTNAME = "uid"
+ELEMENT_GUID = "guid"
ELEMENT_PASSWORD = "password"
ELEMENT_NAME = "name"
ELEMENT_MEMBERS = "members"
@@ -137,6 +138,7 @@
"""
self.recordType = recordType
self.shortName = None
+ self.guid = None
self.password = None
self.name = None
self.members = set()
@@ -184,6 +186,9 @@
elif child_name == ELEMENT_SHORTNAME:
if child.firstChild is not None:
self.shortName = child.firstChild.data.encode("utf-8")
+ elif child_name == ELEMENT_GUID:
+ if child.firstChild is not None:
+ self.guid = child.firstChild.data.encode("utf-8")
elif child_name == ELEMENT_PASSWORD:
if child.firstChild is not None:
self.password = child.firstChild.data.encode("utf-8")
Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py 2007-01-19 01:12:34 UTC (rev 1066)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py 2007-01-19 01:24:24 UTC (rev 1067)
@@ -62,12 +62,12 @@
return recordTypes
def listRecords(self, recordType):
- for entryShortName, xmlprincipal in self._entriesForRecordType(recordType):
+ for entryShortName, xmlPrincipal in self._entriesForRecordType(recordType):
yield XMLDirectoryRecord(
service = self,
recordType = recordType,
shortName = entryShortName,
- xmlPrincipal = xmlprincipal,
+ xmlPrincipal = xmlPrincipal,
)
def recordWithShortName(self, recordType, shortName):
@@ -103,7 +103,7 @@
super(XMLDirectoryRecord, self).__init__(
service = service,
recordType = recordType,
- guid = None,
+ guid = xmlPrincipal.guid,
shortName = shortName,
fullName = xmlPrincipal.name,
calendarUserAddresses = xmlPrincipal.calendarUserAddresses
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070118/2699dbb8/attachment.html
More information about the calendarserver-changes
mailing list