[CalendarServer-changes] [7737] CalendarServer/trunk/contrib/performance

[source_changes at macosforge.org]

Revision: 7737
          http://trac.macosforge.org/projects/calendarserver/changeset/7737
Author:   exarkun at twistedmatrix.com
Date:     2011-07-07 12:34:44 -0700 (Thu, 07 Jul 2011)
Log Message:
-----------
Change imports to reflect new CalDAVClientLibrary top-level package

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/httpauth.py
    CalendarServer/trunk/contrib/performance/loadtest/ical.py
    CalendarServer/trunk/contrib/performance/loadtest/profiles.py
    CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
    CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py
    CalendarServer/trunk/contrib/performance/run.sh

Modified: CalendarServer/trunk/contrib/performance/httpauth.py
===================================================================
--- CalendarServer/trunk/contrib/performance/httpauth.py	2011-07-07 19:34:05 UTC (rev 7736)
+++ CalendarServer/trunk/contrib/performance/httpauth.py	2011-07-07 19:34:44 UTC (rev 7737)
@@ -20,8 +20,7 @@
 from twisted.web.http_headers import Headers
 from twisted.web.http import UNAUTHORIZED
 
-# CalDAVClientLibrary
-from protocol.http.authentication.digest import Digest
+from caldavclientlibrary.protocol.http.authentication.digest import Digest
 
 class BasicChallenge(object):
     def __init__(self, realm):

Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py	2011-07-07 19:34:05 UTC (rev 7736)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py	2011-07-07 19:34:44 UTC (rev 7737)
@@ -36,10 +36,10 @@
 from twisted.web.http import OK, MULTI_STATUS, CREATED, NO_CONTENT
 from twisted.web.client import Agent
 
-from protocol.webdav.propfindparser import PropFindParser
-from protocol.webdav.definitions import davxml
-from protocol.caldav.definitions import caldavxml
-from protocol.caldav.definitions import csxml
+from caldavclientlibrary.protocol.webdav.propfindparser import PropFindParser
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.caldav.definitions import csxml
 
 from httpclient import StringProducer, readBody
 from httpauth import AuthHandlerAgent

Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py	2011-07-07 19:34:05 UTC (rev 7736)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py	2011-07-07 19:34:44 UTC (rev 7737)
@@ -28,7 +28,7 @@
 from vobject.base import Component, ContentLine
 from vobject.icalendar import VEvent
 
-from protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
 
 from twisted.python import context
 from twisted.python.log import msg

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2011-07-07 19:34:05 UTC (rev 7736)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py	2011-07-07 19:34:44 UTC (rev 7737)
@@ -29,10 +29,10 @@
 from twisted.web.client import ResponseDone
 from twisted.internet.protocol import ProtocolToConsumerAdapter
 
-from protocol.url import URL
-from protocol.webdav.definitions import davxml
-from protocol.caldav.definitions import caldavxml
-from protocol.caldav.definitions import csxml
+from caldavclientlibrary.protocol.url import URL
+from caldavclientlibrary.protocol.webdav.definitions import davxml
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.caldav.definitions import csxml
 
 from loadtest.ical import XMPPPush, Event, Calendar, SnowLeopard
 from loadtest.sim import _DirectoryRecord

Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py	2011-07-07 19:34:05 UTC (rev 7736)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py	2011-07-07 19:34:44 UTC (rev 7737)
@@ -21,7 +21,7 @@
 
 from vobject import readComponents
 
-from protocol.caldav.definitions import caldavxml
+from caldavclientlibrary.protocol.caldav.definitions import caldavxml
 
 from twisted.trial.unittest import TestCase
 from twisted.internet.task import Clock

Modified: CalendarServer/trunk/contrib/performance/run.sh
===================================================================
--- CalendarServer/trunk/contrib/performance/run.sh	2011-07-07 19:34:05 UTC (rev 7736)
+++ CalendarServer/trunk/contrib/performance/run.sh	2011-07-07 19:34:44 UTC (rev 7737)
@@ -20,6 +20,4 @@
 source support/shell.sh
 popd
 
-export PYTHONPATH=$PYTHONPATH:~/Projects/CalendarServer/CalDAVClientLibrary/src
-
 exec "$@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110707/fd0b13cf/attachment-0001.html>