October 2010 - calendarserver-changes

[6458] CalendarServer/trunk/conf/caldavd-apple.plist
by source_changes＠macosforge.org 23 Oct '10

23 Oct '10

Revision: 6458 http://trac.macosforge.org/projects/calendarserver/changeset/6458 Author: sagen(a)apple.com Date: 2010-10-22 17:03:36 -0700 (Fri, 22 Oct 2010) Log Message: ----------- Add DirectoryAddressBook to default Apple plist so UI shows correct setting. Modified Paths: -------------- CalendarServer/trunk/conf/caldavd-apple.plist Modified: CalendarServer/trunk/conf/caldavd-apple.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-apple.plist 2010-10-22 22:19:15 UTC (rev 6457) +++ CalendarServer/trunk/conf/caldavd-apple.plist 2010-10-23 00:03:36 UTC (rev 6458) @@ -515,6 +515,16 @@ <true/>  + <key>DirectoryAddressBook</key> + <dict> + <key>params</key> + <dict> + <key>queryUserRecords</key> + <true/> + <key>queryPeopleRecords</key> + <true/> + </dict> + </dict> <key>EnableSearchAddressBook</key> <true/>

1 0

[6457] CalendarServer/trunk/pyflakes
by source_changes＠macosforge.org 22 Oct '10

22 Oct '10

Revision: 6457 http://trac.macosforge.org/projects/calendarserver/changeset/6457 Author: wsanchez(a)apple.com Date: 2010-10-22 15:19:15 -0700 (Fri, 22 Oct 2010) Log Message: ----------- Exit non-zero if we get any output from pyflakes. Modified Paths: -------------- CalendarServer/trunk/pyflakes Modified: CalendarServer/trunk/pyflakes =================================================================== --- CalendarServer/trunk/pyflakes 2010-10-22 22:12:40 UTC (rev 6456) +++ CalendarServer/trunk/pyflakes 2010-10-22 22:19:15 UTC (rev 6457) @@ -12,6 +12,8 @@ set - calendarserver twext twisted twistedcaldav txdav; fi; +tmp="$(mktemp -t pyflakes)"; + cd "${wd}" && "${flakes}/bin/pyflakes" "$@" | sed \ -e "/undefined name '_'/d" \ -e "/undefined name 'CalDAVFile'/d" \ @@ -20,4 +22,10 @@ -e "/redefinition of function/d" \ -e "/i[a-z]*store.py:[0-9][0-9]*: '.*' imported but unused/d" \ -e "/xmlext.py:[0-9][0-9]*: /d" \ - ; + | tee "${tmp}"; + +if [ -s "${tmp}" ]; then error="true"; else error="false"; fi; + +rm -f "${tmp}"; + +if "${error}"; then exit 1; fi;

1 0

[6456] CalendarServer/trunk
by source_changes＠macosforge.org 22 Oct '10

22 Oct '10

