January 2013 - calendarserver-changes

[10614] CalendarServer/trunk/twext/who
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10614 http://trac.calendarserver.org//changeset/10614 Author: wsanchez(a)apple.com Date: 2013-01-31 15:43:31 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Typo: recordFromQuery -> recordsFromQuery Add tests for base recordsFromQuery() Modified Paths: -------------- CalendarServer/trunk/twext/who/directory.py CalendarServer/trunk/twext/who/idirectory.py CalendarServer/trunk/twext/who/test/test_directory.py Modified: CalendarServer/trunk/twext/who/directory.py =================================================================== --- CalendarServer/trunk/twext/who/directory.py 2013-01-31 22:17:24 UTC (rev 10613) +++ CalendarServer/trunk/twext/who/directory.py 2013-01-31 23:43:31 UTC (rev 10614) @@ -60,8 +60,10 @@ return self.RecordTypeClass.iterconstants() - def recordFromQuery(self, expressions, operand=Operand.AND): - raise QueryNotSupportedError("") + def recordsFromQuery(self, expressions, operand=Operand.AND): + for expression in expressions: + raise QueryNotSupportedError("") + return () Modified: CalendarServer/trunk/twext/who/idirectory.py =================================================================== --- CalendarServer/trunk/twext/who/idirectory.py 2013-01-31 22:17:24 UTC (rev 10613) +++ CalendarServer/trunk/twext/who/idirectory.py 2013-01-31 23:43:31 UTC (rev 10614) @@ -165,7 +165,7 @@ C{("users", "groups", "resources")}. """ - def recordFromQuery(expressions, operand=Operand.AND): + def recordsFromQuery(expressions, operand=Operand.AND): """ @return: a deferred iterable of matching L{IDirectoryRecord}s. @raises: L{QueryNotSupportedError} is the query is not Modified: CalendarServer/trunk/twext/who/test/test_directory.py =================================================================== --- CalendarServer/trunk/twext/who/test/test_directory.py 2013-01-31 22:17:24 UTC (rev 10613) +++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-01-31 23:43:31 UTC (rev 10614) @@ -22,8 +22,9 @@ from twisted.trial import unittest +from twext.who.idirectory import QueryNotSupportedError +from twext.who.idirectory import RecordType, FieldName from twext.who.idirectory import IDirectoryService, IDirectoryRecord -from twext.who.idirectory import RecordType, FieldName from twext.who.directory import DirectoryService, DirectoryRecord @@ -57,10 +58,15 @@ set(service.RecordTypeClass.iterconstants()) ) - def test_recordFromQuery(self): - raise NotImplementedError() + def test_recordsFromQueryNone(self): + service = self._testService() + records = service.recordsFromQuery(()) + for record in records: + self.failTest("No records expected") - test_recordFromQuery.todo = "Not implemented." + def test_recordsFromQueryBogus(self): + service = self._testService() + self.assertRaises(QueryNotSupportedError, service.recordsFromQuery, (object(),))

1 0

