December 2006 - calendarserver-changes

[821] CalendarServer/trunk/twistedcaldav/tap.py
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 821 http://trac.macosforge.org/projects/calendarserver/changeset/821 Author: wsanchez(a)apple.com Date: 2006-12-12 16:55:18 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Log docroot Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/tap.py Modified: CalendarServer/trunk/twistedcaldav/tap.py =================================================================== --- CalendarServer/trunk/twistedcaldav/tap.py 2006-12-13 00:48:38 UTC (rev 820) +++ CalendarServer/trunk/twistedcaldav/tap.py 2006-12-13 00:55:18 UTC (rev 821) @@ -21,6 +21,8 @@ from zope.interface import implements +from twisted.python import log + from twisted.python.usage import Options from twisted.python.reflect import namedClass @@ -100,20 +102,24 @@ # Setup Resource hierarchy # + log.msg("Setting up document root: %s" % (config.DocumentRoot,)) + principalCollection = self.principalResourceClass( os.path.join(config.DocumentRoot, 'principals'), '/principals/', directory - ) + ) calendarCollection = self.calendarResourceClass( os.path.join(config.DocumentRoot, 'calendars'), directory, - '/calendars/') + '/calendars/' + ) - root = self.rootResourceClass(config.DocumentRoot, - principalCollections=(principalCollection,) - ) + root = self.rootResourceClass( + config.DocumentRoot, + principalCollections=(principalCollection,) + ) root.putChild('principals', principalCollection) root.putChild('calendars', calendarCollection)

1 0

[820] CalendarServer/trunk/twistedcaldav/extensions.py
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 820 http://trac.macosforge.org/projects/calendarserver/changeset/820 Author: wsanchez(a)apple.com Date: 2006-12-12 16:48:38 -0800 (Tue, 12 Dec 2006) Log Message: ----------- %% -> % Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/extensions.py Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:48:19 UTC (rev 819) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:48:38 UTC (rev 820) @@ -120,7 +120,7 @@ ".listing {" "margin-left: auto;" "margin-right: auto;" - "width: 50%%;" + "width: 50%;" "padding: 0.1em;" "}" "body { border: 0; padding: 0; margin: 0; background-color: #efefef;}"

1 0

[819] CalendarServer/trunk/twistedcaldav/extensions.py
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 819 http://trac.macosforge.org/projects/calendarserver/changeset/819 Author: wsanchez(a)apple.com Date: 2006-12-12 16:48:19 -0800 (Tue, 12 Dec 2006) Log Message: ----------- more render tweakage Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/extensions.py Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:23:20 UTC (rev 818) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:48:19 UTC (rev 819) @@ -110,22 +110,22 @@ return response def directoryStyleSheet(self): - return """ -th, .even td, .odd td { padding-right: 0.5em; font-family: monospace} -.even-dir { background-color: #efe0ef } -.even { background-color: #eee } -.odd-dir {background-color: #f0d0ef } -.odd { background-color: #dedede } -.icon { text-align: center } -.listing { - margin-left: auto; - margin-right: auto; - width: 50%%; - padding: 0.1em; -} -body { border: 0; padding: 0; margin: 0; background-color: #efefef;} -h1 {padding: 0.1em; background-color: #777; color: white; border-bottom: thin white dashed;} -""" + return ( + "th, .even td, .odd td { padding-right: 0.5em; font-family: monospace}" + ".even-dir { background-color: #efe0ef }" + ".even { background-color: #eee }" + ".odd-dir {background-color: #f0d0ef }" + ".odd { background-color: #dedede }" + ".icon { text-align: center }" + ".listing {" + "margin-left: auto;" + "margin-right: auto;" + "width: 50%%;" + "padding: 0.1em;" + "}" + "body { border: 0; padding: 0; margin: 0; background-color: #efefef;}" + "h1 {padding: 0.1em; background-color: #777; color: white; border-bottom: thin white dashed;}" + ) def renderDirectory(self, request): """ @@ -134,22 +134,22 @@ title = "Directory listing for %s" % urllib.unquote(request.path) output = [ -"""<html> -<head> -<title>%(title)s</title> -<style>%(style)s</style> -</head> -<body> -<div class="directory-listing"> -<h1>%(title)s</h1> -<table> + """<html>""" + """<head>""" + """<title>%(title)s</title>""" + """<style>%(style)s</style>""" + """</head>""" + """<body>""" + """<div class="directory-listing">""" + """<h1>%(title)s</h1>""" + """<table>""" + """<tr><th>Filename</th> <th>Size</th> <th>Last Modified</th> <th>File Type</th></tr>""" + % { + "title": urllib.unquote(request.uri), + "style": self.directoryStyleSheet(), + } + ] -<tr><th>Filename</th> <th>Size</th> <th>Last Modified</th> <th>File Type</th></tr> -""" % { - "title": urllib.unquote(request.uri), - "style": self.directoryStyleSheet(), -}] - even = False for name in sorted(self.listChildren()): child = self.getChild(name) @@ -183,7 +183,7 @@ """<td align="right">%(size)s</td>""" """<td>%(lastModified)s</td>""" """<td>%(type)s</td>""" - """</tr>\n""" + """</tr>""" % { "even": even and "even" or "odd", "url": url, @@ -194,12 +194,7 @@ } ) even = not even - output.append(""" -</table> -</div> -</body> -</html> -""") + output.append("</table></div></body></html>") response = Response(200, {}, "".join(output)) response.headers.setHeader("content-type", MimeType("text", "html"))