Revision: 6456 http://trac.macosforge.org/projects/calendarserver/changeset/6456 Author: wsanchez(a)apple.com Date: 2010-10-22 15:12:40 -0700 (Fri, 22 Oct 2010) Log Message: ----------- pyflakes Modified Paths: -------------- CalendarServer/trunk/calendarserver/tap/caldav.py CalendarServer/trunk/calendarserver/tools/config.py CalendarServer/trunk/calendarserver/tools/export.py CalendarServer/trunk/calendarserver/tools/fixcalendardata.py CalendarServer/trunk/pyflakes CalendarServer/trunk/twext/python/filepath.py CalendarServer/trunk/twext/web2/dav/xattrprops.py CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py CalendarServer/trunk/twistedcaldav/extensions.py CalendarServer/trunk/twistedcaldav/localization.py CalendarServer/trunk/twistedcaldav/test/test_upgrade.py CalendarServer/trunk/txdav/base/datastore/subpostgres.py CalendarServer/trunk/txdav/caldav/datastore/index_file.py CalendarServer/trunk/txdav/caldav/resource.py CalendarServer/trunk/txdav/common/inotifications.py Modified: CalendarServer/trunk/calendarserver/tap/caldav.py =================================================================== --- CalendarServer/trunk/calendarserver/tap/caldav.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/calendarserver/tap/caldav.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -43,7 +43,7 @@ from twisted.python.reflect import namedClass from twisted.plugin import IPlugin from twisted.internet.defer import gatherResults -from twisted.internet import error, reactor +from twisted.internet import reactor from twisted.internet.reactor import addSystemEventTrigger from twisted.internet.process import ProcessExitedAlready from twisted.internet.protocol import Protocol, Factory Modified: CalendarServer/trunk/calendarserver/tools/config.py =================================================================== --- CalendarServer/trunk/calendarserver/tools/config.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/calendarserver/tools/config.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -24,11 +24,9 @@ import os, sys from getopt import getopt, GetoptError -from twistedcaldav import config from twistedcaldav.config import ConfigurationError from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE -from calendarserver.tools.util import UsageError from calendarserver.tools.util import loadConfig def usage(e=None): Modified: CalendarServer/trunk/calendarserver/tools/export.py =================================================================== --- CalendarServer/trunk/calendarserver/tools/export.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/calendarserver/tools/export.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -36,7 +36,6 @@ from getopt import getopt, GetoptError from os.path import dirname, abspath -from twistedcaldav import config from twistedcaldav.config import ConfigurationError from twistedcaldav.ical import Component as iComponent, Property as iProperty from twistedcaldav.ical import iCalendarProductID Modified: CalendarServer/trunk/calendarserver/tools/fixcalendardata.py =================================================================== --- CalendarServer/trunk/calendarserver/tools/fixcalendardata.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/calendarserver/tools/fixcalendardata.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -322,7 +322,7 @@ doFix = False # Parse command line options - opts, _ignore_args = getopt.getopt(sys.argv[1:], "f:ho:v", ["config", "scan", "fix", "help",]) + opts, _ignore_args = getopt.getopt(sys.argv[1:], "f:ho:", ["config", "scan", "fix", "help",]) for option, value in opts: if option in ("-h", "--help"): usage() @@ -332,8 +332,6 @@ usage("Path does not exist: %s" % (plistPath,)) elif option == "-o": scanPath = value - elif option == "-v": - verbose = True elif option == "--scan": doScan = True elif option == "--fix": Modified: CalendarServer/trunk/pyflakes =================================================================== --- CalendarServer/trunk/pyflakes 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/pyflakes 2010-10-22 22:12:40 UTC (rev 6456) @@ -9,7 +9,7 @@ export PYTHONPATH="${flakes}:${PYTHONPATH:-}"; if [ $# -eq 0 ]; then - set - calendarserver twistedcaldav twext txdav; + set - calendarserver twext twisted twistedcaldav txdav; fi; cd "${wd}" && "${flakes}/bin/pyflakes" "$@" | sed \ Modified: CalendarServer/trunk/twext/python/filepath.py =================================================================== --- CalendarServer/trunk/twext/python/filepath.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twext/python/filepath.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -129,6 +129,7 @@ # Work with vanilla FilePath destinations to pacify the tests. if hasattr(destination, "changed"): destination.changed() + return result def remove(self): @@ -143,4 +144,4 @@ CachingFilePath.clonePath = CachingFilePath -__all__ = ['CachingFilePath'] +__all__ = ["CachingFilePath"] Modified: CalendarServer/trunk/twext/web2/dav/xattrprops.py =================================================================== --- CalendarServer/trunk/twext/web2/dav/xattrprops.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twext/web2/dav/xattrprops.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -34,7 +34,6 @@ __all__ = ["xattrPropertyStore"] import urllib -import os import sys import zlib import errno Modified: CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -34,7 +34,6 @@ from os.path import join, abspath from tempfile import mkstemp, gettempdir from random import random -from urllib import unquote import opendirectory import dsattributes @@ -59,7 +58,6 @@ from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord from twistedcaldav.ical import iCalendarProductID from twistedcaldav.memcachelock import MemcacheLock, MemcacheLockTimeoutError -from twistedcaldav.method.put_addressbook_common import StoreAddressObjectResource from twistedcaldav.query import addressbookqueryfilter from twistedcaldav.vcard import Component, Property Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -21,7 +21,6 @@ from twistedcaldav.directory.directory import DirectoryService from twistedcaldav.test.util import xmlFile, augmentsFile, proxiesFile from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource -from twistedcaldav.directory.xmlaccountsparser import XMLAccountsParser from twistedcaldav.directory.xmlfile import XMLDirectoryService import twistedcaldav.test.util Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -21,7 +21,7 @@ __all__ = [ "DAVResource", - "DAVResourceWithChildren", + "DAVResourceWithChildrenMixin", "DAVPrincipalResource", "DAVFile", "ReadOnlyWritePropertiesResourceMixIn", Modified: CalendarServer/trunk/twistedcaldav/localization.py =================================================================== --- CalendarServer/trunk/twistedcaldav/localization.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twistedcaldav/localization.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -21,7 +21,6 @@ import os import struct import array -import codecs from locale import normalize from twext.python.log import Logger Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -15,7 +15,7 @@ ## -from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.internet.defer import inlineCallbacks from twext.web2.dav import davxml from twistedcaldav.config import config from twistedcaldav.directory.calendaruserproxy import ProxySqliteDB Modified: CalendarServer/trunk/txdav/base/datastore/subpostgres.py =================================================================== --- CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/txdav/base/datastore/subpostgres.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -14,26 +14,23 @@ # See the License for the specific language governing permissions and # limitations under the License. ## -import sys """ Run and manage PostgreSQL as a subprocess. """ import os import pwd -import thread +#import thread - from hashlib import md5 from twisted.python.procutils import which from twisted.internet.protocol import ProcessProtocol from twisted.python.reflect import namedAny -from twisted.python import log +from twext.python.log import Logger from twext.python.filepath import CachingFilePath - pgdb = namedAny("pgdb") from twisted.protocols.basic import LineReceiver @@ -42,6 +39,7 @@ from twisted.application.service import MultiService +log = Logger() # This appears in the postgres log to indicate that it is accepting # connections. @@ -71,6 +69,7 @@ def execute(self, sql, args=()): self.connectionWrapper.state = 'executing %r' % (sql,) +# Use log.debug # sys.stdout.write( # "Really executing SQL %r in thread %r\n" % # ((sql % tuple(args)), thread.get_ident()) @@ -84,6 +83,7 @@ def fetchall(self): results = self.realCursor.fetchall() +# Use log.debug # sys.stdout.write( # "Really fetching results %r thread %r\n" % # (results, thread.get_ident()) Modified: CalendarServer/trunk/txdav/caldav/datastore/index_file.py =================================================================== --- CalendarServer/trunk/txdav/caldav/datastore/index_file.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/txdav/caldav/datastore/index_file.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -42,7 +42,7 @@ from vobject.icalendar import utc -from twisted.internet.defer import maybeDeferred, succeed, inlineCallbacks +from twisted.internet.defer import maybeDeferred, succeed from twext.python.log import Logger, LoggingMixIn Modified: CalendarServer/trunk/txdav/caldav/resource.py =================================================================== --- CalendarServer/trunk/txdav/caldav/resource.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/txdav/caldav/resource.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -40,6 +40,7 @@ from twistedcaldav.caldavxml import caldav_namespace from twistedcaldav.config import config from twistedcaldav.extensions import DAVResource +from twistedcaldav.ical import allowedComponents class CalDAVResource(DAVResource, LoggingMixIn): Modified: CalendarServer/trunk/txdav/common/inotifications.py =================================================================== --- CalendarServer/trunk/txdav/common/inotifications.py 2010-10-22 22:12:06 UTC (rev 6455) +++ CalendarServer/trunk/txdav/common/inotifications.py 2010-10-22 22:12:40 UTC (rev 6456) @@ -24,7 +24,7 @@ __all__ = [ "INotificationCollection", - "INotification", + "INotificationObject", ] class INotificationCollection(Interface):