[10613] CalendarServer/trunk/twext/who
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10613 http://trac.calendarserver.org//changeset/10613 Author: wsanchez(a)apple.com Date: 2013-01-31 14:17:24 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Add XML implementation. Added Paths: ----------- CalendarServer/trunk/twext/who/test/test_xml.py CalendarServer/trunk/twext/who/xml.py Added: CalendarServer/trunk/twext/who/test/test_xml.py =================================================================== --- CalendarServer/trunk/twext/who/test/test_xml.py (rev 0) +++ CalendarServer/trunk/twext/who/test/test_xml.py 2013-01-31 22:17:24 UTC (rev 10613) @@ -0,0 +1,73 @@ +## +# Copyright (c) 2013 Apple Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +## + +""" +XML directory service tests +""" + +from twisted.python.filepath import FilePath +from twext.who.xml import DirectoryService + +from twext.who.test import test_directory + + + +xmlRealmName = "Test Realm" + + + +class BaseTest(object): + def _testService(self): + if not hasattr(self, "_service"): + filePath = FilePath(self.mktemp()) + + filePath.setContent( + """<?xml version="1.0" encoding="utf-8"?> + +<directory realm="xyzzy"> + + <record type="user"> + <uid>wsanchez</uid> + <short-name>wsanchez</short-name> + <short-name>wilfredo_sanchez</short-name> + <full-name>Wilfredo Sanchez</full-name> + <password>zehcnasw</password> + <email>wsanchez(a)calendarserver.org</email> + <email>wsanchez(a)example.com</email> + </record> + + <record type="user"> + <uid>glyph</uid> + <short-name>glyph</short-name> + <full-name>Glyph Lefkowitz</full-name> + <password>hpylg</password> + <email>glyph(a)calendarserver.org</email> + </record> + +</directory> +""" + ) + + self._service = DirectoryService(filePath) + return self._service + + + +class DirectoryServiceTest(BaseTest, test_directory.DirectoryServiceTest): + def test_XYZZY(self): + service = self._testService() + + service.loadRecords() Added: CalendarServer/trunk/twext/who/xml.py =================================================================== --- CalendarServer/trunk/twext/who/xml.py (rev 0) +++ CalendarServer/trunk/twext/who/xml.py 2013-01-31 22:17:24 UTC (rev 10613) @@ -0,0 +1,239 @@ +## +# Copyright (c) 2006-2013 Apple Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +## + +from __future__ import absolute_import + +""" +XML directory service implementation. +""" + +__all__ = [ + "DirectoryService", + "DirectoryRecord", +] + +from xml.etree.ElementTree import parse as parseXML +from xml.etree.ElementTree import ParseError as XMLParseError + +from twisted.python.constants import Values, ValueConstant + +from twext.who.idirectory import RecordType, FieldName +from twext.who.idirectory import DirectoryServiceError +from twext.who.directory import DirectoryService as BaseDirectoryService +from twext.who.directory import DirectoryRecord + + + +## +# XML Constants +## + +class Element(Values): + directory = ValueConstant("directory") + record = ValueConstant("record") + uid = ValueConstant("uid") + guid = ValueConstant("guid") + shortName = ValueConstant("short-name") + fullName = ValueConstant("full-name") + emailAddress = ValueConstant("email") + password = ValueConstant("password") + member = ValueConstant("member-uid") + + uid.fieldName = FieldName.uid + guid.fieldName = FieldName.guid + shortName.fieldName = FieldName.shortNames + fullName.fieldName = FieldName.fullNames + emailAddress.fieldName = FieldName.emailAddresses + password.fieldName = FieldName.password + + + +class Attribute(Values): + realm = ValueConstant("realm") + recordType = ValueConstant("type") + + + +class Value(Values): + # Booleans + true = ValueConstant("true") + false = ValueConstant("false") + + # Record types + user = ValueConstant("user") + group = ValueConstant("group") + + user.recordType = RecordType.user + group.recordType = RecordType.group + + + +## +# Directory Service +## + +class DirectoryService(BaseDirectoryService): + """ + XML directory service. + """ + + ElementClass = Element + AttributeClass = Attribute + ValueClass = Value + + indexedFields = ( + FieldName.recordType, + FieldName.uid, + FieldName.guid, + FieldName.shortNames, + FieldName.emailAddresses, + ) + + + def __init__(self, filePath, refreshInterval=4): + BaseDirectoryService.__init__(self, realmName=None) + + self.filePath = filePath + self.refreshInterval = refreshInterval + + + def __repr__(self): + return "<%s %s>" % ( + self.__class__.__name__, + self._realmName, + ) + + + @property + def realmName(self): + if not hasattr(self, "_realmName"): + self.loadRecords() + return self._realmName + + @realmName.setter + def realmName(self, value): + if value is not None: + raise AssertionError("realmName may not be set directly") + + @property + def unknownRecordTypes(self): + if not hasattr(self, "_unknownRecordTypes"): + self.loadRecords() + return self._unknownRecordTypes + + @property + def unknownFieldNames(self): + if not hasattr(self, "_unknownFieldNames"): + self.loadRecords() + return self._unknownFieldNames + + @property + def index(self): + if not hasattr(self, "_index"): + self.loadRecords() + return self._index + + + def loadRecords(self): + # + # Open and parse the file + # + try: + fh = self.filePath.open() + + try: + etree = parseXML(fh) + except XMLParseError, e: + raise DirectoryServiceError(e.getMessage()) + finally: + fh.close() + + # + # Pull data from DOM + # + directoryNode = etree.getroot() + if directoryNode.tag != self.ElementClass.directory.value: + raise DirectoryServiceError("Incorrect root element: %s" % (directoryNode.tag,)) + + def getAttribute(node, name): + return node.get(name, "").encode("utf-8") + + realmName = getAttribute(directoryNode, self.AttributeClass.realm.value) + + if not realmName: + raise DirectoryServiceError("No realm name.") + + unknownRecordTypes = set() + unknownFieldNames = set() + + records = set() + + for recordNode in directoryNode.getchildren(): + recordTypeAttribute = getAttribute(recordNode, self.AttributeClass.recordType.value) + if not recordTypeAttribute: + recordTypeAttribute = "user" + + try: + recordType = self.ValueClass.lookupByValue(recordTypeAttribute).recordType + except (ValueError, AttributeError): + unknownRecordTypes.add(recordTypeAttribute) + break + + fields = {} + fields[FieldName.recordType] = recordType + + for fieldNode in recordNode.getchildren(): + try: + fieldName = self.ElementClass.lookupByValue(fieldNode.tag).fieldName + except (ValueError, AttributeError): + unknownFieldNames.add(fieldNode.tag) + + value = fieldNode.text.encode("utf-8") + + if self.FieldNameClass.isMultiValue(fieldName): + values = fields.setdefault(fieldName, []) + values.append(value) + else: + fields[fieldName] = value + + records.add(DirectoryRecord(self, fields)) + + # + # Store results + # + + index = {} + + for fieldName in self.indexedFields: + index[fieldName] = {} + + for record in records: + for fieldName in self.indexedFields: + values = record.fields.get(fieldName, None) + + if values is not None: + if not self.FieldNameClass.isMultiValue(fieldName): + values = (values,) + + for value in values: + index[fieldName].setdefault(value, set()).add(record) + + self._realmName = realmName + + self._unknownRecordTypes = unknownRecordTypes + self._unknownFieldNames = unknownFieldNames + + self._index = index