1 0

[818] CalendarServer/trunk/twistedcaldav/extensions.py
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 818 http://trac.macosforge.org/projects/calendarserver/changeset/818 Author: wsanchez(a)apple.com Date: 2006-12-12 16:23:20 -0800 (Tue, 12 Dec 2006) Log Message: ----------- make style modular Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/extensions.py Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:16:50 UTC (rev 817) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:23:20 UTC (rev 818) @@ -84,7 +84,7 @@ # Render from the index file return self.createSimilarFile(ifp.path).render(req) - return self.render_directory(req) + return self.renderDirectory(req) try: f = self.fp.open() @@ -109,16 +109,8 @@ return response - def render_directory(self, request): - """ - Render a directory listing. - """ - title = "Directory listing for %s" % urllib.unquote(request.path) - - output = ["""<html> -<head> -<title>%(title)s</title> -<style> + def directoryStyleSheet(self): + return """ th, .even td, .odd td { padding-right: 0.5em; font-family: monospace} .even-dir { background-color: #efe0ef } .even { background-color: #eee } @@ -133,7 +125,19 @@ } body { border: 0; padding: 0; margin: 0; background-color: #efefef;} h1 {padding: 0.1em; background-color: #777; color: white; border-bottom: thin white dashed;} -</style> +""" + + def renderDirectory(self, request): + """ + Render a directory listing. + """ + title = "Directory listing for %s" % urllib.unquote(request.path) + + output = [ +"""<html> +<head> +<title>%(title)s</title> +<style>%(style)s</style> </head> <body> <div class="directory-listing"> @@ -141,7 +145,10 @@ <table> <tr><th>Filename</th> <th>Size</th> <th>Last Modified</th> <th>File Type</th></tr> -""" % { "title": urllib.unquote(request.uri) }] +""" % { + "title": urllib.unquote(request.uri), + "style": self.directoryStyleSheet(), +}] even = False for name in sorted(self.listChildren()):

1 0

[817] CalendarServer/trunk/twistedcaldav/extensions.py
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 817 http://trac.macosforge.org/projects/calendarserver/changeset/817 Author: wsanchez(a)apple.com Date: 2006-12-12 16:16:50 -0800 (Tue, 12 Dec 2006) Log Message: ----------- cosmetic Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/extensions.py Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:02:26 UTC (rev 816) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2006-12-13 00:16:50 UTC (rev 817) @@ -115,7 +115,7 @@ """ title = "Directory listing for %s" % urllib.unquote(request.path) - s = ["""<html> + output = ["""<html> <head> <title>%(title)s</title> <style> @@ -170,23 +170,31 @@ return value # FIXME: gray out resources that are not readable - s.append("""<tr class="%(even)s"><td><a href="%(url)s">%(name)s</a></td> <td align="right">%(size)s</td> <td>%(lastModified)s</td><td>%(type)s</td></tr>\n""" % { - "even": even and "even" or "odd", - "url": url, - "name": name, - "size": orNone(size), - "lastModified": orNone(lastModified, f=lambda t: time.strftime("%Y-%b-%d %H:%M", time.localtime(t))), - "type": orNone(contentType, default="-", f=lambda m: "%s/%s %s" % (m.mediaType, m.mediaSubtype, m.params)), - }) + output.append( + """<tr class="%(even)s">""" + """<td><a href="%(url)s">%(name)s</a></td>""" + """<td align="right">%(size)s</td>""" + """<td>%(lastModified)s</td>""" + """<td>%(type)s</td>""" + """</tr>\n""" + % { + "even": even and "even" or "odd", + "url": url, + "name": name, + "size": orNone(size), + "lastModified": orNone(lastModified, f=lambda t: time.strftime("%Y-%b-%d %H:%M", time.localtime(t))), + "type": orNone(contentType, default="-", f=lambda m: "%s/%s %s" % (m.mediaType, m.mediaSubtype, m.params)), + } + ) even = not even - s.append(""" + output.append(""" </table> </div> </body> </html> """) - response = Response(200, {}, "".join(s)) + response = Response(200, {}, "".join(output)) response.headers.setHeader("content-type", MimeType("text", "html")) return response