1 0

[6455] CalendarServer/trunk
by source_changes＠macosforge.org 22 Oct '10

22 Oct '10

Revision: 6455 http://trac.macosforge.org/projects/calendarserver/changeset/6455 Author: sagen(a)apple.com Date: 2010-10-22 15:12:06 -0700 (Fri, 22 Oct 2010) Log Message: ----------- Clean up some things found by pyflakes Modified Paths: -------------- CalendarServer/trunk/calendarserver/tools/gateway.py CalendarServer/trunk/calendarserver/tools/resources.py CalendarServer/trunk/twistedcaldav/directory/aggregate.py Modified: CalendarServer/trunk/calendarserver/tools/gateway.py =================================================================== --- CalendarServer/trunk/calendarserver/tools/gateway.py 2010-10-22 21:54:28 UTC (rev 6454) +++ CalendarServer/trunk/calendarserver/tools/gateway.py 2010-10-22 22:12:06 UTC (rev 6455) @@ -26,7 +26,7 @@ from twext.python.plistlib import readPlistFromString, writePlistToString from twisted.internet import reactor -from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.internet.defer import inlineCallbacks from twisted.python.util import switchUID from twistedcaldav.config import config, ConfigurationError from twistedcaldav.directory.directory import DirectoryError Modified: CalendarServer/trunk/calendarserver/tools/resources.py =================================================================== --- CalendarServer/trunk/calendarserver/tools/resources.py 2010-10-22 21:54:28 UTC (rev 6454) +++ CalendarServer/trunk/calendarserver/tools/resources.py 2010-10-22 22:12:06 UTC (rev 6455) @@ -16,7 +16,6 @@ # limitations under the License. ## -from calendarserver.tools.principals import updateRecord from calendarserver.tools.util import loadConfig, getDirectory, setupMemcached, checkDirectory from getopt import getopt, GetoptError from grp import getgrnam Modified: CalendarServer/trunk/twistedcaldav/directory/aggregate.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/aggregate.py 2010-10-22 21:54:28 UTC (rev 6454) +++ CalendarServer/trunk/twistedcaldav/directory/aggregate.py 2010-10-22 22:12:06 UTC (rev 6455) @@ -236,10 +236,6 @@ service = self.serviceForRecordType(recordType) return service.destroyRecord(recordType, guid=guid) - def createRecords(self, data): - service = self.serviceForRecordType(recordType) - return service.createRecords(data) - def setRealm(self, realmName): """ Set a new realm name for this and nested services