1 0

[10612] CalendarServer/trunk/twext/who/idirectory.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10612 http://trac.calendarserver.org//changeset/10612 Author: wsanchez(a)apple.com Date: 2013-01-31 14:16:16 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Add _DescriptionMixIn. Export DirectoryAvailabilityError. Modified Paths: -------------- CalendarServer/trunk/twext/who/idirectory.py Modified: CalendarServer/trunk/twext/who/idirectory.py =================================================================== --- CalendarServer/trunk/twext/who/idirectory.py 2013-01-31 22:15:23 UTC (rev 10611) +++ CalendarServer/trunk/twext/who/idirectory.py 2013-01-31 22:16:16 UTC (rev 10612) @@ -20,6 +20,7 @@ __all__ = [ "DirectoryServiceError", + "DirectoryAvailabilityError", "QueryNotSupportedError", "RecordType", "FieldName", @@ -63,11 +64,18 @@ # Data Types ## -class RecordType(Names): +class _DescriptionMixIn(object): + def __str__(self): + return getattr(self, "description", Names.__str__(self)) + +class RecordType(Names, _DescriptionMixIn): user = NamedConstant() group = NamedConstant() -class FieldName(Names): + user.description = "user" + group.description = "group" + +class FieldName(Names, _DescriptionMixIn): """ Constants for common field names. """ @@ -77,7 +85,16 @@ shortNames = NamedConstant() fullNames = NamedConstant() emailAddresses = NamedConstant() + password = NamedConstant() + uid.description = "UID" + guid.description = "GUID" + recordType.description = "record type" + shortNames.description = "short names" + fullNames.description = "full names" + emailAddresses.description = "email addresses" + password.description = "password" + shortNames.multiValue = True fullNames.multiValue = True emailAddresses.multiValue = True @@ -86,7 +103,7 @@ def isMultiValue(cls, name): return getattr(name, "multiValue", False) -class MatchType(Names): +class MatchType(Names, _DescriptionMixIn): """ Query match types. """ @@ -94,16 +111,25 @@ startsWith = NamedConstant() contains = NamedConstant() -class Operand(Names): + equals.description = "equals" + startsWith.description = "starts with" + contains.description = "contains" + +class Operand(Names, _DescriptionMixIn): OR = NamedConstant() AND = NamedConstant() -class QueryFlags(Flags): + OR.description = "or" + AND.description = "and" + +class QueryFlags(Flags, _DescriptionMixIn): """ Query flags. """ caseInsensitive = FlagConstant() + caseInsensitive.description = "case insensitive" + class DirectoryQueryMatchExpression(object): """ Directory query.