1 0

[816] CalendarServer/trunk/twistedcaldav/config.py
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 816 http://trac.macosforge.org/projects/calendarserver/changeset/816 Author: wsanchez(a)apple.com Date: 2006-12-12 16:02:26 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Drop box should be off by default. SSL should be on by default, HTTP should be off. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/config.py Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2006-12-13 00:01:05 UTC (rev 815) +++ CalendarServer/trunk/twistedcaldav/config.py 2006-12-13 00:02:26 UTC (rev 816) @@ -29,7 +29,7 @@ 'type': 'twistedcaldav.directory.appleopendirectory.OpenDirectoryService' }, 'DocumentRoot': '/Library/CalendarServer/Documents', - 'DropBoxEnabled': True, + 'DropBoxEnabled': False, 'ErrorLogFile': '/var/log/caldavd/error.log', 'ManholePort': 0, 'MaximumAttachmentSizeBytes': 1048576, @@ -39,8 +39,8 @@ 'ResetAccountACLs': False, 'RunStandalone': True, 'SSLCertificate': '/etc/certificates/Default.crt', - 'SSLEnable': False, - 'SSLOnly': False, + 'SSLEnable': True, + 'SSLOnly': True, 'SSLPort': 8443, 'SSLPrivateKey': '/etc/certificates/Default.key', 'ServerLogFile': '/var/log/caldavd/server.log',

1 0

[815] CalendarServer/trunk/testcaldav
by source_changes＠macosforge.org 13 Dec '06

13 Dec '06

Revision: 815 http://trac.macosforge.org/projects/calendarserver/changeset/815 Author: wsanchez(a)apple.com Date: 2006-12-12 16:01:05 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Exit on errors. user not users Modified Paths: -------------- CalendarServer/trunk/testcaldav Modified: CalendarServer/trunk/testcaldav =================================================================== --- CalendarServer/trunk/testcaldav 2006-12-12 22:58:18 UTC (rev 814) +++ CalendarServer/trunk/testcaldav 2006-12-13 00:01:05 UTC (rev 815) @@ -18,6 +18,9 @@ # DRI: Wilfredo Sanchez, wsanchez(a)apple.com ## +set -e +set -u + wd="$(cd "$(dirname "$0")" && pwd)"; cdt="${wd}/../CalDAVTester"; @@ -69,6 +72,6 @@ svn checkout http://svn.macosforge.org/repository/calendarserver/CalDAVTester/trunk "${cdt}" fi; -tar -C "${documentroot}/calendars/users/user01/" -x${verbose}zf "${cdt}/Resource/errors/calendar.1000.tgz" +tar -C "${documentroot}/calendars/user/user01/" -x${verbose}zf "${cdt}/Resource/errors/calendar.1000.tgz" cd "${cdt}" && python testcaldav.py -s "${serverinfo}" --all;

1 0