1 0

[6454] CalendarServer/trunk/support/build.sh
by source_changes＠macosforge.org 22 Oct '10

22 Oct '10

Revision: 6454 http://trac.macosforge.org/projects/calendarserver/changeset/6454 Author: wsanchez(a)apple.com Date: 2010-10-22 14:54:28 -0700 (Fri, 22 Oct 2010) Log Message: ----------- Update xattr 0.5->0.6.1; Twisted 10.0.0->10.1.0 Modified Paths: -------------- CalendarServer/trunk/support/build.sh Modified: CalendarServer/trunk/support/build.sh =================================================================== --- CalendarServer/trunk/support/build.sh 2010-10-22 18:59:20 UTC (rev 6453) +++ CalendarServer/trunk/support/build.sh 2010-10-22 21:54:28 UTC (rev 6454) @@ -520,9 +520,9 @@ "${svn_uri_base}/PyOpenDirectory/trunk"; #fi; - py_dependency -v 0.5 -r 1013 \ + py_dependency -v 0.5 -r 1038 \ "xattr" "xattr" "xattr" \ - "http://svn.red-bean.com/bob/xattr/releases/xattr-0.5"; + "http://svn.red-bean.com/bob/xattr/releases/xattr-0.6.1/"; if [ "${py_version}" != "${py_version##2.5}" ] && ! py_have_module select26; then py_dependency \ @@ -535,9 +535,9 @@ "PyGreSQL" "pgdb" "PyGreSQL-4.0" \ "http://pypi.python.org/packages/source/P/PyGreSQL/PyGreSQL-4.0.tar.gz"; - py_dependency -v 10 -r 28657 \ + py_dependency -v 10.1 -r 30159 \ "Twisted" "twisted" "Twisted" \ - "svn://svn.twistedmatrix.com/svn/Twisted/tags/releases/twisted-10.0.0"; + "svn://svn.twistedmatrix.com/svn/Twisted/tags/releases/twisted-10.1.0"; local du="python-dateutil-1.5"; py_dependency \