1 0

[10611] CalendarServer/trunk/twext/who/directory.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10611 http://trac.calendarserver.org//changeset/10611 Author: wsanchez(a)apple.com Date: 2013-01-31 14:15:23 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Add __repr__ to DirectoryService. Modified Paths: -------------- CalendarServer/trunk/twext/who/directory.py Modified: CalendarServer/trunk/twext/who/directory.py =================================================================== --- CalendarServer/trunk/twext/who/directory.py 2013-01-31 22:08:05 UTC (rev 10610) +++ CalendarServer/trunk/twext/who/directory.py 2013-01-31 22:15:23 UTC (rev 10611) @@ -44,12 +44,22 @@ RecordTypeClass = RecordType FieldNameClass = FieldName + def __init__(self, realmName): self.realmName = realmName + + def __repr__(self): + return "<%s %s>" % ( + self.__class__.__name__, + self.realmName, + ) + + def recordTypes(self): return self.RecordTypeClass.iterconstants() + def recordFromQuery(self, expressions, operand=Operand.AND): raise QueryNotSupportedError("") @@ -64,6 +74,7 @@ FieldName.shortNames, ) + def __init__(self, service, fields): for fieldName in self.requiredFields: if fieldName not in fields or not fields[fieldName]: @@ -86,6 +97,7 @@ self.service = service self.fields = fields + def __repr__(self): recordType = getattr(self.recordType, "description", self.recordType) @@ -95,6 +107,7 @@ self.shortNames[0], ) + def __eq__(self, other): if isinstance(self, other.__class__): return ( @@ -103,6 +116,7 @@ ) return NotImplemented + def __getattr__(self, name): try: fieldName = self.service.FieldNameClass.lookupByName(name)

1 0

[10610] CalendarServer/trunk/twext/who/directory.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10610 http://trac.calendarserver.org//changeset/10610 Author: wsanchez(a)apple.com Date: 2013-01-31 14:08:05 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Add __repr__ to DirectoryRecord. Modified Paths: -------------- CalendarServer/trunk/twext/who/directory.py Modified: CalendarServer/trunk/twext/who/directory.py =================================================================== --- CalendarServer/trunk/twext/who/directory.py 2013-01-31 21:00:43 UTC (rev 10609) +++ CalendarServer/trunk/twext/who/directory.py 2013-01-31 22:08:05 UTC (rev 10610) @@ -86,6 +86,15 @@ self.service = service self.fields = fields + def __repr__(self): + recordType = getattr(self.recordType, "description", self.recordType) + + return "<%s (%s)%s>" % ( + self.__class__.__name__, + recordType, + self.shortNames[0], + ) + def __eq__(self, other): if isinstance(self, other.__class__): return (

1 0

[10609] CalendarServer/trunk/calendarserver/tools/purge.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10609 http://trac.calendarserver.org//changeset/10609 Author: sagen(a)apple.com Date: 2013-01-31 13:00:43 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Purge tool should always delete inbox items Modified Paths: -------------- CalendarServer/trunk/calendarserver/tools/purge.py Modified: CalendarServer/trunk/calendarserver/tools/purge.py =================================================================== --- CalendarServer/trunk/calendarserver/tools/purge.py 2013-01-31 20:55:10 UTC (rev 10608) +++ CalendarServer/trunk/calendarserver/tools/purge.py 2013-01-31 21:00:43 UTC (rev 10609) @@ -851,7 +851,8 @@ for childName in childNames: childResource = (yield collection.getChild(childName)) - if self.completely: + # Allways delete inbox items + if self.completely or collName == "inbox": action = self.CANCELEVENT_SHOULD_DELETE else: event = (yield childResource.iCalendar())

1 0

[10608] CalendarServer/branches/release/CalendarServer-4.3-dev/ calendarserver/tools/purge.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10608 http://trac.calendarserver.org//changeset/10608 Author: sagen(a)apple.com Date: 2013-01-31 12:55:10 -0800 (Thu, 31 Jan 2013) Log Message: ----------- Purge tool should always delete inbox items, not modify them Modified Paths: -------------- CalendarServer/branches/release/CalendarServer-4.3-dev/calendarserver/tools/purge.py Modified: CalendarServer/branches/release/CalendarServer-4.3-dev/calendarserver/tools/purge.py =================================================================== --- CalendarServer/branches/release/CalendarServer-4.3-dev/calendarserver/tools/purge.py 2013-01-31 01:19:19 UTC (rev 10607) +++ CalendarServer/branches/release/CalendarServer-4.3-dev/calendarserver/tools/purge.py 2013-01-31 20:55:10 UTC (rev 10608) @@ -819,7 +819,8 @@ for childName in childNames: childResource = (yield collection.getChild(childName)) - if self.completely: + # Always delete inbox items + if self.completely or collName == "inbox": action = self.CANCELEVENT_SHOULD_DELETE else: event = (yield childResource.iCalendar())