[814] CalendarServer/trunk
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 814 http://trac.macosforge.org/projects/calendarserver/changeset/814 Author: wsanchez(a)apple.com Date: 2006-12-12 14:58:18 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Um, merged wrong file Modified Paths: -------------- CalendarServer/trunk/run CalendarServer/trunk/testcaldav Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2006-12-12 22:57:25 UTC (rev 813) +++ CalendarServer/trunk/run 2006-12-12 22:58:18 UTC (rev 814) @@ -171,7 +171,8 @@ if ! "${setup_only}"; then if [ ! -f "${config}" ]; then echo "Missing config file: ${config}"; - echo "You might want to copy conf/caldavd-test.plist to conf/caldavd-dev.plist and start from there."; + echo "You might want to start by copying the test configuration:"; + echo " cp conf/caldavd-test.plist conf/caldavd-dev.plist"; exit 1; fi; Modified: CalendarServer/trunk/testcaldav =================================================================== --- CalendarServer/trunk/testcaldav 2006-12-12 22:57:25 UTC (rev 813) +++ CalendarServer/trunk/testcaldav 2006-12-12 22:58:18 UTC (rev 814) @@ -19,13 +19,14 @@ ## wd="$(cd "$(dirname "$0")" && pwd)"; +cdt="${wd}/../CalDAVTester"; ## # Command line handling ## verbose=""; -serverinfo="serverinfo.xml"; +serverinfo="${cdt}/scripts/server/serverinfo.xml"; documentroot="${wd}/twistedcaldav/test/data"; usage () @@ -46,8 +47,8 @@ case "$option" in '?') usage; ;; 'h') usage -; exit 0; ;; - 'd') documentroot=${OPTARG}; ;; - 's') serverinfo=${OPTARG}; ;; + 'd') documentroot="${OPTARG}"; ;; + 's') serverinfo="${OPTARG}"; ;; 'v') verbose="v"; ;; esac; done; @@ -62,17 +63,12 @@ export PYTHONPATH=$("${wd}/run" -p); -cdt="${wd}/../CalDAVTester"; - if [ -d "${cdt}" ]; then svn update "${cdt}"; else svn checkout http://svn.macosforge.org/repository/calendarserver/CalDAVTester/trunk "${cdt}" fi; -cd "${documentroot}/calendars/users/user01/" -tar -zx${verbose}f "${cdt}/Resource/errors/calendar.1000.tgz" +tar -C "${documentroot}/calendars/users/user01/" -x${verbose}zf "${cdt}/Resource/errors/calendar.1000.tgz" -cd "${cdt}"; - -python testcaldav.py -s "${serverinfo}" --all; +cd "${cdt}" && python testcaldav.py -s "${serverinfo}" --all;

1 0

[813] CalendarServer/trunk/run
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 813 http://trac.macosforge.org/projects/calendarserver/changeset/813 Author: wsanchez(a)apple.com Date: 2006-12-12 14:57:25 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Merged from drobpox branch Modified Paths: -------------- CalendarServer/trunk/run Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2006-12-12 22:56:50 UTC (rev 812) +++ CalendarServer/trunk/run 2006-12-12 22:57:25 UTC (rev 813) @@ -171,8 +171,7 @@ if ! "${setup_only}"; then if [ ! -f "${config}" ]; then echo "Missing config file: ${config}"; - echo "You might want to start by copying the test configuration:"; - echo " cp conf/caldavd-test.plist conf/caldavd-dev.plist"; + echo "You might want to copy conf/caldavd-test.plist to conf/caldavd-dev.plist and start from there."; exit 1; fi;

1 0

[812] CalendarServer/trunk/run
by source_changes＠macosforge.org 12 Dec '06

12 Dec '06

Revision: 812 http://trac.macosforge.org/projects/calendarserver/changeset/812 Author: wsanchez(a)apple.com Date: 2006-12-12 14:56:50 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Friendlier (cut & paste friendly) message. Modified Paths: -------------- CalendarServer/trunk/run Modified: CalendarServer/trunk/run =================================================================== --- CalendarServer/trunk/run 2006-12-12 22:49:06 UTC (rev 811) +++ CalendarServer/trunk/run 2006-12-12 22:56:50 UTC (rev 812) @@ -171,7 +171,8 @@ if ! "${setup_only}"; then if [ ! -f "${config}" ]; then echo "Missing config file: ${config}"; - echo "You might want to copy conf/caldavd-test.plist to conf/caldavd-dev.plist and start from there."; + echo "You might want to start by copying the test configuration:"; + echo " cp conf/caldavd-test.plist conf/caldavd-dev.plist"; exit 1; fi;

1 0