1 0

[6453] CalendarServer/trunk/twistedcaldav/upgrade.py
by source_changes＠macosforge.org 22 Oct '10

22 Oct '10

Revision: 6453 http://trac.macosforge.org/projects/calendarserver/changeset/6453 Author: sagen(a)apple.com Date: 2010-10-22 11:59:20 -0700 (Fri, 22 Oct 2010) Log Message: ----------- Remove resource import trigger Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/upgrade.py Modified: CalendarServer/trunk/twistedcaldav/upgrade.py =================================================================== --- CalendarServer/trunk/twistedcaldav/upgrade.py 2010-10-22 16:39:48 UTC (rev 6452) +++ CalendarServer/trunk/twistedcaldav/upgrade.py 2010-10-22 18:59:20 UTC (rev 6453) @@ -481,6 +481,7 @@ triggerFile = "trigger_resource_migration" triggerPath = os.path.join(config.ServerRoot, triggerFile) if os.path.exists(triggerPath): + os.remove(triggerPath) log.info("Migrating locations and resources")

1 0

[6452] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 22 Oct '10

22 Oct '10

Revision: 6452 http://trac.macosforge.org/projects/calendarserver/changeset/6452 Author: sagen(a)apple.com Date: 2010-10-22 09:39:48 -0700 (Fri, 22 Oct 2010) Log Message: ----------- Remove xmpp- properties from addressbook home (push-aware AB clients will use push-transports) Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/resource.py CalendarServer/trunk/twistedcaldav/test/test_resource.py Modified: CalendarServer/trunk/twistedcaldav/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/resource.py 2010-10-21 20:21:50 UTC (rev 6451) +++ CalendarServer/trunk/twistedcaldav/resource.py 2010-10-22 16:39:48 UTC (rev 6452) @@ -2010,13 +2010,10 @@ pass def liveProperties(self): - + return super(CommonHomeResource, self).liveProperties() + ( (customxml.calendarserver_namespace, "push-transports"), (customxml.calendarserver_namespace, "pushkey"), - (customxml.calendarserver_namespace, "xmpp-uri"), - (customxml.calendarserver_namespace, "xmpp-heartbeat-uri"), - (customxml.calendarserver_namespace, "xmpp-server"), ) def sharesDB(self): @@ -2484,7 +2481,14 @@ returnValue((changed, deleted, notallowed)) + def liveProperties(self): + return super(CalendarHomeResource, self).liveProperties() + ( + (customxml.calendarserver_namespace, "xmpp-uri"), + (customxml.calendarserver_namespace, "xmpp-heartbeat-uri"), + (customxml.calendarserver_namespace, "xmpp-server"), + ) + class AddressBookHomeResource (CommonHomeResource): """ Address book home collection resource. Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_resource.py 2010-10-21 20:21:50 UTC (rev 6451) +++ CalendarServer/trunk/twistedcaldav/test/test_resource.py 2010-10-22 16:39:48 UTC (rev 6452) @@ -14,7 +14,7 @@ # limitations under the License. ## -from twistedcaldav.resource import CalDAVResource +from twistedcaldav.resource import CalDAVResource, CommonHomeResource, CalendarHomeResource, AddressBookHomeResource from twistedcaldav.test.util import InMemoryPropertyStore from twistedcaldav.test.util import TestCase @@ -24,7 +24,11 @@ def qname(self): return "StubQnamespace", "StubQname" +class StubHome(object): + def properties(self): + return [] + class CalDAVResourceTests(TestCase): def setUp(self): TestCase.setUp(self) @@ -36,3 +40,26 @@ self.resource.writeDeadProperty(prop) self.assertEquals(self.resource._dead_properties.get(("StubQnamespace", "StubQname")), prop) + +class CommonHomeResourceTests(TestCase): + + def test_commonHomeliveProperties(self): + resource = CommonHomeResource(None, None, None, StubHome()) + self.assertTrue(('http://calendarserver.org/ns/', 'push-transports') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'pushkey') in resource.liveProperties()) + + def test_calendarHomeliveProperties(self): + resource = CalendarHomeResource(None, None, None, StubHome()) + self.assertTrue(('http://calendarserver.org/ns/', 'push-transports') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'pushkey') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'xmpp-uri') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'xmpp-heartbeat-uri') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'xmpp-server') in resource.liveProperties()) + + def test_addressBookHomeliveProperties(self): + resource = AddressBookHomeResource(None, None, None, StubHome()) + self.assertTrue(('http://calendarserver.org/ns/', 'push-transports') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'pushkey') in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'xmpp-uri') not in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'xmpp-heartbeat-uri') not in resource.liveProperties()) + self.assertTrue(('http://calendarserver.org/ns/', 'xmpp-server') not in resource.liveProperties())