1 0

[10607] CalendarServer/trunk/twext/who/idirectory.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10607 http://trac.calendarserver.org//changeset/10607 Author: wsanchez(a)apple.com Date: 2013-01-30 17:19:19 -0800 (Wed, 30 Jan 2013) Log Message: ----------- Add DirectoryAvailabilityError Modified Paths: -------------- CalendarServer/trunk/twext/who/idirectory.py Modified: CalendarServer/trunk/twext/who/idirectory.py =================================================================== --- CalendarServer/trunk/twext/who/idirectory.py 2013-01-31 01:18:39 UTC (rev 10606) +++ CalendarServer/trunk/twext/who/idirectory.py 2013-01-31 01:19:19 UTC (rev 10607) @@ -47,6 +47,11 @@ Directory service generic error. """ +class DirectoryAvailabilityError(DirectoryServiceError): + """ + Directory not available. + """ + class QueryNotSupportedError(DirectoryServiceError): """ Query not supported.

1 0

[10606] CalendarServer/trunk/twext/who/test/test_directory.py
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10606 http://trac.calendarserver.org//changeset/10606 Author: wsanchez(a)apple.com Date: 2013-01-30 17:18:39 -0800 (Wed, 30 Jan 2013) Log Message: ----------- Move common bits to BaseTest Modified Paths: -------------- CalendarServer/trunk/twext/who/test/test_directory.py Modified: CalendarServer/trunk/twext/who/test/test_directory.py =================================================================== --- CalendarServer/trunk/twext/who/test/test_directory.py 2013-01-31 01:17:35 UTC (rev 10605) +++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-01-31 01:18:39 UTC (rev 10606) @@ -28,12 +28,17 @@ -class DirectoryServiceTest(unittest.TestCase): +class BaseTest(unittest.TestCase): realmName = "xyzzy" def _testService(self): - return DirectoryService(self.realmName) + if not hasattr(self, "_service"): + self._service = DirectoryService(self.realmName) + return self._service + + +class DirectoryServiceTest(BaseTest): def test_interface(self): service = self._testService() try: @@ -59,28 +64,23 @@ -class DirectoryRecordTest(unittest.TestCase): - realmName = "xyzzy" - +class DirectoryRecordTest(BaseTest): fields_wsanchez = { + FieldName.uid: "wsanchez", FieldName.recordType: RecordType.user, - FieldName.shortNames: ("wsanchez",), - FieldName.uid: "wsanchez", + FieldName.shortNames: ("wsanchez", "wilfredo_sanchez"), + FieldName.fullNames: ("Wilfredo Sanchez", "Wilfredo Sanchez Vega"), FieldName.emailAddresses: ("wsanchez(a)calendarserver.org", "wsanchez(a)example.com") } fields_glyph = { + FieldName.uid: "glyph", FieldName.recordType: RecordType.user, FieldName.shortNames: ("glyph",), - FieldName.uid: "glyph", - FieldName.emailAddresses: ("glyph(a)calendarserver.org", "glyph(a)example.com") + FieldName.fullNames: ("Glyph Lefkowitz",), + FieldName.emailAddresses: ("glyph(a)calendarserver.org",) } - def _testService(self): - if not hasattr(self, "_service"): - self._service = DirectoryService(self.realmName) - return self._service - def _testRecord(self, fields=None, service=None): if fields is None: fields = self.fields_wsanchez

1 0

[10605] CalendarServer/trunk/conf
by source_changes＠macosforge.org 31 Jan '13

31 Jan '13