1 0

[6451] CalendarServer/trunk/support/build.sh
by source_changes＠macosforge.org 21 Oct '10

21 Oct '10

Revision: 6451 http://trac.macosforge.org/projects/calendarserver/changeset/6451 Author: wsanchez(a)apple.com Date: 2010-10-21 13:21:50 -0700 (Thu, 21 Oct 2010) Log Message: ----------- PostgreSQL -> 9.0.1 Modified Paths: -------------- CalendarServer/trunk/support/build.sh Modified: CalendarServer/trunk/support/build.sh =================================================================== --- CalendarServer/trunk/support/build.sh 2010-10-21 19:44:16 UTC (rev 6450) +++ CalendarServer/trunk/support/build.sh 2010-10-21 20:21:50 UTC (rev 6451) @@ -477,10 +477,10 @@ fi; if ! type postgres > /dev/null 2>&1; then - local pgv="8.4.4"; + local pgv="9.0.1"; local pg="postgresql-${pgv}"; c_dependency "PostgreSQL" "${pg}" \ - "http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v${pgv}/${pg}.t…" \ + "ftp://ftp5.us.postgresql.org/pub/PostgreSQL/source/v${pgv}/${pg}.tar.gz" \ --with-python; :; fi; @@ -530,7 +530,8 @@ "http://pypi.python.org/packages/source/s/select26/select26-0.1a3.tar.gz"; fi; - py_dependency -v 4.0 -m 1aca50e59ff4cc56abe9452a9a49c5ff -o \ + py_dependency -v 4.0 \ + -m "1aca50e59ff4cc56abe9452a9a49c5ff" -o \ "PyGreSQL" "pgdb" "PyGreSQL-4.0" \ "http://pypi.python.org/packages/source/P/PyGreSQL/PyGreSQL-4.0.tar.gz";

1 0

[6450] CalendarServer/trunk/support/py.sh
by source_changes＠macosforge.org 21 Oct '10

21 Oct '10

Revision: 6450 http://trac.macosforge.org/projects/calendarserver/changeset/6450 Author: wsanchez(a)apple.com Date: 2010-10-21 12:44:16 -0700 (Thu, 21 Oct 2010) Log Message: ----------- Abstract out cmp_version() Modified Paths: -------------- CalendarServer/trunk/support/py.sh Modified: CalendarServer/trunk/support/py.sh =================================================================== --- CalendarServer/trunk/support/py.sh 2010-10-20 19:49:14 UTC (rev 6449) +++ CalendarServer/trunk/support/py.sh 2010-10-21 19:44:16 UTC (rev 6450) @@ -102,47 +102,54 @@ done; if [ -z "${module_version}" ]; then - echo "Unable to determine version for ${module}."; + if ! "${print_path}"; then + echo "Unable to determine version for ${module}."; + fi; result=1; + elif ! cmp_version "${version}" "${module_version}"; then + if ! "${print_path}"; then + echo "A system version of ${module} exists, but version is ${module_version} (< ${version})."; + fi; + result=1; fi; + fi; - v="${version}"; - mv="${module_version}"; + return ${result}; +} - no_such_luck="A system version of ${module} exists, but version is ${module_version} (< ${version})."; +# Compare version numbers - while [ $result != 1 ]; do - vh="${v%%.*}"; # Get highest-order segment - mvh="${mv%%.*}"; +cmp_version () { + local result=0; - if [ "$vh" -gt "$mvh" ]; then - if ! "${print_path}"; then - echo "${no_such_luck}"; - fi; - result=1; - break; - fi; + local v="$1"; shift; + local mv="$1"; shift; - if [ "${v}" == "${v#*.}" ]; then - # No dots left, so we're ok - break; - fi; + while [ $result != 1 ]; do + vh="${v%%.*}"; # Get highest-order segment + mvh="${mv%%.*}"; - if [ "${mv}" == "${mv#*.}" ]; then - # No dots left, so we're not gonna match - if ! "${print_path}"; then - echo "${no_such_luck}"; - fi; - result=1; - break; - fi; + if [ "${vh}" -gt "${mvh}" ]; then + result=1; + break; + fi; - v="${v#*.}"; - mv="${mv#*.}"; - done; - fi; + if [ "${v}" == "${v#*.}" ]; then + # No dots left, so we're ok + break; + fi; - return $result; + if [ "${mv}" == "${mv#*.}" ]; then + # No dots left, so we're not gonna match + result=1; + break; + fi; + + v="${v#*.}"; + mv="${mv#*.}"; + done; + + return ${result}; } # Detect which python to use, and store it in the 'python' variable, as well as

1 0

[6449] CalendarServer/trunk
by source_changes＠macosforge.org 20 Oct '10

20 Oct '10