Revision: 10605 http://trac.calendarserver.org//changeset/10605 Author: wsanchez(a)apple.com Date: 2013-01-30 17:17:35 -0800 (Wed, 30 Jan 2013) Log Message: ----------- New XML format Added Paths: ----------- CalendarServer/trunk/conf/test/ CalendarServer/trunk/conf/test/accounts.xml Added: CalendarServer/trunk/conf/test/accounts.xml =================================================================== --- CalendarServer/trunk/conf/test/accounts.xml (rev 0) +++ CalendarServer/trunk/conf/test/accounts.xml 2013-01-31 01:17:35 UTC (rev 10605) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="utf-8"?> + + + + + +<directory realm="Test Realm"> + <record type="user"> + <uid>admin</uid> + <short-name>admin</short-name> + <password>admin</password> + <full-name>Super User</full-name> + </record> + <record type="user"> + <uid>apprentice</uid> + <short-name>apprentice</short-name> + <full-name>Apprentice Super User</full-name> + <password>apprentice</password> + </record> + <record type="user"> + <uid>wsanchez</uid> + <short-name>wsanchez</short-name> + <email-address>wsanchez(a)example.com</email-address> + <full-name>Wilfredo Sanchez Vega</full-name> + <password>test</password> + </record> + <record type="user"> + <uid>cdaboo</uid> + <short-name>cdaboo</short-name> + <email-address>cdaboo(a)example.com</email-address> + <full-name>Cyrus Daboo</full-name> + <password>test</password> + </record> + <record type="user"> + <uid>sagen</uid> + <short-name>sagen</short-name> + <email-address>sagen(a)example.com</email-address> + <full-name>Morgen Sagen</full-name> + <password>test</password> + </record> + <record type="user"> + <uid>andre</uid> + <short-name>dre</short-name> + <email-address>dre(a)example.com</email-address> + <full-name>Andre LaBranche</full-name> + <password>test</password> + </record> + <record type="user"> + <uid>glyph</uid> + <short-name>glyph</short-name> + <email-address>glyph(a)example.com</email-address> + <full-name>Glyph Lefkowitz</full-name> + <password>test</password> + </record> + <record type="user"> + <uid>i18nuser</uid> + <short-name>i18nuser</short-name> + <email-address>i18nuser(a)example.com</email-address> + <full-name>まだ</full-name> + <password>i18nuser</password> + </record> + <record type="user" repeat="99"> + <uid>user%02d</uid> + <short-name>user%02d</short-name> + <short-name>User %02d</short-name> + <full-name>User %02d</full-name> + <email-address>user%02d(a)example.com</email-address> + <password>user%02d</password> + </record> + <record type="user" repeat="10"> + <uid>public%02d</uid> + <short-name>public%02d</short-name> + <full-name>Public %02d</full-name> + <password>public%02d</password> + </record> + <record type="group"> + <uid>group01</uid> + <short-name>group01</short-name> + <full-name>Group 01</full-name> + <password>group01</password> + <member-uid>user01</member> + </record> + <record type="group"> + <uid>group02</uid> + <short-name>group02</short-name> + <full-name>Group 02</full-name> + <password>group02</password> + <member-uid>user06</member> + <member-uid>user07</member> + </record> + <record type="group"> + <uid>group03</uid> + <short-name>group03</short-name> + <full-name>Group 03</full-name> + <password>group03</password> + <member-uid>user08</member> + <member-uid>user09</member> + </record> + <record type="group"> + <uid>group04</uid> + <short-name>group04</short-name> + <full-name>Group 04</full-name> + <password>group04</password> + <member-uid>group02</member> + <member-uid>group03</member> + <member-uid>user10</member> + </record> + <record type="group">  + <uid>group05</uid> + <short-name>group05</short-name> + <full-name>Group 05</full-name> + <password>group05</password> + <member-uid>group06</member> + <member-uid>user20</member> + </record> + <record type="group">  + <uid>group06</uid> + <short-name>group06</short-name> + <full-name>Group 06</full-name> + <password>group06</password> + <member-uid>user21</member> + </record> + <record type="group">  + <uid>group07</uid> + <short-name>group07</short-name> + <full-name>Group 07</full-name> + <password>group07</password> + <member-uid>user22</member> + <member-uid>user23</member> + <member-uid>user24</member> + </record> + <record type="group"> + <uid>disabledgroup</uid> + <short-name>disabledgroup</short-name> + <full-name>Disabled Group</full-name> + <password>disabledgroup</password> + <member-uid>user01</member> + </record> +</directory> Property changes on: CalendarServer/trunk/conf/test/accounts.xml ___________________________________________________________________ Added: svn:mime-type + text/xml

1 0