Revision: 6449 http://trac.macosforge.org/projects/calendarserver/changeset/6449 Author: sagen(a)apple.com Date: 2010-10-20 12:49:14 -0700 (Wed, 20 Oct 2010) Log Message: ----------- Only migration automatically triggers a location/resource import (not a clean install) Modified Paths: -------------- CalendarServer/trunk/contrib/migration/calendarmigrator.py CalendarServer/trunk/twistedcaldav/upgrade.py Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py =================================================================== --- CalendarServer/trunk/contrib/migration/calendarmigrator.py 2010-10-20 16:52:58 UTC (rev 6448) +++ CalendarServer/trunk/contrib/migration/calendarmigrator.py 2010-10-20 19:49:14 UTC (rev 6449) @@ -40,6 +40,7 @@ CALDAVD_PLIST = "caldavd.plist" CARDDAVD_PLIST = "carddavd.plist" NEW_SERVER_ROOT = "/Library/Server/Calendar and Contacts" +RESOURCE_MIGRATION_TRIGGER = "trigger_resource_migration" verbatimKeys = """ @@ -202,6 +203,7 @@ newServerRootValue = migrateData(options) migrateConfiguration(options, newServerRootValue) migrateRunState(options) + triggerResourceMigration(newServerRootValue) else: log("ERROR: --sourceRoot must be specified") @@ -225,7 +227,22 @@ setServiceStateDisabled(options.targetRoot, LAUNCHD_KEY, disabled) +def triggerResourceMigration(newServerRootValue): + """ + Leave a file in the server root to act as a signal that the server + should migrate locations and resources from OD when it starts up. + """ + triggerPath = os.path.join(newServerRootValue, RESOURCE_MIGRATION_TRIGGER) + if not os.path.exists(newServerRootValue): + log("New server root directory doesn't exist: %s" % (newServerRootValue,)) + return + if not os.path.exists(triggerPath): + # Create an empty trigger file + log("Creating resource migration trigger file: %s" % (triggerPath,)) + open(triggerPath, "w").close() + + def migrateConfiguration(options, newServerRootValue): """ Copy files/directories/symlinks from previous system's /etc/caldavd Modified: CalendarServer/trunk/twistedcaldav/upgrade.py =================================================================== --- CalendarServer/trunk/twistedcaldav/upgrade.py 2010-10-20 16:52:58 UTC (rev 6448) +++ CalendarServer/trunk/twistedcaldav/upgrade.py 2010-10-20 19:49:14 UTC (rev 6449) @@ -478,38 +478,43 @@ # # Migrates locations and resources from OD # + triggerFile = "trigger_resource_migration" + triggerPath = os.path.join(config.ServerRoot, triggerFile) + if os.path.exists(triggerPath): - directory = getDirectory() - userService = directory.serviceForRecordType("users") - resourceService = directory.serviceForRecordType("resources") - if ( - not isinstance(userService, OpenDirectoryService) or - not isinstance(resourceService, XMLDirectoryService) - ): - # Configuration requires no migration - return succeed(None) + log.info("Migrating locations and resources") - # Fetch the autoSchedule assignments from resourceinfo.sqlite and pass - # those to migrateResources - autoSchedules = {} - dbPath = os.path.join(config.DataRoot, ResourceInfoDatabase.dbFilename) - if os.path.exists(dbPath): - resourceInfoDatabase = ResourceInfoDatabase(config.DataRoot) - results = resourceInfoDatabase._db_execute( - "select GUID, AUTOSCHEDULE from RESOURCEINFO" - ) - for guid, autoSchedule in results: - autoSchedules[guid] = autoSchedule + directory = getDirectory() + userService = directory.serviceForRecordType("users") + resourceService = directory.serviceForRecordType("resources") + if ( + not isinstance(userService, OpenDirectoryService) or + not isinstance(resourceService, XMLDirectoryService) + ): + # Configuration requires no migration + return succeed(None) - # Create internal copies of resources and locations based on what is found - # in OD, overriding the autoSchedule default with existing assignments - # from resourceinfo.sqlite - return migrateResources(userService, resourceService, - autoSchedules=autoSchedules) + # Fetch the autoSchedule assignments from resourceinfo.sqlite and pass + # those to migrateResources + autoSchedules = {} + dbPath = os.path.join(config.DataRoot, ResourceInfoDatabase.dbFilename) + if os.path.exists(dbPath): + resourceInfoDatabase = ResourceInfoDatabase(config.DataRoot) + results = resourceInfoDatabase._db_execute( + "select GUID, AUTOSCHEDULE from RESOURCEINFO" + ) + for guid, autoSchedule in results: + autoSchedules[guid] = autoSchedule + # Create internal copies of resources and locations based on what is + # found in OD, overriding the autoSchedule default with existing + # assignments from resourceinfo.sqlite + return migrateResources(userService, resourceService, + autoSchedules=autoSchedules) + # The on-disk version number (which defaults to zero if .calendarserver_version # doesn't exist), is compared with each of the numbers in the upgradeMethods # array. If it is less than the number, the associated method is called.

1 0