[CalendarServer-changes] [12100] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:22:05 PDT 2014


Revision: 12100
          http://trac.calendarserver.org//changeset/12100
Author:   wsanchez at apple.com
Date:     2013-12-13 18:44:35 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
Rename twext.web2 -> txweb2 and move it back to CalendarServer repo.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/accesslog.py
    CalendarServer/trunk/calendarserver/provision/root.py
    CalendarServer/trunk/calendarserver/provision/test/test_root.py
    CalendarServer/trunk/calendarserver/push/applepush.py
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/calendarserver/tap/util.py
    CalendarServer/trunk/calendarserver/tools/dkimtool.py
    CalendarServer/trunk/calendarserver/tools/test/test_purge.py
    CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py
    CalendarServer/trunk/calendarserver/webadmin/resource.py
    CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py
    CalendarServer/trunk/calendarserver/webcal/resource.py
    CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py
    CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py
    CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py
    CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py
    CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py
    CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/twistedcaldav/__init__.py
    CalendarServer/trunk/twistedcaldav/authkerb.py
    CalendarServer/trunk/twistedcaldav/bind.py
    CalendarServer/trunk/twistedcaldav/cache.py
    CalendarServer/trunk/twistedcaldav/client/__init__.py
    CalendarServer/trunk/twistedcaldav/client/pool.py
    CalendarServer/trunk/twistedcaldav/client/reverseproxy.py
    CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py
    CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py
    CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py
    CalendarServer/trunk/twistedcaldav/directory/addressbook.py
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
    CalendarServer/trunk/twistedcaldav/directory/calendar.py
    CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
    CalendarServer/trunk/twistedcaldav/directory/common.py
    CalendarServer/trunk/twistedcaldav/directory/digest.py
    CalendarServer/trunk/twistedcaldav/directory/directory.py
    CalendarServer/trunk/twistedcaldav/directory/internal.py
    CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py
    CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
    CalendarServer/trunk/twistedcaldav/directory/principal.py
    CalendarServer/trunk/twistedcaldav/directory/resource.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py
    CalendarServer/trunk/twistedcaldav/directory/test/util.py
    CalendarServer/trunk/twistedcaldav/directory/util.py
    CalendarServer/trunk/twistedcaldav/directory/wiki.py
    CalendarServer/trunk/twistedcaldav/directory/xmlfile.py
    CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
    CalendarServer/trunk/twistedcaldav/dropbox.py
    CalendarServer/trunk/twistedcaldav/extensions.py
    CalendarServer/trunk/twistedcaldav/freebusyurl.py
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/twistedcaldav/icaldav.py
    CalendarServer/trunk/twistedcaldav/linkresource.py
    CalendarServer/trunk/twistedcaldav/memcacheprops.py
    CalendarServer/trunk/twistedcaldav/method/acl.py
    CalendarServer/trunk/twistedcaldav/method/get.py
    CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
    CalendarServer/trunk/twistedcaldav/method/mkcol.py
    CalendarServer/trunk/twistedcaldav/method/post.py
    CalendarServer/trunk/twistedcaldav/method/propfind.py
    CalendarServer/trunk/twistedcaldav/method/report.py
    CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py
    CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py
    CalendarServer/trunk/twistedcaldav/method/report_common.py
    CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
    CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py
    CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py
    CalendarServer/trunk/twistedcaldav/notifications.py
    CalendarServer/trunk/twistedcaldav/resource.py
    CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py
    CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py
    CalendarServer/trunk/twistedcaldav/sharing.py
    CalendarServer/trunk/twistedcaldav/simpleresource.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py
    CalendarServer/trunk/twistedcaldav/storebridge.py
    CalendarServer/trunk/twistedcaldav/test/test_accounting.py
    CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py
    CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py
    CalendarServer/trunk/twistedcaldav/test/test_cache.py
    CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py
    CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py
    CalendarServer/trunk/twistedcaldav/test/test_extensions.py
    CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py
    CalendarServer/trunk/twistedcaldav/test/test_kerberos.py
    CalendarServer/trunk/twistedcaldav/test/test_link.py
    CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py
    CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py
    CalendarServer/trunk/twistedcaldav/test/test_multiget.py
    CalendarServer/trunk/twistedcaldav/test/test_options.py
    CalendarServer/trunk/twistedcaldav/test/test_props.py
    CalendarServer/trunk/twistedcaldav/test/test_resource.py
    CalendarServer/trunk/twistedcaldav/test/test_sharing.py
    CalendarServer/trunk/twistedcaldav/test/test_util.py
    CalendarServer/trunk/twistedcaldav/test/test_wrapping.py
    CalendarServer/trunk/twistedcaldav/test/util.py
    CalendarServer/trunk/twistedcaldav/timezoneservice.py
    CalendarServer/trunk/twistedcaldav/timezonestdservice.py
    CalendarServer/trunk/twistedcaldav/upgrade.py
    CalendarServer/trunk/twistedcaldav/vcard.py
    CalendarServer/trunk/txdav/base/datastore/file.py
    CalendarServer/trunk/txdav/base/propertystore/base.py
    CalendarServer/trunk/txdav/base/propertystore/xattr.py
    CalendarServer/trunk/txdav/caldav/datastore/file.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
    CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py
    CalendarServer/trunk/txdav/caldav/datastore/util.py
    CalendarServer/trunk/txdav/caldav/icalendarstore.py
    CalendarServer/trunk/txdav/caldav/resource.py
    CalendarServer/trunk/txdav/carddav/datastore/file.py
    CalendarServer/trunk/txdav/carddav/datastore/sql.py
    CalendarServer/trunk/txdav/carddav/datastore/test/common.py
    CalendarServer/trunk/txdav/common/datastore/file.py
    CalendarServer/trunk/txdav/common/datastore/sql.py
    CalendarServer/trunk/txdav/common/datastore/test/util.py
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py
    CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py
    CalendarServer/trunk/txdav/idav.py
    CalendarServer/trunk/txdav/xml/base.py
    CalendarServer/trunk/txdav/xml/rfc2518.py
    CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py
    CalendarServer/trunk/txweb2/__init__.py
    CalendarServer/trunk/txweb2/_version.py
    CalendarServer/trunk/txweb2/auth/basic.py
    CalendarServer/trunk/txweb2/auth/digest.py
    CalendarServer/trunk/txweb2/auth/interfaces.py
    CalendarServer/trunk/txweb2/auth/wrapper.py
    CalendarServer/trunk/txweb2/channel/__init__.py
    CalendarServer/trunk/txweb2/channel/http.py
    CalendarServer/trunk/txweb2/client/__init__.py
    CalendarServer/trunk/txweb2/client/http.py
    CalendarServer/trunk/txweb2/client/interfaces.py
    CalendarServer/trunk/txweb2/dav/__init__.py
    CalendarServer/trunk/txweb2/dav/auth.py
    CalendarServer/trunk/txweb2/dav/fileop.py
    CalendarServer/trunk/txweb2/dav/http.py
    CalendarServer/trunk/txweb2/dav/idav.py
    CalendarServer/trunk/txweb2/dav/method/__init__.py
    CalendarServer/trunk/txweb2/dav/method/acl.py
    CalendarServer/trunk/txweb2/dav/method/copymove.py
    CalendarServer/trunk/txweb2/dav/method/delete.py
    CalendarServer/trunk/txweb2/dav/method/delete_common.py
    CalendarServer/trunk/txweb2/dav/method/get.py
    CalendarServer/trunk/txweb2/dav/method/lock.py
    CalendarServer/trunk/txweb2/dav/method/mkcol.py
    CalendarServer/trunk/txweb2/dav/method/prop_common.py
    CalendarServer/trunk/txweb2/dav/method/propfind.py
    CalendarServer/trunk/txweb2/dav/method/proppatch.py
    CalendarServer/trunk/txweb2/dav/method/put.py
    CalendarServer/trunk/txweb2/dav/method/put_common.py
    CalendarServer/trunk/txweb2/dav/method/report.py
    CalendarServer/trunk/txweb2/dav/method/report_acl_principal_prop_set.py
    CalendarServer/trunk/txweb2/dav/method/report_expand.py
    CalendarServer/trunk/txweb2/dav/method/report_principal_match.py
    CalendarServer/trunk/txweb2/dav/method/report_principal_property_search.py
    CalendarServer/trunk/txweb2/dav/method/report_principal_search_property_set.py
    CalendarServer/trunk/txweb2/dav/noneprops.py
    CalendarServer/trunk/txweb2/dav/resource.py
    CalendarServer/trunk/txweb2/dav/static.py
    CalendarServer/trunk/txweb2/dav/test/__init__.py
    CalendarServer/trunk/txweb2/dav/test/test_acl.py
    CalendarServer/trunk/txweb2/dav/test/test_auth.py
    CalendarServer/trunk/txweb2/dav/test/test_copy.py
    CalendarServer/trunk/txweb2/dav/test/test_delete.py
    CalendarServer/trunk/txweb2/dav/test/test_http.py
    CalendarServer/trunk/txweb2/dav/test/test_lock.py
    CalendarServer/trunk/txweb2/dav/test/test_mkcol.py
    CalendarServer/trunk/txweb2/dav/test/test_move.py
    CalendarServer/trunk/txweb2/dav/test/test_options.py
    CalendarServer/trunk/txweb2/dav/test/test_pipeline.py
    CalendarServer/trunk/txweb2/dav/test/test_prop.py
    CalendarServer/trunk/txweb2/dav/test/test_put.py
    CalendarServer/trunk/txweb2/dav/test/test_quota.py
    CalendarServer/trunk/txweb2/dav/test/test_report.py
    CalendarServer/trunk/txweb2/dav/test/test_report_expand.py
    CalendarServer/trunk/txweb2/dav/test/test_resource.py
    CalendarServer/trunk/txweb2/dav/test/test_static.py
    CalendarServer/trunk/txweb2/dav/test/test_util.py
    CalendarServer/trunk/txweb2/dav/test/test_xattrprops.py
    CalendarServer/trunk/txweb2/dav/test/util.py
    CalendarServer/trunk/txweb2/dav/util.py
    CalendarServer/trunk/txweb2/dav/xattrprops.py
    CalendarServer/trunk/txweb2/error.py
    CalendarServer/trunk/txweb2/fileupload.py
    CalendarServer/trunk/txweb2/filter/__init__.py
    CalendarServer/trunk/txweb2/filter/gzip.py
    CalendarServer/trunk/txweb2/filter/location.py
    CalendarServer/trunk/txweb2/filter/range.py
    CalendarServer/trunk/txweb2/http.py
    CalendarServer/trunk/txweb2/http_headers.py
    CalendarServer/trunk/txweb2/iweb.py
    CalendarServer/trunk/txweb2/log.py
    CalendarServer/trunk/txweb2/metafd.py
    CalendarServer/trunk/txweb2/resource.py
    CalendarServer/trunk/txweb2/responsecode.py
    CalendarServer/trunk/txweb2/server.py
    CalendarServer/trunk/txweb2/static.py
    CalendarServer/trunk/txweb2/stream.py
    CalendarServer/trunk/txweb2/test/__init__.py
    CalendarServer/trunk/txweb2/test/test_client.py
    CalendarServer/trunk/txweb2/test/test_fileupload.py
    CalendarServer/trunk/txweb2/test/test_http.py
    CalendarServer/trunk/txweb2/test/test_http_headers.py
    CalendarServer/trunk/txweb2/test/test_httpauth.py
    CalendarServer/trunk/txweb2/test/test_log.py
    CalendarServer/trunk/txweb2/test/test_metafd.py
    CalendarServer/trunk/txweb2/test/test_resource.py
    CalendarServer/trunk/txweb2/test/test_server.py
    CalendarServer/trunk/txweb2/test/test_static.py
    CalendarServer/trunk/txweb2/test/test_stream.py

Added Paths:
-----------
    CalendarServer/trunk/txweb2/

Modified: CalendarServer/trunk/calendarserver/accesslog.py
===================================================================
--- CalendarServer/trunk/calendarserver/accesslog.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/accesslog.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -40,9 +40,9 @@
     getAdjustedClientName
 
 from twext.python.log import Logger
-from twext.web2 import iweb
-from twext.web2.log import BaseCommonAccessLoggingObserver
-from twext.web2.log import LogWrapperResource
+from txweb2 import iweb
+from txweb2.log import BaseCommonAccessLoggingObserver
+from txweb2.log import LogWrapperResource
 
 from twisted.internet import protocol, task
 from twisted.protocols import amp

Modified: CalendarServer/trunk/calendarserver/provision/root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/root.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/provision/root.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,11 +20,11 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.auth.wrapper import UnauthorizedResponse
+from txweb2 import responsecode
+from txweb2.auth.wrapper import UnauthorizedResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.xattrprops import xattrPropertyStore
-from twext.web2.http import HTTPError, StatusResponse, RedirectResponse
+from txweb2.dav.xattrprops import xattrPropertyStore
+from txweb2.http import HTTPError, StatusResponse, RedirectResponse
 
 from twisted.cred.error import LoginFailed, UnauthorizedLogin
 from twisted.internet.defer import inlineCallbacks, returnValue
@@ -91,7 +91,7 @@
             self.responseCache = DisabledCache()
 
         if config.ResponseCompression:
-            from twext.web2.filter import gzip
+            from txweb2.filter import gzip
             self.contentFilters.append((gzip.gzipfilter, True))
 
 

Modified: CalendarServer/trunk/calendarserver/provision/test/test_root.py
===================================================================
--- CalendarServer/trunk/calendarserver/provision/test/test_root.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/provision/test/test_root.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -19,15 +19,15 @@
 from twisted.cred.portal import Portal
 from twisted.internet.defer import inlineCallbacks, maybeDeferred, returnValue
 
-from twext.web2 import http_headers
-from twext.web2 import responsecode
-from twext.web2 import server
-from twext.web2.auth import basic
-from twext.web2.dav import auth
+from txweb2 import http_headers
+from txweb2 import responsecode
+from txweb2 import server
+from txweb2.auth import basic
+from txweb2.dav import auth
 from txdav.xml import element as davxml
-from twext.web2.http import HTTPError
-from twext.web2.iweb import IResponse
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.http import HTTPError
+from txweb2.iweb import IResponse
+from txweb2.test.test_server import SimpleRequest
 
 from twistedcaldav.test.util import TestCase
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource

Modified: CalendarServer/trunk/calendarserver/push/applepush.py
===================================================================
--- CalendarServer/trunk/calendarserver/push/applepush.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/push/applepush.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,12 +18,12 @@
 from twext.internet.ssl import ChainingOpenSSLContextFactory
 from twext.python.log import Logger
 
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.server import parsePOSTData
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.server import parsePOSTData
 from twisted.application import service
 from twisted.internet import protocol
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
@@ -888,7 +888,7 @@
         to add a subscription entry to the database.
 
         @param request: The request to process
-        @type request: L{twext.web2.server.Request}
+        @type request: L{txweb2.server.Request}
         """
 
         token = request.args.get("token", ("",))[0].replace(" ", "").lower()

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -52,15 +52,15 @@
 from twisted.application.service import Service
 from twisted.protocols.amp import AMP
 
-from twext.web2.server import Site
+from txweb2.server import Site
 from twext.python.log import Logger, LogLevel, replaceTwistedLoggers
 from twext.python.filepath import CachingFilePath
 from twext.internet.ssl import ChainingOpenSSLContextFactory
 from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
 from twext.internet.fswatch import DirectoryChangeListener, IDirectoryChangeListenee
-from twext.web2.channel.http import LimitingHTTPFactory, SSLRedirectRequest, \
+from txweb2.channel.http import LimitingHTTPFactory, SSLRedirectRequest, \
     HTTPChannel
-from twext.web2.metafd import ConnectionLimiter, ReportingHTTPService
+from txweb2.metafd import ConnectionLimiter, ReportingHTTPService
 from twext.enterprise.ienterprise import POSTGRES_DIALECT
 from twext.enterprise.ienterprise import ORACLE_DIALECT
 from twext.enterprise.adbapi2 import ConnectionPool
@@ -119,7 +119,7 @@
     from version import version as getVersion
     version = "%s (%s*)" % getVersion()
 
-from twext.web2.server import VERSION as TWISTED_VERSION
+from txweb2.server import VERSION as TWISTED_VERSION
 TWISTED_VERSION = "CalendarServer/%s %s" % (
     version.replace(" ", ""), TWISTED_VERSION,
 )

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -43,8 +43,8 @@
 from twext.python.log import Logger
 from twext.python.filepath import CachingFilePath as FilePath
 from plistlib import writePlist #@UnresolvedImport
-from twext.web2.dav import auth
-from twext.web2.log import LogWrapperResource
+from txweb2.dav import auth
+from txweb2.log import LogWrapperResource
 from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
 
 from twistedcaldav.config import config, ConfigDict, ConfigurationError

Modified: CalendarServer/trunk/calendarserver/tap/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tap/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -34,11 +34,11 @@
 
 from twext.python.filepath import CachingFilePath as FilePath
 from twext.python.log import Logger
-from twext.web2.auth.basic import BasicCredentialFactory
-from twext.web2.dav import auth
-from twext.web2.http_headers import Headers
-from twext.web2.resource import Resource
-from twext.web2.static import File as FileResource
+from txweb2.auth.basic import BasicCredentialFactory
+from txweb2.dav import auth
+from txweb2.http_headers import Headers
+from txweb2.resource import Resource
+from txweb2.static import File as FileResource
 
 from twisted.application.service import Service
 from twisted.cred.portal import Portal

Modified: CalendarServer/trunk/calendarserver/tools/dkimtool.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/dkimtool.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tools/dkimtool.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,9 +24,9 @@
 from twisted.python.usage import Options
 
 from twext.python.log import Logger, LogLevel, StandardIOObserver
-from twext.web2.client.http import ClientRequest
-from twext.web2.http_headers import Headers
-from twext.web2.stream import MemoryStream
+from txweb2.client.http import ClientRequest
+from txweb2.http_headers import Headers
+from txweb2.stream import MemoryStream
 
 from txdav.caldav.datastore.scheduling.ischedule.dkim import RSA256, DKIMRequest, \
     PublicKeyLookup, DKIMVerifier, DKIMVerificationError

Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_purge.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -28,7 +28,7 @@
 from txdav.common.datastore.test.util import populateCalendarsFrom
 from txdav.common.datastore.sql_tables import _BIND_MODE_WRITE
 
-from twext.web2.http_headers import MimeType
+from txweb2.http_headers import MimeType
 
 import os
 

Modified: CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/tools/test/test_purge_old_events.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,7 +25,7 @@
 from pycalendar.timezone import Timezone
 
 from twext.enterprise.dal.syntax import Update, Delete
-from twext.web2.http_headers import MimeType
+from txweb2.http_headers import MimeType
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -36,12 +36,12 @@
 from twistedcaldav.extensions import DAVFile, ReadOnlyResourceMixIn
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
-from twext.web2.http import Response
+from txweb2.http import Response
 from twisted.python.modules import getModule
-from twext.web2.http_headers import MimeType
+from txweb2.http_headers import MimeType
 from zope.interface.declarations import implements
-from twext.web2.stream import MemoryStream
-from twext.web2.http import HTTPError
+from txweb2.stream import MemoryStream
+from txweb2.http import HTTPError
 from txdav.xml import element as davxml
 
 from twisted.web.iweb import ITemplateLoader

Modified: CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -37,8 +37,8 @@
 from txdav.xml.rfc3744 import GroupMemberSet
 from txdav.xml.rfc2518 import DisplayName
 
-from twext.web2.http import HTTPError
-from twext.web2.responsecode import CONFLICT
+from txweb2.http import HTTPError
+from txweb2.responsecode import CONFLICT
 from txdav.xml.rfc2518 import HRef
 from twistedcaldav.directory.directory import DirectoryRecord
 

Modified: CalendarServer/trunk/calendarserver/webcal/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webcal/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/calendarserver/webcal/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -30,12 +30,12 @@
 
 from twisted.internet.defer import succeed
 
-from twext.web2 import responsecode
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 from txdav.xml import element as davxml
-from twext.web2.dav.resource import TwistedACLInheritable
+from txweb2.dav.resource import TwistedACLInheritable
 
 from twistedcaldav.config import config
 from twistedcaldav.extensions import DAVFile, ReadOnlyResourceMixIn

Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py
===================================================================
--- CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/invite.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,7 +17,7 @@
 from caldavclientlibrary.protocol.url import URL
 from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
 from pycalendar.datetime import DateTime
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 from caldavclientlibrary.protocol.webdav.definitions import davxml
 
 ICAL = """BEGIN:VCALENDAR

Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py
===================================================================
--- CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/multiget.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -19,7 +19,7 @@
 from caldavclientlibrary.protocol.http.data.string import ResponseDataString
 from caldavclientlibrary.protocol.webdav.definitions import davxml, statuscodes
 from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 
 class MultigetTest(HTTPTestBase):
     """

Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py
===================================================================
--- CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/put.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,7 +17,7 @@
 from caldavclientlibrary.protocol.url import URL
 from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
 from pycalendar.datetime import DateTime
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 
 ICAL = """BEGIN:VCALENDAR
 CALSCALE:GREGORIAN

Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py
===================================================================
--- CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/query.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,7 +17,7 @@
 from caldavclientlibrary.protocol.url import URL
 from caldavclientlibrary.protocol.webdav.definitions import davxml, statuscodes
 from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 from pycalendar.datetime import DateTime
 from caldavclientlibrary.protocol.caldav.query import QueryVEVENTTimeRange
 from caldavclientlibrary.protocol.http.data.string import ResponseDataString

Modified: CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py
===================================================================
--- CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/requests/sync.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,7 +17,7 @@
 from caldavclientlibrary.protocol.url import URL
 from caldavclientlibrary.protocol.webdav.definitions import davxml
 from contrib.performance.sqlusage.requests.httpTests import HTTPTestBase
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 from pycalendar.datetime import DateTime
 
 ICAL = """BEGIN:VCALENDAR

Modified: CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py
===================================================================
--- CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/contrib/performance/sqlusage/sqlusage.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -28,7 +28,7 @@
 from contrib.performance.sqlusage.requests.query import QueryTest
 from contrib.performance.sqlusage.requests.sync import SyncTest
 from pycalendar.datetime import DateTime
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 import getopt
 import itertools
 import sys

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/support/build.sh	2013-12-14 02:44:35 UTC (rev 12100)
@@ -863,7 +863,7 @@
     "${n}" "twisted" "${p}" \
     "${pypi}/T/${n}/${p}.tar.bz2";
 
-  local v="12078";
+  local v="12094";
   local n="twext";
   local p="${n}-${v}";
   py_dependency -fe -r "${v}" \

Modified: CalendarServer/trunk/twistedcaldav/__init__.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/__init__.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,7 +25,7 @@
 # Load in suitable file extension/content-type map from OS X
 #
 
-from twext.web2.static import File, loadMimeTypes
+from txweb2.static import File, loadMimeTypes
 
 File.contentTypes = loadMimeTypes(("/etc/apache2/mime.types", "/etc/httpd/mime.types",))
 
@@ -45,7 +45,7 @@
 # DefaultHTTPHandler
 #
 
-from twext.web2.http_headers import DefaultHTTPHandler, last, singleHeader
+from txweb2.http_headers import DefaultHTTPHandler, last, singleHeader
 
 DefaultHTTPHandler.updateParsers({
     "If-Schedule-Tag-Match": (last, str),

Modified: CalendarServer/trunk/twistedcaldav/authkerb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/authkerb.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/authkerb.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -42,9 +42,9 @@
 
 from twisted.cred import checkers, credentials, error
 from twisted.internet.defer import succeed
-from twext.web2 import responsecode
-from twext.web2.auth.interfaces import ICredentialFactory
-from twext.web2.dav.auth import IPrincipalCredentials
+from txweb2 import responsecode
+from txweb2.auth.interfaces import ICredentialFactory
+from txweb2.dav.auth import IPrincipalCredentials
 
 from twext.python.log import Logger
 

Modified: CalendarServer/trunk/twistedcaldav/bind.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/bind.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/bind.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -19,16 +19,16 @@
 Have to have this in a separate module for now.
 """
 
-from twext.web2.dav.util import bindMethods
+from txweb2.dav.util import bindMethods
 
 ##
 # Attach methods
 ##
 
 def doBind():
-    import twext.web2.dav.method
-    from twext.web2.dav.resource import DAVResource
-    bindMethods(twext.web2.dav.method, DAVResource)
+    import txweb2.dav.method
+    from txweb2.dav.resource import DAVResource
+    bindMethods(txweb2.dav.method, DAVResource)
 
     import twistedcaldav.method
     from twistedcaldav.resource import CalDAVResource

Modified: CalendarServer/trunk/twistedcaldav/cache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/cache.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/cache.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,10 +15,10 @@
 ##
 
 from twext.python.log import Logger
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http import Response
-from twext.web2.iweb import IResource
-from twext.web2.stream import MemoryStream
+from txweb2.dav.util import allDataFromStream
+from txweb2.http import Response
+from txweb2.iweb import IResource
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/client/__init__.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/client/__init__.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twext.web2.http_headers import DefaultHTTPHandler, tokenize, generateList, singleHeader
+from txweb2.http_headers import DefaultHTTPHandler, tokenize, generateList, singleHeader
 
 DefaultHTTPHandler.updateParsers({
     "x-forwarded-for": (tokenize, list),

Modified: CalendarServer/trunk/twistedcaldav/client/pool.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/client/pool.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/pool.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -33,11 +33,11 @@
 from twisted.internet.error import ConnectionLost, ConnectionDone, ConnectError
 from twisted.internet.protocol import ClientFactory
 
-from twext.web2 import responsecode
-from twext.web2.client.http import HTTPClientProtocol
-from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.client.http import HTTPClientProtocol
+from txweb2.http import StatusResponse, HTTPError
+from txweb2.dav.util import allDataFromStream
+from txweb2.stream import MemoryStream
 
 class PooledHTTPClientFactory(ClientFactory):
     """

Modified: CalendarServer/trunk/twistedcaldav/client/reverseproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/client/reverseproxy.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/reverseproxy.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,10 +20,10 @@
 
 from zope.interface.declarations import implements
 
-from twext.web2 import iweb, responsecode
-from twext.web2.client.http import ClientRequest
-from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.resource import LeafResource
+from txweb2 import iweb, responsecode
+from txweb2.client.http import ClientRequest
+from txweb2.http import StatusResponse, HTTPError
+from txweb2.resource import LeafResource
 
 from twext.python.log import Logger
 

Modified: CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/client/test/test_reverseproxy.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,9 +14,9 @@
 # limitations under the License.
 ##
 
-from twext.web2.client.http import ClientRequest
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.client.http import ClientRequest
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
 from twistedcaldav.client.pool import _clientPools
 from twistedcaldav.client.reverseproxy import ReverseProxyResource
 from twistedcaldav.config import config

Modified: CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/datafilters/privateevents.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,8 +14,8 @@
 # limitations under the License.
 ##
 
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from twistedcaldav.caldavxml import Property, CalendarData, CalendarComponent, \
     AllProperties, AllComponents
 from twistedcaldav.datafilters.calendardata import CalendarDataFilter

Modified: CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/datafilters/test/test_privateevents.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twext.web2.http import HTTPError
+from txweb2.http import HTTPError
 import twistedcaldav.test.util
 from twistedcaldav.datafilters.privateevents import PrivateEventFilter
 from twistedcaldav.ical import Component

Modified: CalendarServer/trunk/twistedcaldav/directory/addressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/addressbook.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/addressbook.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,10 +26,10 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import ETag, MimeType
+from txweb2 import responsecode
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2.http_headers import ETag, MimeType
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -30,7 +30,7 @@
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue
 from twisted.cred.credentials import UsernamePassword
-from twext.web2.auth.digest import DigestedCredentials
+from txweb2.auth.digest import DigestedCredentials
 from twext.python.log import Logger
 
 from twistedcaldav.directory.cachingdirectory import CachingDirectoryService, \

Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -27,10 +27,10 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import ETag, MimeType
+from txweb2 import responsecode
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2.http_headers import ETag, MimeType
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -31,12 +31,12 @@
 import time
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml import element as davxml
 from txdav.xml.base import dav_namespace
-from twext.web2.dav.util import joinURL
-from twext.web2.dav.noneprops import NonePropertyStore
+from txweb2.dav.util import joinURL
+from txweb2.dav.noneprops import NonePropertyStore
 
 from twext.python.log import Logger
 

Modified: CalendarServer/trunk/twistedcaldav/directory/common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/common.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,9 +16,9 @@
 ##
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
-from twext.web2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.dav.util import joinURL
 from twistedcaldav.directory.util import transactionFromRequest, NotFoundResource
 from twistedcaldav.directory.resource import DirectoryReverseProxyResource
 

Modified: CalendarServer/trunk/twistedcaldav/directory/digest.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/digest.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/digest.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,12 +17,12 @@
 
 from twisted.cred import error
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2.auth.digest import DigestCredentialFactory
-from twext.web2.auth.digest import DigestedCredentials
-from twext.web2.http_headers import Token
-from twext.web2.http_headers import parseKeyValue
-from twext.web2.http_headers import split
-from twext.web2.http_headers import tokenize
+from txweb2.auth.digest import DigestCredentialFactory
+from txweb2.auth.digest import DigestedCredentials
+from txweb2.http_headers import Token
+from txweb2.http_headers import parseKeyValue
+from txweb2.http_headers import split
+from txweb2.http_headers import tokenize
 
 from twext.python.log import Logger
 
@@ -35,7 +35,7 @@
 log = Logger()
 
 """
-Overrides twext.web2.auth.digest to allow specifying a qop value as a configuration parameter.
+Overrides txweb2.auth.digest to allow specifying a qop value as a configuration parameter.
 Also adds an sqlite-based credentials cache that is multi-process safe.
 
 """
@@ -121,7 +121,7 @@
 
 class QopDigestCredentialFactory(DigestCredentialFactory):
     """
-    See twext.web2.auth.digest.DigestCredentialFactory
+    See txweb2.auth.digest.DigestCredentialFactory
     """
 
     def __init__(self, algorithm, qop, realm, namespace="DIGESTCREDENTIALS"):
@@ -196,7 +196,7 @@
         @type response: C{str}
         @param response: A string of comma seperated key=value pairs
 
-        @type request: L{twext.web2.server.Request}
+        @type request: L{txweb2.server.Request}
         @param request: the request being processed
 
         @return: L{DigestedCredentials}
@@ -253,7 +253,7 @@
         @param auth:        the response parameters.
         @type auth:         C{dict}
         @param request:     the request being processed.
-        @type request:      L{twext.web2.server.Request}
+        @type request:      L{txweb2.server.Request}
 
         @return:            C{True} if validated.
         @raise LoginFailed: if validation fails.

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -35,8 +35,8 @@
 from twext.enterprise.dal.syntax import Delete
 from twext.enterprise.queue import WorkItem, PeerConnectionPool
 from twext.python.log import Logger
-from twext.web2.dav.auth import IPrincipalCredentials
-from twext.web2.dav.util import joinURL
+from txweb2.dav.auth import IPrincipalCredentials
+from txweb2.dav.util import joinURL
 
 from twisted.cred.checkers import ICredentialsChecker
 from twisted.cred.error import UnauthorizedLogin

Modified: CalendarServer/trunk/twistedcaldav/directory/internal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/internal.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/internal.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,7 +23,7 @@
     "InternalDirectoryService",
 ]
 
-from twext.web2.dav.auth import IPrincipalCredentials
+from txweb2.dav.auth import IPrincipalCredentials
 
 from twisted.cred.error import UnauthorizedLogin
 

Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -60,8 +60,8 @@
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue
 from twisted.internet.threads import deferToThread
 from twext.python.log import Logger
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
 
 class LdapDirectoryService(CachingDirectoryService):
     """

Modified: CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -46,9 +46,9 @@
 from twext.python.filepath import CachingFilePath as FilePath
 from txdav.xml import element as davxml
 from txdav.xml.base import twisted_dav_namespace, dav_namespace, parse_date, twisted_private_namespace
-from twext.web2.dav.resource import DAVPropertyMixIn
-from twext.web2.dav.util import joinURL
-from twext.web2.http_headers import MimeType, generateContentType, ETag
+from txweb2.dav.resource import DAVPropertyMixIn
+from txweb2.dav.util import joinURL
+from txweb2.http_headers import MimeType, generateContentType, ETag
 
 
 from twistedcaldav import customxml, carddavxml

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -38,12 +38,12 @@
 from twisted.web.template import XMLFile, Element, renderer, tags
 from twistedcaldav.directory.util import NotFoundResource
 
-from twext.web2.auth.digest import DigestedCredentials
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
+from txweb2.auth.digest import DigestedCredentials
+from txweb2 import responsecode
+from txweb2.http import HTTPError
 from txdav.xml import element as davxml
-from twext.web2.dav.util import joinURL
-from twext.web2.dav.noneprops import NonePropertyStore
+from txweb2.dav.util import joinURL
+from txweb2.dav.noneprops import NonePropertyStore
 
 from twext.python.log import Logger
 

Modified: CalendarServer/trunk/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,7 +18,7 @@
 Implements a directory-backed principal hierarchy.
 """
 
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 
 from twistedcaldav.client.reverseproxy import ReverseProxyResource
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_digest.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,16 +21,16 @@
 from twisted.internet import address
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python import failure
-from twext.web2.auth import digest
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.auth import digest
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.test.test_server import SimpleRequest
 
 from twistedcaldav.directory.digest import QopDigestCredentialFactory
 from twistedcaldav.test.util import TestCase
 from twistedcaldav.config import config
-from twext.web2.auth.digest import DigestCredentialFactory
-from twext.web2.test.test_httpauth import makeDigestDeterministic
-from twext.web2.test.test_httpauth import FAKE_STATIC_NONCE
+from txweb2.auth.digest import DigestCredentialFactory
+from txweb2.test.test_httpauth import makeDigestDeterministic
+from txweb2.test.test_httpauth import FAKE_STATIC_NONCE
 
 class FakeDigestCredentialFactory(QopDigestCredentialFactory):
     """

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_guidchange.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,8 +18,8 @@
 from twistedcaldav.directory.directory import DirectoryService
 
 from txdav.xml import element as davxml
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.test.test_server import SimpleRequest
 
 from twistedcaldav.directory.test.util import maybeCommit
 from twistedcaldav.test.util import TestCase, xmlFile

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,7 +21,7 @@
 else:
     from calendarserver.platform.darwin.od import dsattributes
     from collections import defaultdict
-    from twext.web2.auth.digest import DigestedCredentials
+    from txweb2.auth.digest import DigestedCredentials
     from twisted.internet.defer import inlineCallbacks
     from twisted.python.runtime import platform
     from twisted.trial.unittest import SkipTest

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,10 +20,10 @@
 from twisted.cred.credentials import UsernamePassword
 from twisted.internet.defer import inlineCallbacks
 from txdav.xml import element as davxml
-from twext.web2.dav.fileop import rmdir
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.dav.fileop import rmdir
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
 
 from twistedcaldav.cache import DisabledCacheNotifier
 from twistedcaldav.caldavxml import caldav_namespace

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_wiki.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,8 +20,8 @@
 )
 from twisted.internet.defer import inlineCallbacks, succeed
 from twisted.web.xmlrpc import Fault
-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
+from txweb2.http import HTTPError
+from txweb2 import responsecode
 from twistedcaldav.config import config
 from twisted.web.error import Error as WebError
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,7 +16,7 @@
 
 from twisted.trial.unittest import SkipTest
 from twisted.cred.credentials import UsernamePassword
-from twext.web2.auth.digest import DigestedCredentials, calcResponse, calcHA1
+from txweb2.auth.digest import DigestedCredentials, calcResponse, calcHA1
 
 from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.directory.directory import UnknownRecordTypeError

Modified: CalendarServer/trunk/twistedcaldav/directory/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -27,10 +27,10 @@
 
 from twext.enterprise.ienterprise import AlreadyFinishedError
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav.resource import DAVResource
-from twext.web2.http import StatusResponse
+from txweb2 import responsecode
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.resource import DAVResource
+from txweb2.http import StatusResponse
 from twisted.internet.defer import inlineCallbacks, returnValue
 from txdav.xml import element as davxml
 from uuid import UUID, uuid5

Modified: CalendarServer/trunk/twistedcaldav/directory/wiki.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/wiki.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/wiki.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -27,10 +27,10 @@
 
 from twext.internet.gaiendpoint import MultiFailure
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.http import HTTPError, StatusResponse
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.web.error import Error as WebError

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -29,7 +29,7 @@
 import types
 
 from twisted.cred.credentials import UsernamePassword
-from twext.web2.auth.digest import DigestedCredentials
+from txweb2.auth.digest import DigestedCredentials
 from twext.python.filepath import CachingFilePath as FilePath
 from twistedcaldav.config import config
 from twisted.internet.defer import succeed

Modified: CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,10 +23,10 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.http import HTTPError, StatusResponse
 
 from twisted.internet.defer import succeed, inlineCallbacks, maybeDeferred, returnValue
 from twisted.python.reflect import namedClass

Modified: CalendarServer/trunk/twistedcaldav/dropbox.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dropbox.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/dropbox.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,11 +24,11 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.resource import DAVResource, TwistedACLInheritable
-from twext.web2.dav.util import joinURL
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.resource import DAVResource, TwistedACLInheritable
+from txweb2.dav.util import joinURL
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -40,23 +40,23 @@
 from twisted.web.template import Element, XMLFile, renderer, tags, flattenString
 from twisted.python.modules import getModule
 
-from twext.web2 import responsecode, server
-from twext.web2.http import HTTPError, Response, RedirectResponse
-from twext.web2.http import StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import FileStream
-from twext.web2.static import MetaDataMixin, StaticRenderMixin
+from txweb2 import responsecode, server
+from txweb2.http import HTTPError, Response, RedirectResponse
+from txweb2.http import StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import FileStream
+from txweb2.static import MetaDataMixin, StaticRenderMixin
 from txdav.xml import element
 from txdav.xml.base import encodeXMLName
 from txdav.xml.element import dav_namespace
-from twext.web2.dav.http import MultiStatusResponse
-from twext.web2.dav.static import DAVFile as SuperDAVFile
-from twext.web2.dav.resource import DAVResource as SuperDAVResource
-from twext.web2.dav.resource import (
+from txweb2.dav.http import MultiStatusResponse
+from txweb2.dav.static import DAVFile as SuperDAVFile
+from txweb2.dav.resource import DAVResource as SuperDAVResource
+from txweb2.dav.resource import (
     DAVPrincipalResource as SuperDAVPrincipalResource
 )
 from twisted.internet.defer import gatherResults
-from twext.web2.dav.method import prop_common
+from txweb2.dav.method import prop_common
 
 from twext.python.log import Logger
 
@@ -541,7 +541,7 @@
                    SuperDAVResource,
                    DirectoryRenderingMixIn, StaticRenderMixin):
     """
-    Extended L{twext.web2.dav.resource.DAVResource} implementation.
+    Extended L{txweb2.dav.resource.DAVResource} implementation.
 
     Note we add StaticRenderMixin as a base class because we need all the etag etc behavior
     that is currently in static.py but is actually applicable to any type of resource.
@@ -577,7 +577,7 @@
 
 class DAVResourceWithChildrenMixin (object):
     """
-    Bits needed from twext.web2.static
+    Bits needed from txweb2.static
     """
 
     def __init__(self, principalCollections=None):
@@ -646,7 +646,7 @@
 
 class DAVResourceWithoutChildrenMixin (object):
     """
-    Bits needed from twext.web2.static
+    Bits needed from txweb2.static
     """
 
     def __init__(self, principalCollections=None):
@@ -670,7 +670,7 @@
                             SuperDAVPrincipalResource,
                             DirectoryRenderingMixIn):
     """
-    Extended L{twext.web2.dav.static.DAVFile} implementation.
+    Extended L{txweb2.dav.static.DAVFile} implementation.
     """
     log = Logger()
 
@@ -761,7 +761,7 @@
 
 class DAVFile (SuperDAVFile, DirectoryRenderingMixIn):
     """
-    Extended L{twext.web2.dav.static.DAVFile} implementation.
+    Extended L{txweb2.dav.static.DAVFile} implementation.
     """
     log = Logger()
 

Modified: CalendarServer/trunk/twistedcaldav/freebusyurl.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/freebusyurl.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/freebusyurl.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,15 +25,15 @@
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError
-from twext.web2.http import Response
-from twext.web2.http import StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError
+from txweb2.http import Response
+from txweb2.http import StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twistedcaldav import caldavxml
 from twistedcaldav.caldavxml import TimeRange

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -35,8 +35,8 @@
 import uuid
 
 from twext.python.log import Logger
-from twext.web2.stream import IStream
-from twext.web2.dav.util import allDataFromStream
+from txweb2.stream import IStream
+from txweb2.dav.util import allDataFromStream
 
 from twistedcaldav.config import config
 from twistedcaldav.dateops import timeRangesOverlap, normalizeForIndex, differenceDateTime, \

Modified: CalendarServer/trunk/twistedcaldav/icaldav.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/icaldav.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/icaldav.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,7 +23,7 @@
     "ICalendarPrincipalResource",
 ]
 
-from twext.web2.dav.idav import IDAVResource
+from txweb2.dav.idav import IDAVResource
 
 class ICalDAVResource(IDAVResource):
     """

Modified: CalendarServer/trunk/twistedcaldav/linkresource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/linkresource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/linkresource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,10 +16,10 @@
 
 
 from twext.python.log import Logger
-from twext.web2 import responsecode, server, http
+from txweb2 import responsecode, server, http
 from txdav.xml import element as davxml
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.resource import WrapperResource
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.resource import WrapperResource
 
 from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
 

Modified: CalendarServer/trunk/twistedcaldav/memcacheprops.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/memcacheprops.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/memcacheprops.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -34,8 +34,8 @@
 
 from twext.python.log import Logger
 from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 
 from txdav.xml.base import encodeXMLName
 

Modified: CalendarServer/trunk/twistedcaldav/method/acl.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/acl.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/acl.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,9 +22,9 @@
 
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/method/get.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/get.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/get.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,14 +21,14 @@
 __all__ = ["http_GET"]
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twistedcaldav.config import config
 from twistedcaldav.customxml import calendarserver_namespace

Modified: CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcalendar.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/mkcalendar.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,15 +23,15 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python.failure import Failure
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
+from txweb2.dav.util import davXMLFromStream
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError, StatusResponse
 
 from twext.python.log import Logger
-from twext.web2.dav.http import ErrorResponse
+from txweb2.dav.http import ErrorResponse
 
 from twistedcaldav import caldavxml
 

Modified: CalendarServer/trunk/twistedcaldav/method/mkcol.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcol.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/mkcol.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,14 +25,14 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.http import Response
-from twext.web2.dav.http import ErrorResponse, PropertyStatusResponseQueue
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError
-from twext.web2.http import StatusResponse
+from txweb2.http import Response
+from txweb2.dav.http import ErrorResponse, PropertyStatusResponseQueue
+from txweb2.dav.util import davXMLFromStream
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError
+from txweb2.http import StatusResponse
 
 from twistedcaldav import caldavxml, carddavxml, mkcolxml
 from twistedcaldav.config import config
@@ -100,7 +100,7 @@
         doc = (yield davXMLFromStream(request.stream))
     except ValueError, e:
         log.error("Error while handling MKCOL: %s" % (e,))
-        # TODO: twext.web2.dav 'MKCOL' tests demand this particular response
+        # TODO: txweb2.dav 'MKCOL' tests demand this particular response
         # code, but should we really be looking at the XML content or the
         # content-type header?  It seems to me like this ought to be considered
         # a BAD_REQUEST if it claims to be XML but isn't, but an

Modified: CalendarServer/trunk/twistedcaldav/method/post.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/post.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/post.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,8 +21,8 @@
 
 __all__ = ["http_POST"]
 
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse
+from txweb2 import responsecode
+from txweb2.http import StatusResponse
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/method/propfind.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/propfind.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/propfind.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_prop.PROP.test_PROPFIND -*-
+# -*- test-case-name: txweb2.dav.test.test_prop.PROP.test_PROPFIND -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -29,13 +29,13 @@
 
 from twisted.python.failure import Failure
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse
+from txweb2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import StatusResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.http import MultiStatusResponse, statusForFailure, \
+from txweb2.dav.http import MultiStatusResponse, statusForFailure, \
     ErrorResponse
-from twext.web2.dav.util import normalizeURL, davXMLFromStream, parentForURL
+from txweb2.dav.util import normalizeURL, davXMLFromStream, parentForURL
 
 from twext.python.log import Logger
 

Modified: CalendarServer/trunk/twistedcaldav/method/report.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -29,15 +29,15 @@
 import string
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav.util import davXMLFromStream
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.dav.util import davXMLFromStream
 from txdav.xml import element as davxml
 from txdav.xml.base import encodeXMLName
 from txdav.xml.element import lookupElement
 
 from twext.python.log import Logger
-from twext.web2.dav.http import ErrorResponse
+from txweb2.dav.http import ErrorResponse
 
 from twistedcaldav import caldavxml
 

Modified: CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,12 +26,12 @@
 from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError, StatusResponse
 
 from twistedcaldav import carddavxml
 from twistedcaldav.config import config

Modified: CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,12 +24,12 @@
     maybeDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.http import MultiStatusResponse
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.dav.http import MultiStatusResponse
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError, StatusResponse
 
 from twistedcaldav import caldavxml
 from twistedcaldav.caldavxml import caldav_namespace, MaxInstances, \

Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -38,15 +38,15 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
 from twisted.python.failure import Failure
-from twext.web2 import responsecode
+from txweb2 import responsecode
 
 from txdav.xml import element
-from twext.web2.dav.http import statusForFailure
-from twext.web2.dav.method.propfind import propertyName
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.http import HTTPError
+from txweb2.dav.http import statusForFailure
+from txweb2.dav.method.propfind import propertyName
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.http import HTTPError
 
 from twext.python.log import Logger
 

Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_freebusy.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_freebusy.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,12 +23,12 @@
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.http import HTTPError, Response, StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.http import HTTPError, Response, StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twistedcaldav import caldavxml
 from twistedcaldav.ical import Component

Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,12 +23,12 @@
 from urllib import unquote
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
 from txdav.xml.base import dav_namespace
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.http import HTTPError, StatusResponse
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,13 +25,13 @@
 
 from twext.python.log import Logger
 from txdav.xml import element
-from twext.web2.dav.http import ErrorResponse
-from twext.web2 import responsecode
-from twext.web2.dav.http import MultiStatusResponse, statusForFailure
-from twext.web2.dav.method.prop_common import responseForHref
-from twext.web2.dav.method.propfind import propertyName
-from twext.web2.dav.util import joinURL
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.dav.http import ErrorResponse
+from txweb2 import responsecode
+from txweb2.dav.http import MultiStatusResponse, statusForFailure
+from txweb2.dav.method.prop_common import responseForHref
+from txweb2.dav.method.propfind import propertyName
+from txweb2.dav.util import joinURL
+from txweb2.http import HTTPError, StatusResponse
 
 from twistedcaldav.config import config
 

Modified: CalendarServer/trunk/twistedcaldav/notifications.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notifications.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/notifications.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,7 +24,7 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue,\

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -46,17 +46,17 @@
 from txdav.xml import element
 from txdav.xml.element import dav_namespace
 
-from twext.web2 import responsecode, http, http_headers
-from twext.web2.dav.auth import AuthenticationWrapper as SuperAuthenticationWrapper
-from twext.web2.dav.idav import IDAVPrincipalCollectionResource
-from twext.web2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource, \
+from txweb2 import responsecode, http, http_headers
+from txweb2.dav.auth import AuthenticationWrapper as SuperAuthenticationWrapper
+from txweb2.dav.idav import IDAVPrincipalCollectionResource
+from txweb2.dav.resource import AccessDeniedError, DAVPrincipalCollectionResource, \
     davPrivilegeSet
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.util import joinURL, parentForURL, normalizeURL
-from twext.web2.http import HTTPError, RedirectResponse, StatusResponse, Response
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.http_headers import MimeType, ETag
-from twext.web2.stream import MemoryStream
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.util import joinURL, parentForURL, normalizeURL
+from txweb2.http import HTTPError, RedirectResponse, StatusResponse, Response
+from txweb2.dav.http import ErrorResponse
+from txweb2.http_headers import MimeType, ETag
+from txweb2.stream import MemoryStream
 
 from twistedcaldav import caldavxml, customxml
 from twistedcaldav import carddavxml
@@ -322,7 +322,7 @@
         successfully rendered.
 
         @param request: the request to generate a response for.
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
         @param transaction: optional transaction to use instead of associated transaction
         @type transaction: L{txdav.caldav.idav.ITransaction}
         """
@@ -1354,7 +1354,7 @@
             if self.exists() and hasattr(self, "scheduleEtags"):
                 etags = self.scheduleEtags
                 if len(etags) > 1:
-                    # This is almost verbatim from twext.web2.static.checkPreconditions
+                    # This is almost verbatim from txweb2.static.checkPreconditions
                     if request.method not in ("GET", "HEAD"):
 
                         # Always test against the current etag first just in case schedule-etags is out of sync
@@ -1402,7 +1402,7 @@
         @param request: the request used to look up parent resources to
             validate.
 
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
 
         @return: a deferred that fires when a calendar collection has been
             created in this resource.
@@ -1488,7 +1488,7 @@
         @param request: the request used to look up parent resources to
             validate.
 
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
 
         @return: a deferred that fires when an addressbook collection has been
             created in this resource.

Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -33,11 +33,11 @@
 # around that for now.
 __import__("twistedcaldav.stdconfig") # FIXME
 
-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.resource import davPrivilegeSet
-from twext.web2.dav.util import joinURL, normalizeURL
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.resource import davPrivilegeSet
+from txweb2.dav.util import joinURL, normalizeURL
+from txweb2.http import HTTPError
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twisted.python.failure import Failure

Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.test.test_server import SimpleRequest
 
 from twisted.internet.defer import inlineCallbacks
 
@@ -22,7 +22,7 @@
 from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
 
 from txdav.xml import element as davxml
-from twext.web2.http import HTTPError
+from txweb2.http import HTTPError
 
 class Properties (StoreTestCase):
     """

Modified: CalendarServer/trunk/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sharing.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/sharing.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,11 +25,11 @@
     "SharedHomeMixin",
 ]
 
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, Response, XMLResponse
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.util import allDataFromStream, joinURL
+from txweb2 import responsecode
+from txweb2.http import HTTPError, Response, XMLResponse
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.util import allDataFromStream, joinURL
 
 from txdav.common.datastore.sql_tables import _BIND_MODE_OWN, \
     _BIND_MODE_READ, _BIND_MODE_WRITE, _BIND_STATUS_INVITED, \
@@ -142,7 +142,7 @@
 
         @return: the (asynchronous) HTTP result to respond to the direct-share
             request.
-        @rtype: L{Deferred} firing L{twext.web2.http.Response}, failing with
+        @rtype: L{Deferred} firing L{txweb2.http.Response}, failing with
             L{HTTPError}
         """
 
@@ -299,13 +299,13 @@
         underlying shared collection.
 
         @param request: the request used to locate the owner resource.
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
 
         @param args: The arguments for
-            L{twext.web2.dav.idav.IDAVResource.accessControlList}
+            L{txweb2.dav.idav.IDAVResource.accessControlList}
 
         @param kwargs: The keyword arguments for
-            L{twext.web2.dav.idav.IDAVResource.accessControlList}, plus
+            L{txweb2.dav.idav.IDAVResource.accessControlList}, plus
             keyword-only arguments.
 
         @return: the appropriate WebDAV ACL for the sharee

Modified: CalendarServer/trunk/twistedcaldav/simpleresource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/simpleresource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/simpleresource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,9 +26,9 @@
     "SimpleDataResource",
 ]
 
-from twext.web2 import http
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import Response
+from txweb2 import http
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import Response
 
 from twisted.internet.defer import succeed
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,7 +24,7 @@
 
 from plistlib import PlistParser #@UnresolvedImport
 from twext.python.log import Logger, InvalidLogLevelError, LogLevel
-from twext.web2.dav.resource import TwistedACLInheritable
+from txweb2.dav.resource import TwistedACLInheritable
 
 from txdav.xml import element as davxml
 
@@ -1011,7 +1011,7 @@
     "FreeBusyIndexDelayedExpand": True,
 
     # The RootResource uses a twext property store. Specify the class here
-    "RootResourcePropStoreClass": "twext.web2.dav.xattrprops.xattrPropertyStore",
+    "RootResourcePropStoreClass": "txweb2.dav.xattrprops.xattrPropertyStore",
 
     # Used in the command line utilities to specify which service class to
     # use to carry out work.

Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/storebridge.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -19,20 +19,20 @@
 
 from twext.enterprise.locking import LockTimeout
 from twext.python.log import Logger
-from twext.web2 import responsecode, http_headers, http
-from twext.web2.dav.http import ErrorResponse, ResponseQueue, MultiStatusResponse
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.resource import TwistedACLInheritable, AccessDeniedError, \
+from txweb2 import responsecode, http_headers, http
+from txweb2.dav.http import ErrorResponse, ResponseQueue, MultiStatusResponse
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.dav.resource import TwistedACLInheritable, AccessDeniedError, \
     davPrivilegeSet
-from twext.web2.dav.util import parentForURL, allDataFromStream, joinURL, davXMLFromStream
-from twext.web2.filter.location import addLocation
-from twext.web2.http import HTTPError, StatusResponse, Response
-from twext.web2.http_headers import ETag, MimeType, MimeDisposition
-from twext.web2.iweb import IResponse
-from twext.web2.responsecode import \
+from txweb2.dav.util import parentForURL, allDataFromStream, joinURL, davXMLFromStream
+from txweb2.filter.location import addLocation
+from txweb2.http import HTTPError, StatusResponse, Response
+from txweb2.http_headers import ETag, MimeType, MimeDisposition
+from txweb2.iweb import IResponse
+from txweb2.responsecode import \
     FORBIDDEN, NO_CONTENT, NOT_FOUND, CREATED, CONFLICT, PRECONDITION_FAILED, \
     BAD_REQUEST, OK, INSUFFICIENT_STORAGE_SPACE, SERVICE_UNAVAILABLE
-from twext.web2.stream import ProducerStream, readStream, MemoryStream
+from txweb2.stream import ProducerStream, readStream, MemoryStream
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue, maybeDeferred
 from twisted.internet.protocol import Protocol
@@ -450,12 +450,12 @@
             this is the request which I{triggered} the C{DELETE}, but which may
             not actually be a C{DELETE} request itself.
 
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
 
         @return: an HTTP response suitable for sending to a client (or
             including in a multi-status).
 
-        @rtype: something adaptable to L{twext.web2.iweb.IResponse}
+        @rtype: something adaptable to L{txweb2.iweb.IResponse}
         """
 
         # Check sharee collection first
@@ -2487,7 +2487,7 @@
         Move this object to a different parent.
 
         @param request:
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
         @param destinationparent: Parent to move to
         @type destinationparent: L{CommonHomeChild}
         @param destination_name: name of new resource
@@ -2506,12 +2506,12 @@
         @param request: Unused by this implementation; present for signature
             compatibility with L{CalendarCollectionResource.storeRemove}.
 
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
 
         @return: an HTTP response suitable for sending to a client (or
             including in a multi-status).
 
-         @rtype: something adaptable to L{twext.web2.iweb.IResponse}
+         @rtype: something adaptable to L{txweb2.iweb.IResponse}
         """
 
         # Do delete
@@ -2722,7 +2722,7 @@
             if self.exists():
                 etags = self.scheduleEtags
                 if len(etags) > 1:
-                    # This is almost verbatim from twext.web2.static.checkPreconditions
+                    # This is almost verbatim from txweb2.static.checkPreconditions
                     if request.method not in ("GET", "HEAD"):
 
                         # Always test against the current etag first just in case schedule-etags is out of sync
@@ -3514,13 +3514,13 @@
         "direct" shares are not supported.
 
         @param request: the request used to locate the owner resource.
-        @type request: L{twext.web2.iweb.IRequest}
+        @type request: L{txweb2.iweb.IRequest}
 
         @param args: The arguments for
-            L{twext.web2.dav.idav.IDAVResource.accessControlList}
+            L{txweb2.dav.idav.IDAVResource.accessControlList}
 
         @param kwargs: The keyword arguments for
-            L{twext.web2.dav.idav.IDAVResource.accessControlList}, plus
+            L{txweb2.dav.idav.IDAVResource.accessControlList}, plus
             keyword-only arguments.
 
         @return: the appropriate WebDAV ACL for the sharee

Modified: CalendarServer/trunk/twistedcaldav/test/test_accounting.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_accounting.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_accounting.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,9 +14,9 @@
 # limitations under the License.
 ##
 
-from twext.web2.channel.http import HTTPLoggingChannelRequest
-from twext.web2 import http_headers
-from twext.web2.channel.http import HTTPChannel
+from txweb2.channel.http import HTTPLoggingChannelRequest
+from txweb2 import http_headers
+from txweb2.channel.http import HTTPChannel
 from twistedcaldav.accounting import emitAccounting
 from twistedcaldav.config import config
 import twistedcaldav.test.util

Modified: CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_addressbookmultiget.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,11 +16,11 @@
 
 import os
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2.dav.util import davXMLFromStream, joinURL
-from twext.web2.http_headers import Headers, MimeType
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2.dav.util import davXMLFromStream, joinURL
+from txweb2.http_headers import Headers, MimeType
 
 from twistedcaldav import carddavxml
 from twistedcaldav import vcard

Modified: CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_addressbookquery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,11 +16,11 @@
 
 import os
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 from txdav.xml import element as davxml
-from twext.web2.dav.util import davXMLFromStream, joinURL
+from txweb2.dav.util import davXMLFromStream, joinURL
 
 from twistedcaldav import carddavxml, vcard
 from twistedcaldav.config import config

Modified: CalendarServer/trunk/twistedcaldav/test/test_cache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_cache.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_cache.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,9 +20,9 @@
 
 from twisted.internet.defer import succeed, maybeDeferred, inlineCallbacks
 
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.stream import MemoryStream
-from twext.web2.http_headers import Headers
+from txweb2.dav.util import allDataFromStream
+from txweb2.stream import MemoryStream
+from txweb2.http_headers import Headers
 
 from txdav.xml import element as davxml
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_calendarquery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,11 +18,11 @@
 
 from twisted.trial.unittest import SkipTest
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 from txdav.xml import element as davxml
-from twext.web2.dav.util import davXMLFromStream
+from txweb2.dav.util import davXMLFromStream
 
 from twistedcaldav import caldavxml
 from twistedcaldav import ical

Modified: CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_collectioncontents.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,10 +16,10 @@
 
 from twisted.internet.defer import inlineCallbacks
 from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream, FileStream
-from twext.web2.http_headers import MimeType
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream, FileStream
+from txweb2.http_headers import MimeType
 
 from twistedcaldav.ical import Component
 from twistedcaldav.memcachelock import MemcacheLock
@@ -27,7 +27,7 @@
 
 
 from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest
-from twext.web2.dav.util import joinURL
+from txweb2.dav.util import joinURL
 from txdav.caldav.datastore.sql import CalendarObject
 
 class CollectionContents(StoreTestCase):

Modified: CalendarServer/trunk/twistedcaldav/test/test_extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_extensions.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_extensions.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,8 +16,8 @@
 ##
 
 from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2.http_headers import MimeType
-from twext.web2.static import MetaDataMixin
+from txweb2.http_headers import MimeType
+from txweb2.static import MetaDataMixin
 
 from twisted.internet.defer import inlineCallbacks, Deferred, succeed
 from twisted.web.microdom import parseString

Modified: CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_freebusyquery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,11 +21,11 @@
 
 from twext.python.filepath import CachingFilePath as FilePath
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.test.test_server import SimpleRequest
 
 import twistedcaldav.test.util
 from twistedcaldav import caldavxml

Modified: CalendarServer/trunk/twistedcaldav/test/test_kerberos.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_kerberos.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_kerberos.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,7 +17,7 @@
 from twisted.cred.error import LoginFailed
 from twisted.cred.error import UnauthorizedLogin
 from twisted.internet.defer import inlineCallbacks
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.test.test_server import SimpleRequest
 
 from twistedcaldav import authkerb
 import twistedcaldav.test.util

Modified: CalendarServer/trunk/twistedcaldav/test/test_link.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_link.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_link.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,9 +14,9 @@
 # limitations under the License.
 ##
 
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
 
 from twisted.internet.defer import inlineCallbacks, succeed
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_memcacheprops.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,7 +26,7 @@
 
 import os
 
-from twext.web2.http import HTTPError
+from txweb2.http import HTTPError
 
 from txdav.xml.base import encodeXMLName
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_mkcalendar.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,11 +18,11 @@
 
 from twisted.internet.defer import inlineCallbacks
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 from txdav.xml import element as davxml
-from twext.web2.dav.fileop import rmdir
+from txweb2.dav.fileop import rmdir
 
 from twistedcaldav import caldavxml
 from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest

Modified: CalendarServer/trunk/twistedcaldav/test/test_multiget.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_multiget.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_multiget.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,11 +14,11 @@
 ##
 
 from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2 import responsecode
-from twext.web2.dav.util import davXMLFromStream, joinURL
-from twext.web2.http_headers import Headers, MimeType
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.dav.util import davXMLFromStream, joinURL
+from txweb2.http_headers import Headers, MimeType
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_options.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_options.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_options.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,8 +14,8 @@
 # limitations under the License.
 ##
 
-from twext.web2.iweb import IResponse
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.iweb import IResponse
+from txweb2.test.test_server import SimpleRequest
 
 import twistedcaldav.test.util
 from twistedcaldav.config import config

Modified: CalendarServer/trunk/twistedcaldav/test/test_props.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_props.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_props.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,10 +14,10 @@
 # limitations under the License.
 ##
 
-from twext.web2 import responsecode, http_headers
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode, http_headers
+from txweb2.dav.util import davXMLFromStream
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 
 from twistedcaldav import caldavxml
 from twistedcaldav.test.util import StoreTestCase, SimpleStoreRequest

Modified: CalendarServer/trunk/twistedcaldav/test/test_resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,8 +15,8 @@
 ##
 
 from txdav.xml.element import HRef, Principal, Unauthenticated
-from twext.web2.http import HTTPError
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.http import HTTPError
+from txweb2.test.test_server import SimpleRequest
 
 from twisted.internet.defer import inlineCallbacks
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_sharing.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_sharing.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,10 +14,10 @@
 # limitations under the License.
 ##
 
-from twext.web2 import responsecode
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http_headers import MimeType
-from twext.web2.iweb import IResponse
+from txweb2 import responsecode
+from txweb2.dav.util import allDataFromStream
+from txweb2.http_headers import MimeType
+from txweb2.iweb import IResponse
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twext.web2.http_headers import Headers
+from txweb2.http_headers import Headers
 
 import twistedcaldav.test.util
 from twistedcaldav.util import bestAcceptType

Modified: CalendarServer/trunk/twistedcaldav/test/test_wrapping.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_wrapping.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/test_wrapping.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,12 +21,12 @@
 
 from twext.enterprise.ienterprise import AlreadyFinishedError
 from twext.enterprise.locking import NamedLock
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import Headers, MimeType
-from twext.web2.responsecode import INSUFFICIENT_STORAGE_SPACE
-from twext.web2.responsecode import UNAUTHORIZED
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.http_headers import Headers, MimeType
+from txweb2.responsecode import INSUFFICIENT_STORAGE_SPACE
+from txweb2.responsecode import UNAUTHORIZED
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.defer import maybeDeferred

Modified: CalendarServer/trunk/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/test/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -27,9 +27,9 @@
 from twisted.internet.protocol import ProcessProtocol
 
 from twext.python.filepath import CachingFilePath as FilePath
-import twext.web2.dav.test.util
+import txweb2.dav.test.util
 from txdav.xml import element as davxml, element
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.http import HTTPError, StatusResponse
 
 from twistedcaldav import memcacher
 from twistedcaldav.memcacheclient import ClientFactory
@@ -52,7 +52,7 @@
 from twext.python.log import Logger
 from txdav.caldav.datastore.test.util import buildCalendarStore
 from calendarserver.tap.util import getRootResource, directoryFromConfig
-from twext.web2.dav.test.util import SimpleRequest
+from txweb2.dav.test.util import SimpleRequest
 from twistedcaldav.directory.util import transactionFromRequest
 from twistedcaldav.directory.directory import DirectoryService
 
@@ -187,7 +187,7 @@
 
 
 
-class StoreTestCase(CommonCommonTests, twext.web2.dav.test.util.TestCase):
+class StoreTestCase(CommonCommonTests, txweb2.dav.test.util.TestCase):
     """
     A base class for tests that use the SQL store.
     """
@@ -268,7 +268,7 @@
 
 
 
-class TestCase(twext.web2.dav.test.util.TestCase):
+class TestCase(txweb2.dav.test.util.TestCase):
     resource_class = RootResource
 
     def createDataStore(self):

Modified: CalendarServer/trunk/twistedcaldav/timezoneservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezoneservice.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/timezoneservice.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,17 +22,17 @@
     "TimezoneServiceResource",
 ]
 
-from twext.web2.dav.http import ErrorResponse
+from txweb2.dav.http import ErrorResponse
 
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.dav.method.propfind import http_PROPFIND
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import HTTPError
-from twext.web2.http import Response
-from twext.web2.http import XMLResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.dav.method.propfind import http_PROPFIND
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import HTTPError
+from txweb2.http import Response
+from txweb2.http import XMLResponse
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import succeed
 

Modified: CalendarServer/trunk/twistedcaldav/timezonestdservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezonestdservice.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/timezonestdservice.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,13 +26,13 @@
 ]
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.method.propfind import http_PROPFIND
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.http import HTTPError, JSONResponse
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.dav.method.propfind import http_PROPFIND
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.http import HTTPError, JSONResponse
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 from txdav.xml import element as davxml
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue, \

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -34,7 +34,7 @@
 
 from twext.python.log import Logger
 from txdav.xml import element
-from twext.web2.dav.fileop import rmdir
+from txweb2.dav.fileop import rmdir
 
 from twistedcaldav import caldavxml
 from twistedcaldav.directory import calendaruserproxy

Modified: CalendarServer/trunk/twistedcaldav/vcard.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/vcard.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/twistedcaldav/vcard.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -28,8 +28,8 @@
 import codecs
 
 from twext.python.log import Logger
-from twext.web2.stream import IStream
-from twext.web2.dav.util import allDataFromStream
+from txweb2.stream import IStream
+from txweb2.dav.util import allDataFromStream
 
 from twistedcaldav.config import config
 

Modified: CalendarServer/trunk/txdav/base/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/file.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/base/datastore/file.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,7 +26,7 @@
 
 from twext.python.log import Logger
 from twext.enterprise.ienterprise import AlreadyFinishedError
-from twext.web2.dav.resource import TwistedGETContentMD5
+from txweb2.dav.resource import TwistedGETContentMD5
 from txdav.idav import IDataStoreObject
 from txdav.base.propertystore.base import PropertyName
 from txdav.xml.element import GETContentType

Modified: CalendarServer/trunk/txdav/base/propertystore/base.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/base.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/base/propertystore/base.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,7 +26,7 @@
 from twext.python.log import Logger
 from txdav.xml import element as davxml
 from txdav.xml.base import encodeXMLName
-from twext.web2.dav.resource import TwistedGETContentMD5, \
+from txweb2.dav.resource import TwistedGETContentMD5, \
     TwistedQuotaRootProperty
 
 from txdav.idav import IPropertyStore, IPropertyName

Modified: CalendarServer/trunk/txdav/base/propertystore/xattr.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/xattr.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/base/propertystore/xattr.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -65,7 +65,7 @@
 
     # Mimic old xattr-prefix behavior by importing it directly.
     deadPropertyXattrPrefix = namedAny(
-        "twext.web2.dav.xattrprops.xattrPropertyStore.deadPropertyXattrPrefix"
+        "txweb2.dav.xattrprops.xattrPropertyStore.deadPropertyXattrPrefix"
     )
 
     # There is a 127 character limit for xattr keys so we need to

Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/file.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -38,8 +38,8 @@
 from twistedcaldav.ical import Component as VComponent
 from txdav.xml import element as davxml
 from txdav.xml.rfc2518 import GETContentType
-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.http_headers import generateContentType, MimeType
+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.http_headers import generateContentType, MimeType
 
 from twistedcaldav import caldavxml, customxml, ical
 from twistedcaldav.caldavxml import ScheduleCalendarTransp, Opaque, Transparent

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/delivery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,12 +15,12 @@
 ##
 
 from twext.python.log import Logger, LogLevel
-from twext.web2.dav.http import ErrorResponse
+from txweb2.dav.http import ErrorResponse
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twisted.python.failure import Failure
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import HTTPError
 
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.config import config

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/scheduler.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,9 +15,9 @@
 ##
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.http import HTTPError, StatusResponse
 
 from twisted.internet.defer import inlineCallbacks
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,9 +21,9 @@
 
 from twext.enterprise.queue import inTransaction
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.http import HTTPError
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python.failure import Failure
 from twistedcaldav.caldavxml import caldav_namespace

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/scheduler.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,7 +15,7 @@
 ##
 
 from twext.python.log import Logger
-from twext.web2.dav.http import ErrorResponse
+from txweb2.dav.http import ErrorResponse
 from twisted.internet.defer import succeed
 from twistedcaldav.caldavxml import caldav_namespace
 from txdav.caldav.datastore.scheduling.cuaddress import RemoteCalendarUser

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twext.web2 import responsecode
+from txweb2 import responsecode
 
 from twisted.internet.defer import inlineCallbacks
 from twisted.trial import unittest

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,11 +15,11 @@
 ##
 
 from twext.python.log import Logger
-from twext.web2.dav.http import ErrorResponse
+from txweb2.dav.http import ErrorResponse
 
 from twisted.internet.defer import inlineCallbacks, returnValue
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import HTTPError
 
 from twistedcaldav.caldavxml import caldav_namespace
 from twistedcaldav.config import config

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/delivery.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,15 +20,15 @@
 
 from twext.internet.gaiendpoint import GAIEndpoint
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.client.http import ClientRequest
-from twext.web2.client.http import HTTPClientProtocol
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import davXMLFromStream, joinURL, allDataFromStream
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import Headers
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.client.http import ClientRequest
+from txweb2.client.http import HTTPClientProtocol
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import davXMLFromStream, joinURL, allDataFromStream
+from txweb2.http import HTTPError
+from txweb2.http_headers import Headers
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import inlineCallbacks, DeferredList, returnValue
 from twisted.internet.protocol import Factory

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/dkim.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,11 +15,11 @@
 ##
 
 from twext.python.log import Logger
-from twext.web2.client.http import ClientRequest
-from twext.web2.dav.util import allDataFromStream, joinURL
-from twext.web2.http import Response
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.client.http import ClientRequest
+from txweb2.dav.util import allDataFromStream, joinURL
+from txweb2.http import Response
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twistedcaldav.client.geturl import getURL
@@ -516,7 +516,7 @@
     def __init__(self, headers, body, key_lookup=None, protocol_debug=False):
         """
         @param headers: The HTTP request headers to process
-        @type headers: L{twext.web2.http_headers.Headers}
+        @type headers: L{txweb2.http_headers.Headers}
         @param body: The HTTP request body to process
         @type body: C{str}
         """

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -17,12 +17,12 @@
 from pycalendar.datetime import DateTime
 from pycalendar.timezone import Timezone
 
-from twext.web2 import responsecode
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http import Response, HTTPError, StatusResponse, XMLResponse
-from twext.web2.http_headers import MimeType
+from txweb2 import responsecode
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.dav.util import allDataFromStream
+from txweb2.http import Response, HTTPError, StatusResponse, XMLResponse
+from txweb2.http_headers import MimeType
 
 from twisted.internet.defer import succeed, returnValue, inlineCallbacks
 from twisted.python.failure import Failure

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/scheduler.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,9 +15,9 @@
 ##
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, Response
-from twext.web2.http_headers import MimeType
+from txweb2 import responsecode
+from txweb2.http import HTTPError, Response
+from txweb2.http_headers import MimeType
 
 from twisted.internet.abstract import isIPAddress
 from twisted.internet.defer import inlineCallbacks, returnValue

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,9 +16,9 @@
 
 from Crypto.PublicKey import RSA
 
-from twext.web2.dav.util import allDataFromStream
-from twext.web2.http_headers import Headers, MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.dav.util import allDataFromStream
+from txweb2.http_headers import Headers, MimeType
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import inlineCallbacks, succeed
 from twisted.names import client

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_localservers.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.test.test_server import SimpleRequest
 
 from twisted.trial import unittest
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -14,8 +14,8 @@
 # limitations under the License.
 ##
 
-from twext.web2 import http_headers, responsecode
-from twext.web2.test.test_server import SimpleRequest
+from txweb2 import http_headers, responsecode
+from txweb2.test.test_server import SimpleRequest
 
 from twisted.internet.defer import inlineCallbacks
 
@@ -28,10 +28,10 @@
 from txdav.common.datastore.test.util import populateCalendarsFrom, \
     CommonCommonTests
 from twext.python.clsprop import classproperty
-import twext.web2.dav.test.util
+import txweb2.dav.test.util
 from txdav.caldav.datastore.test.util import buildCalendarStore
 
-class iSchedulePOST (CommonCommonTests, twext.web2.dav.test.util.TestCase):
+class iSchedulePOST (CommonCommonTests, txweb2.dav.test.util.TestCase):
 
     @inlineCallbacks
     def setUp(self):

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -19,8 +19,8 @@
 from pycalendar.timezone import Timezone
 
 from twext.python.log import Logger
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.http import HTTPError
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.http import HTTPError
 
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -19,11 +19,11 @@
 
 from twext.enterprise.locking import NamedLock
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, Response
-from twext.web2.http_headers import MimeType
+from txweb2 import responsecode
+from txweb2.http import HTTPError, Response
+from txweb2.http_headers import MimeType
 from txdav.xml import element as davxml
-from twext.web2.dav.http import messageForFailure, statusForFailure, \
+from txweb2.dav.http import messageForFailure, statusForFailure, \
     ErrorResponse
 
 from twistedcaldav import caldavxml

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,8 +18,8 @@
 from pycalendar.timezone import Timezone
 
 from twext.python.clsprop import classproperty
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import HTTPError
 
 from twisted.internet import reactor
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -41,8 +41,8 @@
 from twext.python.filepath import CachingFilePath
 from twext.python.log import Logger
 from twistedcaldav.ical import Component as VComponent
-from twext.web2.http_headers import MimeType, generateContentType
-from twext.web2.stream import readStream
+from txweb2.http_headers import MimeType, generateContentType
+from txweb2.stream import readStream
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twisted.python import hashlib

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,8 +21,8 @@
 
 from twext.enterprise.dal.syntax import Delete
 from twext.python.clsprop import classproperty
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python.filepath import FilePath

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -18,7 +18,7 @@
     LocalCalendarUser
 from txdav.caldav.datastore.scheduling.caldav.scheduler import CalDAVScheduler
 from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.caldav.datastore.scheduling.itip import iTIPRequestStatus
 from twistedcaldav.instance import InvalidOverriddenInstanceError
 
@@ -33,8 +33,8 @@
 from twext.enterprise.dal.syntax import Select, Parameter, Insert, Delete, \
     Update
 from twistedcaldav.ical import Component as VComponent
-from twext.web2.http_headers import MimeType
-from twext.web2.stream import MemoryStream
+from txweb2.http_headers import MimeType
+from txweb2.stream import MemoryStream
 
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue, DeferredList, \

Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,7 +22,7 @@
 import textwrap
 
 from twisted.trial.unittest import TestCase as BaseTestCase
-from twext.web2.http_headers import MimeType
+from txweb2.http_headers import MimeType
 
 from twisted.internet.defer import inlineCallbacks
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -32,7 +32,7 @@
 
 from twext.python.log import Logger
 
-from twext.web2 import http_headers
+from txweb2 import http_headers
 
 from twistedcaldav.ical import InvalidICalendarDataError
 from twistedcaldav.ical import Component as VComponent
@@ -283,7 +283,7 @@
 
 
 
-# MIME helpers - mostly copied from twext.web2.static
+# MIME helpers - mostly copied from txweb2.static
 
 def loadMimeTypes(mimetype_locations=['/etc/mime.types']):
     """
@@ -507,7 +507,7 @@
     def __init__(self, attachment, contentType, dispositionName):
         """
         Create a storage transport with a reference to an L{IAttachment} and a
-        L{twext.web2.http_headers.MimeType}.
+        L{txweb2.http_headers.MimeType}.
         """
         from twisted.internet import reactor
         self._clock = reactor

Modified: CalendarServer/trunk/txdav/caldav/icalendarstore.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/icalendarstore.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/icalendarstore.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -658,7 +658,7 @@
 
         @param contentType: The content type of the data which will be stored.
 
-        @type contentType: L{twext.web2.http_headers.MimeType}
+        @type contentType: L{txweb2.http_headers.MimeType}
 
         @return: A transport which stores the contents written to it.
 

Modified: CalendarServer/trunk/txdav/caldav/resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/resource.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/caldav/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -32,9 +32,9 @@
 
 from twext.python.log import Logger
 from txdav.xml.base import dav_namespace
-from twext.web2.http_headers import MimeType
-from twext.web2.http import RedirectResponse, Response
-from twext.web2.stream import MemoryStream
+from txweb2.http_headers import MimeType
+from txweb2.http import RedirectResponse, Response
+from txweb2.stream import MemoryStream
 
 from twistedcaldav import caldavxml
 from twistedcaldav.caldavxml import caldav_namespace

Modified: CalendarServer/trunk/txdav/carddav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/file.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/carddav/datastore/file.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -30,8 +30,8 @@
 from errno import ENOENT
 
 from txdav.xml.rfc2518 import GETContentType
-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.http_headers import MimeType
+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.http_headers import MimeType
 
 from twisted.python import hashlib
 

Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -32,9 +32,9 @@
     Update, Union, Max, Select, utcNowSQL
 from twext.enterprise.locking import NamedLock
 from twext.python.clsprop import classproperty
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import MimeType
-from twext.web2.responsecode import FORBIDDEN
+from txweb2.http import HTTPError
+from txweb2.http_headers import MimeType
+from txweb2.responsecode import FORBIDDEN
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python import hashlib

Modified: CalendarServer/trunk/txdav/carddav/datastore/test/common.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/test/common.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -20,8 +20,8 @@
 
 from twext.python.filepath import CachingFilePath as FilePath
 
-from twext.web2.http import HTTPError
-from twext.web2.responsecode import FORBIDDEN
+from txweb2.http import HTTPError
+from txweb2.responsecode import FORBIDDEN
 
 from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
 from twisted.python import hashlib

Modified: CalendarServer/trunk/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/file.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/file.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,8 +24,8 @@
 from twext.python.log import Logger
 from txdav.xml.rfc2518 import GETContentType, HRef
 from txdav.xml.rfc5842 import ResourceID
-from twext.web2.http_headers import generateContentType, MimeType
-from twext.web2.dav.resource import TwistedGETContentMD5, \
+from txweb2.http_headers import generateContentType, MimeType
+from txweb2.dav.resource import TwistedGETContentMD5, \
     TwistedQuotaUsedProperty
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -42,7 +42,7 @@
 from twext.internet.decorate import memoizedKey, Memoizable
 from twext.python.clsprop import classproperty
 from twext.python.log import Logger
-from twext.web2.http_headers import MimeType
+from txweb2.http_headers import MimeType
 
 from twisted.application.service import Service
 from twisted.internet import reactor

Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/util.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -41,7 +41,7 @@
 from twistedcaldav.ical import Component as VComponent
 from twext.enterprise.adbapi2 import ConnectionPool
 from twext.enterprise.ienterprise import AlreadyFinishedError
-from twext.web2.dav.resource import TwistedGETContentMD5
+from txweb2.dav.resource import TwistedGETContentMD5
 
 from twisted.application.service import Service
 from twisted.internet import reactor

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -15,7 +15,7 @@
 # limitations under the License.
 ##
 
-from twext.web2.dav.resource import TwistedQuotaUsedProperty, TwistedGETContentMD5
+from txweb2.dav.resource import TwistedQuotaUsedProperty, TwistedGETContentMD5
 
 from twisted.internet.defer import inlineCallbacks
 

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/test/test_migrate.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -21,7 +21,7 @@
 from twext.enterprise.adbapi2 import Pickle
 from twext.enterprise.dal.syntax import Delete
 from twext.python.filepath import CachingFilePath
-from twext.web2.http_headers import MimeType
+from txweb2.http_headers import MimeType
 
 from twisted.internet.defer import inlineCallbacks, Deferred, returnValue
 from twisted.internet.protocol import Protocol

Modified: CalendarServer/trunk/txdav/idav.py
===================================================================
--- CalendarServer/trunk/txdav/idav.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/idav.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -87,7 +87,7 @@
     using C{abort()}.
 
     Also, keys must be L{IPropertyName} providers and values must be
-    L{twext.web2.element.dav.base.WeDAVElement}s.
+    L{txweb2.element.dav.base.WeDAVElement}s.
     """
     # FIXME: the type for values isn't quite right, there should be some more
     # specific interface for that.

Modified: CalendarServer/trunk/txdav/xml/base.py
===================================================================
--- CalendarServer/trunk/txdav/xml/base.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/xml/base.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -51,7 +51,7 @@
 import re
 
 from twext.python.log import Logger
-from twext.web2.http_headers import parseDateTime
+from txweb2.http_headers import parseDateTime
 
 log = Logger()
 

Modified: CalendarServer/trunk/txdav/xml/rfc2518.py
===================================================================
--- CalendarServer/trunk/txdav/xml/rfc2518.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/xml/rfc2518.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -33,8 +33,8 @@
 __all__ = []
 
 
-from twext.web2 import responsecode
-from twext.web2.http_headers import MimeType
+from txweb2 import responsecode
+from txweb2.http_headers import MimeType
 
 from txdav.xml.base import WebDAVElement, WebDAVTextElement, PCDATAElement
 from txdav.xml.base import WebDAVEmptyElement, WebDAVOneShotElement
@@ -366,7 +366,7 @@
     def fromResponseCode(clazz, code):
         """
         code must be an integer response code in
-        twext.web2.responsecode.RESPONSES.keys()
+        txweb2.responsecode.RESPONSES.keys()
         """
         if code not in responsecode.RESPONSES:
             raise ValueError("Invalid response code: %r" % (code,))

Modified: CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py
===================================================================
--- CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py	2013-12-14 02:43:56 UTC (rev 12099)
+++ CalendarServer/trunk/txdav/xml/test/test_xml_rfc3744.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,7 +23,7 @@
 from twisted.trial import unittest
 
 from txdav.xml import element as davxml
-from twext.web2.dav.resource import davPrivilegeSet
+from txweb2.dav.resource import davPrivilegeSet
 
 
 class XML_3744(unittest.TestCase):

Modified: CalendarServer/trunk/txweb2/__init__.py
===================================================================
--- twext/trunk/twext/web2/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test -*-
+# -*- test-case-name: txweb2.test -*-
 
 ##
 # Copyright (c) 2009 Twisted Matrix Laboratories.
@@ -25,7 +25,7 @@
 ##
 
 """
-twext.web2: a transitional package for Calendar Server to move from a
+txweb2: a transitional package for Calendar Server to move from a
 dependence on twisted.web2 to twisted.web.
 
 This is a copy of (most of) twisted.web2, but the intention is for this package
@@ -37,5 +37,5 @@
 See U{http://twistedmatrix.com/trac/wiki/WebDevelopmentWithTwisted}.
 """
 
-from twext.web2._version import version
+from txweb2._version import version
 __version__ = version.short()

Modified: CalendarServer/trunk/txweb2/_version.py
===================================================================
--- twext/trunk/twext/web2/_version.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/_version.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,3 +1,3 @@
 # This is an auto-generated file. Do not edit it.
 from twisted.python import versions
-version = versions.Version('twext.web2', 9, 0, 0)
+version = versions.Version('txweb2', 9, 0, 0)

Modified: CalendarServer/trunk/txweb2/auth/basic.py
===================================================================
--- twext/trunk/twext/web2/auth/basic.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/basic.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_httpauth -*-
+# -*- test-case-name: txweb2.test.test_httpauth -*-
 ##
 # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -25,7 +25,7 @@
 
 from twisted.cred import credentials, error
 from twisted.internet.defer import succeed, fail
-from twext.web2.auth.interfaces import ICredentialFactory
+from txweb2.auth.interfaces import ICredentialFactory
 
 from zope.interface import implements
 

Modified: CalendarServer/trunk/txweb2/auth/digest.py
===================================================================
--- twext/trunk/twext/web2/auth/digest.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/digest.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_httpauth -*-
+# -*- test-case-name: txweb2.test.test_httpauth -*-
 ##
 # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -46,7 +46,7 @@
                                       calcResponse as _origCalcResponse,
                                       calcHA2 as _origCalcHA2)
 from twisted.internet.defer import maybeDeferred
-from twext.web2.auth.interfaces import ICredentialFactory
+from txweb2.auth.interfaces import ICredentialFactory
 
 
 # The digest math

Modified: CalendarServer/trunk/txweb2/auth/interfaces.py
===================================================================
--- twext/trunk/twext/web2/auth/interfaces.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/interfaces.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -53,7 +53,7 @@
         @type response: C{str}
         @param response: scheme specific response string
 
-        @type request: L{twext.web2.server.Request}
+        @type request: L{txweb2.server.Request}
         @param request: the request being processed
 
         @return: Deferred returning ICredentials

Modified: CalendarServer/trunk/txweb2/auth/wrapper.py
===================================================================
--- twext/trunk/twext/web2/auth/wrapper.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/auth/wrapper.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_httpauth -*-
+# -*- test-case-name: txweb2.test.test_httpauth -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -30,10 +30,10 @@
 from twisted.cred import error, credentials
 from twisted.internet.defer import gatherResults, succeed
 from twisted.python import failure
-from twext.web2 import responsecode
-from twext.web2 import http
-from twext.web2 import iweb
-from twext.web2.auth.interfaces import IAuthenticatedRequest
+from txweb2 import responsecode
+from txweb2 import http
+from txweb2 import iweb
+from txweb2.auth.interfaces import IAuthenticatedRequest
 
 class UnauthorizedResponse(http.StatusResponse):
     """A specialized response class for generating www-authenticate headers
@@ -92,7 +92,7 @@
     def __init__(self, wrappedResource, credentialFactories,
                  portal, interfaces):
         """
-        @param wrappedResource: A L{twext.web2.iweb.IResource} to be returned
+        @param wrappedResource: A L{txweb2.iweb.IResource} to be returned
                                 from locateChild and render upon successful
                                 authentication.
 

Modified: CalendarServer/trunk/txweb2/channel/__init__.py
===================================================================
--- twext/trunk/twext/web2/channel/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/channel/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_cgi,twext.web2.test.test_http -*-
+# -*- test-case-name: txweb2.test.test_cgi,twext.web2.test.test_http -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -27,6 +27,6 @@
 Various backend channel implementations for web2.
 """
 
-from twext.web2.channel.http import HTTPFactory
+from txweb2.channel.http import HTTPFactory
 
 __all__ = ['HTTPFactory']

Modified: CalendarServer/trunk/txweb2/channel/http.py
===================================================================
--- twext/trunk/twext/web2/channel/http.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/channel/http.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_http -*-
+# -*- test-case-name: txweb2.test.test_http -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2008-2013 Apple Computer, Inc. All rights reserved.
@@ -36,11 +36,11 @@
 from twisted.protocols import policies, basic
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2 import http_headers
-from twext.web2 import http
-from twext.web2.http import RedirectResponse
-from twext.web2.server import Request
+from txweb2 import responsecode
+from txweb2 import http_headers
+from txweb2 import http
+from txweb2.http import RedirectResponse
+from txweb2.server import Request
 
 from twistedcaldav.config import config
 from twistedcaldav import accounting

Modified: CalendarServer/trunk/txweb2/client/__init__.py
===================================================================
--- twext/trunk/twext/web2/client/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/client/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_client -*-
+# -*- test-case-name: txweb2.test.test_client -*-
 ##
 # Copyright (c) 2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.

Modified: CalendarServer/trunk/txweb2/client/http.py
===================================================================
--- twext/trunk/twext/web2/client/http.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/client/http.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_client -*-
+# -*- test-case-name: txweb2.test.test_client -*-
 ##
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -33,12 +33,12 @@
 from twisted.protocols.basic import LineReceiver
 from twisted.protocols.policies import TimeoutMixin
 
-from twext.web2.responsecode import BAD_REQUEST, HTTP_VERSION_NOT_SUPPORTED
-from twext.web2.http import parseVersion, Response
-from twext.web2.http_headers import Headers
-from twext.web2.stream import ProducerStream, StreamProducer, IByteStream
-from twext.web2.channel.http import HTTPParser, PERSIST_NO_PIPELINE, PERSIST_PIPELINE
-from twext.web2.client.interfaces import IHTTPClientManager
+from txweb2.responsecode import BAD_REQUEST, HTTP_VERSION_NOT_SUPPORTED
+from txweb2.http import parseVersion, Response
+from txweb2.http_headers import Headers
+from txweb2.stream import ProducerStream, StreamProducer, IByteStream
+from txweb2.channel.http import HTTPParser, PERSIST_NO_PIPELINE, PERSIST_PIPELINE
+from txweb2.client.interfaces import IHTTPClientManager
 
 
 
@@ -68,11 +68,11 @@
         @param headers: Headers to be sent to the server.  It is important to
             note that this object does not create any implicit headers.  So it
             is up to the HTTP Client to add required headers such as 'Host'.
-        @type headers: C{dict}, L{twext.web2.http_headers.Headers}, or
+        @type headers: C{dict}, L{txweb2.http_headers.Headers}, or
             C{None}
 
         @param stream: Content body to send to the remote HTTP server.
-        @type stream: L{twext.web2.stream.IByteStream}
+        @type stream: L{txweb2.stream.IByteStream}
         """
 
         self.method = method
@@ -324,7 +324,7 @@
 
         @rtype: L{twisted.internet.defer.Deferred}
         @return: A Deferred which will be called back with the
-            L{twext.web2.http.Response} from the server.
+            L{txweb2.http.Response} from the server.
         """
 
         # Assert we're in a valid state to submit more

Modified: CalendarServer/trunk/txweb2/client/interfaces.py
===================================================================
--- twext/trunk/twext/web2/client/interfaces.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/client/interfaces.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_client -*-
+# -*- test-case-name: txweb2.test.test_client -*-
 ##
 # Copyright (c) 2007 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.

Modified: CalendarServer/trunk/txweb2/dav/__init__.py
===================================================================
--- twext/trunk/twext/web2/dav/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test -*-
+# -*- test-case-name: txweb2.dav.test -*-
 
 ##
 # Copyright (c) 2009 Twisted Matrix Laboratories.

Modified: CalendarServer/trunk/txweb2/dav/auth.py
===================================================================
--- twext/trunk/twext/web2/dav/auth.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/auth.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -31,7 +31,7 @@
 from zope.interface import implements, Interface
 from twisted.internet import defer
 from twisted.cred import checkers, error, portal
-from twext.web2.resource import WrapperResource
+from txweb2.resource import WrapperResource
 from txdav.xml.element import twisted_private_namespace, registerElement
 from txdav.xml.element import WebDAVTextElement, Principal, HRef
 
@@ -45,7 +45,7 @@
         to allow anyone to challenge and handle authentication.
 
         @param resource: L{DAVResource} FIXME: This should get promoted to
-            twext.web2.auth
+            txweb2.auth
         @param portal: The cred portal
         @param wireEncryptedCredentialFactories: Sequence of credentialFactories
             that can be used to authenticate by resources in this tree over a

Modified: CalendarServer/trunk/txweb2/dav/fileop.py
===================================================================
--- twext/trunk/twext/web2/dav/fileop.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/fileop.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -47,10 +47,10 @@
 
 from twext.python.log import Logger
 from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse, HTTPError
-from twext.web2.stream import FileStream, readIntoFile
-from twext.web2.dav.http import ResponseQueue, statusForFailure
+from txweb2 import responsecode
+from txweb2.http import StatusResponse, HTTPError
+from txweb2.stream import FileStream, readIntoFile
+from txweb2.dav.http import ResponseQueue, statusForFailure
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/http.py
===================================================================
--- twext/trunk/twext/web2/dav/http.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/http.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -41,11 +41,11 @@
 from twisted.python.filepath import InsecurePath
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.http import Response, HTTPError, StatusResponse
-from twext.web2.http_headers import MimeType
-from twext.web2.dav.util import joinURL
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.http import Response, HTTPError, StatusResponse
+from txweb2.http_headers import MimeType
+from txweb2.dav.util import joinURL
 from txdav.xml import element
 
 log = Logger()

Modified: CalendarServer/trunk/txweb2/dav/idav.py
===================================================================
--- twext/trunk/twext/web2/dav/idav.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/idav.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -28,7 +28,7 @@
 
 __all__ = [ "IDAVResource", "IDAVPrincipalResource", "IDAVPrincipalCollectionResource", ]
 
-from twext.web2.iweb import IResource
+from txweb2.iweb import IResource
 
 class IDAVResource(IResource):
     """

Modified: CalendarServer/trunk/txweb2/dav/method/__init__.py
===================================================================
--- twext/trunk/twext/web2/dav/method/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,7 +26,7 @@
 WebDAV methods.
 
 Modules in this package provide the implementation of
-twext.web2.dav.static.DAVFile's dispatched methods.
+txweb2.dav.static.DAVFile's dispatched methods.
 """
 
 __all__ = [

Modified: CalendarServer/trunk/txweb2/dav/method/acl.py
===================================================================
--- twext/trunk/twext/web2/dav/method/acl.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/acl.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_lock -*-
+# -*- test-case-name: txweb2.dav.test.test_lock -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,11 +32,11 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse, HTTPError
+from txweb2 import responsecode
+from txweb2.http import StatusResponse, HTTPError
 from txdav.xml import element as davxml
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import davXMLFromStream
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import davXMLFromStream
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/copymove.py
===================================================================
--- twext/trunk/twext/web2/dav/method/copymove.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/copymove.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_copy,twext.web2.dav.test.test_move -*-
+# -*- test-case-name: txweb2.dav.test.test_copy,twext.web2.dav.test.test_move -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,17 +32,17 @@
 from twisted.internet.defer import waitForDeferred, deferredGenerator
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.fileop import move
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.filter.location import addLocation
+from txweb2 import responsecode
+from txweb2.dav.fileop import move
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.filter.location import addLocation
 from txdav.xml import element as davxml
-from twext.web2.dav.idav import IDAVResource
-from twext.web2.dav.method import put_common
-from twext.web2.dav.util import parentForURL
+from txweb2.dav.idav import IDAVResource
+from txweb2.dav.method import put_common
+from txweb2.dav.util import parentForURL
 
 # FIXME: This is circular
-import twext.web2.dav.static
+import txweb2.dav.static
 
 log = Logger()
 
@@ -235,7 +235,7 @@
     # So far, we need: .exists(), .fp.parent()
     #
 
-    if not isinstance(destination, twext.web2.dav.static.DAVFile):
+    if not isinstance(destination, txweb2.dav.static.DAVFile):
         log.error("DAV copy between non-DAVFile DAV resources isn't implemented")
         raise HTTPError(StatusResponse(
             responsecode.NOT_IMPLEMENTED,

Modified: CalendarServer/trunk/txweb2/dav/method/delete.py
===================================================================
--- twext/trunk/twext/web2/dav/method/delete.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/delete.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_delete -*-
+# -*- test-case-name: txweb2.dav.test.test_delete -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,11 +32,11 @@
 from twisted.internet.defer import waitForDeferred, deferredGenerator
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import HTTPError
 from txdav.xml import element as davxml
-from twext.web2.dav.method.delete_common import deleteResource
-from twext.web2.dav.util import parentForURL
+from txweb2.dav.method.delete_common import deleteResource
+from txweb2.dav.util import parentForURL
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/delete_common.py
===================================================================
--- twext/trunk/twext/web2/dav/method/delete_common.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/delete_common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_delete -*-
+# -*- test-case-name: txweb2.dav.test.test_delete -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -30,9 +30,9 @@
 from twisted.internet.defer import waitForDeferred, deferredGenerator
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.dav.fileop import delete
+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.dav.fileop import delete
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/get.py
===================================================================
--- twext/trunk/twext/web2/dav/method/get.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/get.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_lock -*-
+# -*- test-case-name: txweb2.dav.test.test_lock -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -29,24 +29,24 @@
 
 __all__ = ["http_OPTIONS", "http_HEAD", "http_GET"]
 
-import twext
+import txweb2
 
 from txdav.xml import element as davxml
-from twext.web2.dav.util import parentForURL
+from txweb2.dav.util import parentForURL
 
 def http_OPTIONS(self, request):
     d = authorize(self, request)
-    d.addCallback(lambda _: super(twext.web2.dav.resource.DAVResource, self).http_OPTIONS(request))
+    d.addCallback(lambda _: super(txweb2.dav.resource.DAVResource, self).http_OPTIONS(request))
     return d
 
 def http_HEAD(self, request):
     d = authorize(self, request)
-    d.addCallback(lambda _: super(twext.web2.dav.resource.DAVResource, self).http_HEAD(request))
+    d.addCallback(lambda _: super(txweb2.dav.resource.DAVResource, self).http_HEAD(request))
     return d
 
 def http_GET(self, request):
     d = authorize(self, request)
-    d.addCallback(lambda _: super(twext.web2.dav.resource.DAVResource, self).http_GET(request))
+    d.addCallback(lambda _: super(txweb2.dav.resource.DAVResource, self).http_GET(request))
     return d
 
 def authorize(self, request):

Modified: CalendarServer/trunk/txweb2/dav/method/lock.py
===================================================================
--- twext/trunk/twext/web2/dav/method/lock.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/lock.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_lock -*-
+# -*- test-case-name: txweb2.dav.test.test_lock -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -29,7 +29,7 @@
 
 __all__ = ["http_LOCK", "http_UNLOCK"]
 
-from twext.web2 import responsecode
+from txweb2 import responsecode
 
 def http_LOCK(self, request):
     """

Modified: CalendarServer/trunk/txweb2/dav/method/mkcol.py
===================================================================
--- twext/trunk/twext/web2/dav/method/mkcol.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/mkcol.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_mkcol -*-
+# -*- test-case-name: txweb2.dav.test.test_mkcol -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,11 +32,11 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.fileop import mkcollection
-from twext.web2.dav.util import noDataFromStream, parentForURL
+from txweb2.dav.fileop import mkcollection
+from txweb2.dav.util import noDataFromStream, parentForURL
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/prop_common.py
===================================================================
--- twext/trunk/twext/web2/dav/method/prop_common.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/prop_common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -12,10 +12,10 @@
 from twisted.python.failure import Failure
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element
-from twext.web2.dav.http import statusForFailure
-from twext.web2.dav.method.propfind import propertyName
+from txweb2.dav.http import statusForFailure
+from txweb2.dav.method.propfind import propertyName
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/propfind.py
===================================================================
--- twext/trunk/twext/web2/dav/method/propfind.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/propfind.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_prop.PROP.test_PROPFIND -*-
+# -*- test-case-name: txweb2.dav.test.test_prop.PROP.test_PROPFIND -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -36,13 +36,13 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2.http import HTTPError
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse
+from txweb2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.http import StatusResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.http import MultiStatusResponse, statusForFailure, \
+from txweb2.dav.http import MultiStatusResponse, statusForFailure, \
     ErrorResponse
-from twext.web2.dav.util import normalizeURL, davXMLFromStream
+from txweb2.dav.util import normalizeURL, davXMLFromStream
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/proppatch.py
===================================================================
--- twext/trunk/twext/web2/dav/method/proppatch.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/proppatch.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_prop.PROP.test_PROPPATCH -*-
+# -*- test-case-name: txweb2.dav.test.test_prop.PROP.test_PROPPATCH -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -33,11 +33,11 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
-from twext.web2.dav.util import davXMLFromStream
+from txweb2.dav.http import MultiStatusResponse, PropertyStatusResponseQueue
+from txweb2.dav.util import davXMLFromStream
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/put.py
===================================================================
--- twext/trunk/twext/web2/dav/method/put.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/put.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_put -*-
+# -*- test-case-name: txweb2.dav.test.test_put -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,11 +32,11 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.method import put_common
-from twext.web2.dav.util import parentForURL
+from txweb2.dav.method import put_common
+from txweb2.dav.util import parentForURL
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/put_common.py
===================================================================
--- twext/trunk/twext/web2/dav/method/put_common.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/put_common.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -29,15 +29,15 @@
 from twisted.internet.defer import deferredGenerator, maybeDeferred, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.dav.fileop import copy, delete, put
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.stream import MD5Stream
-from twext.web2.http import HTTPError
-from twext.web2.http_headers import generateContentType
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
+from txweb2 import responsecode
+from txweb2.dav.fileop import copy, delete, put
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.stream import MD5Stream
+from txweb2.http import HTTPError
+from txweb2.http_headers import generateContentType
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
 
 from txdav.xml import element as davxml
 from txdav.xml.base import dav_namespace
@@ -56,7 +56,7 @@
     """
     Function that does common PUT/COPY/MOVE behaviour.
     
-    @param request:           the L{twext.web2.server.Request} for the current HTTP request.
+    @param request:           the L{txweb2.server.Request} for the current HTTP request.
     @param source:            the L{DAVFile} for the source resource to copy from, or None if source data
                               is to be read from the request.
     @param source_uri:        the URI for the source resource.

Modified: CalendarServer/trunk/txweb2/dav/method/report.py
===================================================================
--- twext/trunk/twext/web2/dav/method/report.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_report -*-
+# -*- test-case-name: txweb2.dav.test.test_report -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -38,10 +38,10 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.util import davXMLFromStream
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.util import davXMLFromStream
 from txdav.xml import element as davxml
 from txdav.xml.element import lookupElement
 from txdav.xml.base import encodeXMLName

Modified: CalendarServer/trunk/txweb2/dav/method/report_acl_principal_prop_set.py
===================================================================
--- twext/trunk/twext/web2/dav/method/report_acl_principal_prop_set.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_acl_principal_prop_set.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
 ##
 # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,14 +32,14 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml import element as davxml
-from twext.web2.dav.http import ErrorResponse
-from twext.web2.dav.http import MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
+from txweb2.dav.http import ErrorResponse
+from txweb2.dav.http import MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/report_expand.py
===================================================================
--- twext/trunk/twext/web2/dav/method/report_expand.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_expand.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -31,15 +31,15 @@
 from twisted.python.failure import Failure
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element
 from txdav.xml.element import dav_namespace
-from twext.web2.dav.http import statusForFailure, MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.propfind import propertyName
-from twext.web2.dav.resource import AccessDeniedError
-from twext.web2.dav.util import parentForURL
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2.dav.http import statusForFailure, MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.propfind import propertyName
+from txweb2.dav.resource import AccessDeniedError
+from txweb2.dav.util import parentForURL
+from txweb2.http import HTTPError, StatusResponse
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/report_principal_match.py
===================================================================
--- twext/trunk/twext/web2/dav/method/report_principal_match.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_principal_match.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
 ##
 # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -33,15 +33,15 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import StatusResponse, HTTPError
+from txweb2 import responsecode
+from txweb2.http import StatusResponse, HTTPError
 from txdav.xml import element
 from txdav.xml.element import dav_namespace
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
-from twext.web2.dav.resource import isPrincipalResource
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
+from txweb2.dav.resource import isPrincipalResource
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/report_principal_property_search.py
===================================================================
--- twext/trunk/twext/web2/dav/method/report_principal_property_search.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_principal_property_search.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
 ##
 # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,16 +32,16 @@
 from twisted.internet.defer import deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml.base import PCDATAElement
 from txdav.xml import element
 from txdav.xml.element import dav_namespace
-from twext.web2.dav.http import ErrorResponse, MultiStatusResponse
-from twext.web2.dav.method import prop_common
-from twext.web2.dav.method.report import NumberOfMatchesWithinLimits
-from twext.web2.dav.method.report import max_number_of_matches
-from twext.web2.dav.resource import isPrincipalResource
+from txweb2.dav.http import ErrorResponse, MultiStatusResponse
+from txweb2.dav.method import prop_common
+from txweb2.dav.method.report import NumberOfMatchesWithinLimits
+from txweb2.dav.method.report import max_number_of_matches
+from txweb2.dav.resource import isPrincipalResource
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/method/report_principal_search_property_set.py
===================================================================
--- twext/trunk/twext/web2/dav/method/report_principal_search_property_set.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/method/report_principal_search_property_set.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_report_expand -*-
+# -*- test-case-name: txweb2.dav.test.test_report_expand -*-
 ##
 # Copyright (c) 2006-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -32,10 +32,10 @@
 from twisted.internet.defer import deferredGenerator
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
+from txweb2 import responsecode
 from txdav.xml import element as davxml
-from twext.web2.http import HTTPError, Response, StatusResponse
-from twext.web2.stream import MemoryStream
+from txweb2.http import HTTPError, Response, StatusResponse
+from txweb2.stream import MemoryStream
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/noneprops.py
===================================================================
--- twext/trunk/twext/web2/dav/noneprops.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/noneprops.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -31,8 +31,8 @@
 
 __all__ = ["NonePropertyStore"]
 
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
 from txdav.xml.base import encodeXMLName
 
 

Modified: CalendarServer/trunk/txweb2/dav/resource.py
===================================================================
--- twext/trunk/twext/web2/dav/resource.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_resource -*-
+# -*- test-case-name: txweb2.dav.test.test_resource -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -64,19 +64,19 @@
 from txdav.xml.element import dav_namespace
 from txdav.xml.element import twisted_dav_namespace, twisted_private_namespace
 from txdav.xml.element import registerElement, lookupElement
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, RedirectResponse, StatusResponse
-from twext.web2.http_headers import generateContentType
-from twext.web2.iweb import IResponse
-from twext.web2.resource import LeafResource
-from twext.web2.server import NoURLForResourceError
-from twext.web2.static import MetaDataMixin, StaticRenderMixin
-from twext.web2.auth.wrapper import UnauthorizedResponse
-from twext.web2.dav.idav import IDAVResource, IDAVPrincipalResource, IDAVPrincipalCollectionResource
-from twext.web2.dav.http import NeedPrivilegesResponse
-from twext.web2.dav.noneprops import NonePropertyStore
-from twext.web2.dav.util import unimplemented, parentForURL, joinURL
-from twext.web2.dav.auth import PrincipalCredentials
+from txweb2 import responsecode
+from txweb2.http import HTTPError, RedirectResponse, StatusResponse
+from txweb2.http_headers import generateContentType
+from txweb2.iweb import IResponse
+from txweb2.resource import LeafResource
+from txweb2.server import NoURLForResourceError
+from txweb2.static import MetaDataMixin, StaticRenderMixin
+from txweb2.auth.wrapper import UnauthorizedResponse
+from txweb2.dav.idav import IDAVResource, IDAVPrincipalResource, IDAVPrincipalCollectionResource
+from txweb2.dav.http import NeedPrivilegesResponse
+from txweb2.dav.noneprops import NonePropertyStore
+from txweb2.dav.util import unimplemented, parentForURL, joinURL
+from txweb2.dav.auth import PrincipalCredentials
 from twistedcaldav import customxml
 
 
@@ -969,7 +969,7 @@
 
         In order to authenticate, the request must have been
         previously prepared by
-        L{twext.web2.dav.auth.AuthenticationWrapper.hook} to have the
+        L{txweb2.dav.auth.AuthenticationWrapper.hook} to have the
         necessary authentication metadata.
 
         If the request was not thusly prepared, both C{authzUser} and
@@ -978,7 +978,7 @@
         @param request: the request which may contain authentication
             information and a reference to a portal to authenticate
             against.
-        @type request: L{twext.web2.iweb.IRequest}.
+        @type request: L{txweb2.iweb.IRequest}.
         @return: a L{Deferred} which fires with a 2-tuple of
             C{(authnUser, authzUser)} if either the request is
             unauthenticated OR contains valid credentials to

Modified: CalendarServer/trunk/txweb2/dav/static.py
===================================================================
--- twext/trunk/twext/web2/dav/static.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/static.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.dav.test.test_static -*-
+# -*- test-case-name: txweb2.dav.test.test_static -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -33,29 +33,29 @@
 from twisted.internet.defer import succeed, deferredGenerator, waitForDeferred
 
 from twext.python.log import Logger
-from twext.web2 import http_headers
-from twext.web2 import responsecode
-from twext.web2.dav.resource import DAVResource, davPrivilegeSet
-from twext.web2.dav.resource import TwistedGETContentMD5
-from twext.web2.dav.util import bindMethods
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.static import File
+from txweb2 import http_headers
+from txweb2 import responsecode
+from txweb2.dav.resource import DAVResource, davPrivilegeSet
+from txweb2.dav.resource import TwistedGETContentMD5
+from txweb2.dav.util import bindMethods
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.static import File
 
 log = Logger()
 
 
 try:
-    from twext.web2.dav.xattrprops import xattrPropertyStore as DeadPropertyStore
+    from txweb2.dav.xattrprops import xattrPropertyStore as DeadPropertyStore
 except ImportError:
     log.info("No dead property store available; using nonePropertyStore.")
     log.info("Setting of dead properties will not be allowed.")
-    from twext.web2.dav.noneprops import NonePropertyStore as DeadPropertyStore
+    from txweb2.dav.noneprops import NonePropertyStore as DeadPropertyStore
 
 class DAVFile (DAVResource, File):
     """
     WebDAV-accessible File resource.
 
-    Extends twext.web2.static.File to handle WebDAV methods.
+    Extends txweb2.static.File to handle WebDAV methods.
     """
     def __init__(
         self, path,
@@ -204,6 +204,6 @@
 # Attach method handlers to DAVFile
 #
 
-import twext.web2.dav.method
+import txweb2.dav.method
 
-bindMethods(twext.web2.dav.method, DAVFile)
+bindMethods(txweb2.dav.method, DAVFile)

Modified: CalendarServer/trunk/txweb2/dav/test/__init__.py
===================================================================
--- twext/trunk/twext/web2/dav/test/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,5 +23,5 @@
 ##
 
 """
-Tests for twext.web2.dav.
+Tests for txweb2.dav.
 """

Modified: CalendarServer/trunk/txweb2/dav/test/test_acl.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_acl.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_acl.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,22 +26,22 @@
 
 from twisted.cred.portal import Portal
 
-from twext.web2 import responsecode
-from twext.web2.auth import basic
-from twext.web2.stream import MemoryStream
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.dav.auth import TwistedPasswordProperty, IPrincipal, DavRealm, TwistedPropertyChecker, AuthenticationWrapper
-from twext.web2.dav.fileop import rmdir
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import Site, serialize
-from twext.web2.dav.test.test_resource import \
+from txweb2 import responsecode
+from txweb2.auth import basic
+from txweb2.stream import MemoryStream
+from txweb2.dav.util import davXMLFromStream
+from txweb2.dav.auth import TwistedPasswordProperty, IPrincipal, DavRealm, TwistedPropertyChecker, AuthenticationWrapper
+from txweb2.dav.fileop import rmdir
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import Site, serialize
+from txweb2.dav.test.test_resource import \
     TestDAVPrincipalResource, TestPrincipalsCollection
 
 from txdav.xml import element
 
-import twext.web2.dav.test.util
+import txweb2.dav.test.util
 
-class ACL(twext.web2.dav.test.util.TestCase):
+class ACL(txweb2.dav.test.util.TestCase):
     """
     RFC 3744 (WebDAV ACL) tests.
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_auth.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_auth.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_auth.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,10 +23,10 @@
 ##
 
 import collections
-from twext.web2.dav.auth import AuthenticationWrapper
-import twext.web2.dav.test.util
+from txweb2.dav.auth import AuthenticationWrapper
+import txweb2.dav.test.util
 
-class AutoWrapperTestCase(twext.web2.dav.test.util.TestCase):
+class AutoWrapperTestCase(txweb2.dav.test.util.TestCase):
 
     def test_basicAuthPrevention(self):
         """

Modified: CalendarServer/trunk/txweb2/dav/test/test_copy.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_copy.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_copy.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,13 +26,13 @@
 import os
 import urllib
 
-import twext.web2.dav.test.util
-from twext.web2 import responsecode
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import dircmp, serialize
-from twext.web2.dav.fileop import rmdir
+import txweb2.dav.test.util
+from txweb2 import responsecode
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import dircmp, serialize
+from txweb2.dav.fileop import rmdir
 
-class COPY(twext.web2.dav.test.util.TestCase):
+class COPY(txweb2.dav.test.util.TestCase):
     """
     COPY request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_delete.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_delete.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_delete.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -26,13 +26,13 @@
 import urllib
 import random
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import serialize
-import twext.web2.dav.test.util
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import serialize
+import txweb2.dav.test.util
 
-class DELETE(twext.web2.dav.test.util.TestCase):
+class DELETE(txweb2.dav.test.util.TestCase):
     """
     DELETE request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_http.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_http.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_http.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,12 +25,12 @@
 import errno
 
 from twisted.python.failure import Failure
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.dav.http import ErrorResponse, statusForFailure
-import twext.web2.dav.test.util
+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.dav.http import ErrorResponse, statusForFailure
+import txweb2.dav.test.util
 
-class HTTP(twext.web2.dav.test.util.TestCase):
+class HTTP(txweb2.dav.test.util.TestCase):
     """
     HTTP Utilities
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_lock.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_lock.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_lock.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,9 +23,9 @@
 ##
 
 from twisted.trial.unittest import SkipTest
-import twext.web2.dav.test.util
+import txweb2.dav.test.util
 
-class LOCK_UNLOCK(twext.web2.dav.test.util.TestCase):
+class LOCK_UNLOCK(txweb2.dav.test.util.TestCase):
     """
     LOCK, UNLOCK requests
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_mkcol.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_mkcol.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_mkcol.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,14 +24,14 @@
 
 import os
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2.dav.fileop import rmdir
-from twext.web2.test.test_server import SimpleRequest
-import twext.web2.dav.test.util
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2.dav.fileop import rmdir
+from txweb2.test.test_server import SimpleRequest
+import txweb2.dav.test.util
 
-class MKCOL(twext.web2.dav.test.util.TestCase):
+class MKCOL(txweb2.dav.test.util.TestCase):
     """
     MKCOL request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_move.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_move.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_move.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,13 +24,13 @@
 
 import os
 
-import twext.web2.dav.test.util
-import twext.web2.dav.test.test_copy
-from twext.web2 import responsecode
-from twext.web2.dav.test.util import serialize
-from twext.web2.dav.test.test_copy import sumFile
+import txweb2.dav.test.util
+import txweb2.dav.test.test_copy
+from txweb2 import responsecode
+from txweb2.dav.test.util import serialize
+from txweb2.dav.test.test_copy import sumFile
 
-class MOVE(twext.web2.dav.test.util.TestCase):
+class MOVE(txweb2.dav.test.util.TestCase):
     """
     MOVE request
     """
@@ -105,4 +105,4 @@
         return serialize(self.send, work(self, test, dst=os.path.join(self.docroot, "elvislives!")))
 
 def work(self, test, overwrite=None, dst=None):
-    return twext.web2.dav.test.test_copy.work(self, test, overwrite, dst, depths=(None,))
+    return txweb2.dav.test.test_copy.work(self, test, overwrite, dst, depths=(None,))

Modified: CalendarServer/trunk/txweb2/dav/test/test_options.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_options.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_options.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,12 +22,12 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
-from twext.web2.iweb import IResponse
+from txweb2.iweb import IResponse
 
-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
 
-class OPTIONS(twext.web2.dav.test.util.TestCase):
+class OPTIONS(txweb2.dav.test.util.TestCase):
     """
     OPTIONS request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_pipeline.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_pipeline.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_pipeline.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,10 +24,10 @@
 import sys, os
 
 from twisted.internet import utils
-from twext.web2.test import test_server
-from twext.web2 import resource
-from twext.web2 import http
-from twext.web2.test import test_http
+from txweb2.test import test_server
+from txweb2 import resource
+from txweb2 import http
+from txweb2.test import test_http
 
 from twisted.internet.defer import waitForDeferred, deferredGenerator
 

Modified: CalendarServer/trunk/txweb2/dav/test/test_prop.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_prop.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_prop.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,18 +22,18 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2 import http_headers
-from twext.web2.dav.util import davXMLFromStream
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import serialize
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2 import http_headers
+from txweb2.dav.util import davXMLFromStream
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import serialize
 
 from txdav.xml import element as davxml
 from txdav.xml.element import dav_namespace, lookupElement
 
-import twext.web2.dav.test.util
+import txweb2.dav.test.util
 
 # Remove dynamic live properties that exist
 dynamicLiveProperties = (
@@ -42,7 +42,7 @@
 )
 
 
-class PROP(twext.web2.dav.test.util.TestCase):
+class PROP(txweb2.dav.test.util.TestCase):
     """
     PROPFIND, PROPPATCH requests
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_put.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_put.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_put.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -25,16 +25,16 @@
 import os
 import filecmp
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import FileStream
-from twext.web2.http import HTTPError
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import FileStream
+from txweb2.http import HTTPError
 
-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import serialize
+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import serialize
 
-class PUT(twext.web2.dav.test.util.TestCase):
+class PUT(txweb2.dav.test.util.TestCase):
     """
     PUT request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_quota.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_quota.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_quota.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,17 +22,17 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
-from twext.web2 import responsecode
-from twext.web2.iweb import IResponse
-from twext.web2.stream import FileStream
+from txweb2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import FileStream
 
-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import Site
+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import Site
 from txdav.xml import element as davxml
 import os
 
-class QuotaBase(twext.web2.dav.test.util.TestCase):
+class QuotaBase(txweb2.dav.test.util.TestCase):
 
     def createDocumentRoot(self):
         docroot = self.mktemp()

Modified: CalendarServer/trunk/txweb2/dav/test/test_report.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_report.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_report.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,15 +22,15 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
-from twext.web2.iweb import IResponse
-from twext.web2.stream import MemoryStream
-from twext.web2 import responsecode
+from txweb2.iweb import IResponse
+from txweb2.stream import MemoryStream
+from txweb2 import responsecode
 
-import twext.web2.dav.test.util
-from twext.web2.test.test_server import SimpleRequest
+import txweb2.dav.test.util
+from txweb2.test.test_server import SimpleRequest
 from txdav.xml import element as davxml
 
-class REPORT(twext.web2.dav.test.util.TestCase):
+class REPORT(txweb2.dav.test.util.TestCase):
     """
     REPORT request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_report_expand.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_report_expand.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_report_expand.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,9 +24,9 @@
 
 from twisted.trial.unittest import SkipTest
 
-import twext.web2.dav.test.util
+import txweb2.dav.test.util
 
-class REPORT_expand(twext.web2.dav.test.util.TestCase):
+class REPORT_expand(txweb2.dav.test.util.TestCase):
     """
     DAV:expand-property REPORT request
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_resource.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_resource.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -24,21 +24,21 @@
 
 from twisted.internet.defer import DeferredList, waitForDeferred, deferredGenerator, succeed
 from twisted.cred.portal import Portal
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError
-from twext.web2.auth import basic
-from twext.web2.server import Site
+from txweb2 import responsecode
+from txweb2.http import HTTPError
+from txweb2.auth import basic
+from txweb2.server import Site
 from txdav.xml import element as davxml
-from twext.web2.dav.resource import DAVResource, AccessDeniedError, \
+from txweb2.dav.resource import DAVResource, AccessDeniedError, \
     DAVPrincipalResource, DAVPrincipalCollectionResource, davPrivilegeSet
-from twext.web2.dav.auth import TwistedPasswordProperty, DavRealm, TwistedPropertyChecker, IPrincipal, AuthenticationWrapper
-from twext.web2.test.test_server import SimpleRequest
-from twext.web2.dav.test.util import InMemoryPropertyStore
-import twext.web2.dav.test.util
+from txweb2.dav.auth import TwistedPasswordProperty, DavRealm, TwistedPropertyChecker, IPrincipal, AuthenticationWrapper
+from txweb2.test.test_server import SimpleRequest
+from txweb2.dav.test.util import InMemoryPropertyStore
+import txweb2.dav.test.util
 
-class TestCase(twext.web2.dav.test.util.TestCase):
+class TestCase(txweb2.dav.test.util.TestCase):
     def setUp(self):
-        twext.web2.dav.test.util.TestCase.setUp(self)
+        txweb2.dav.test.util.TestCase.setUp(self)
         TestResource._cachedPropertyStores = {}
 
 class GenericDAVResource(TestCase):

Modified: CalendarServer/trunk/txweb2/dav/test/test_static.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_static.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_static.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -22,10 +22,10 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
-from twext.web2.dav.test import util
+from txweb2.dav.test import util
 from txdav.xml import element as davxml
-from twext.web2.stream import readStream
-from twext.web2.test.test_server import SimpleRequest
+from txweb2.stream import readStream
+from txweb2.test.test_server import SimpleRequest
 
 class DAVFileTest(util.TestCase):
     def test_renderPrivileges(self):

Modified: CalendarServer/trunk/txweb2/dav/test/test_util.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_util.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -23,7 +23,7 @@
 ##
 
 from twisted.trial import unittest
-from twext.web2.dav import util
+from txweb2.dav import util
 
 class Utilities(unittest.TestCase):
     """

Modified: CalendarServer/trunk/txweb2/dav/test/test_xattrprops.py
===================================================================
--- twext/trunk/twext/web2/dav/test/test_xattrprops.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/test_xattrprops.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,7 +2,7 @@
 # See LICENSE for details.
 
 """
-Tests for L{twext.web2.dav.xattrprops}.
+Tests for L{txweb2.dav.xattrprops}.
 """
 
 from zlib import compress, decompress
@@ -11,14 +11,14 @@
 
 from twext.python.filepath import CachingFilePath as FilePath
 from twisted.trial.unittest import TestCase
-from twext.web2.responsecode import NOT_FOUND, INTERNAL_SERVER_ERROR
-from twext.web2.responsecode import FORBIDDEN
-from twext.web2.http import HTTPError
-from twext.web2.dav.static import DAVFile
+from txweb2.responsecode import NOT_FOUND, INTERNAL_SERVER_ERROR
+from txweb2.responsecode import FORBIDDEN
+from txweb2.http import HTTPError
+from txweb2.dav.static import DAVFile
 from txdav.xml.element import Depth, WebDAVDocument
 
 try:
-    from twext.web2.dav.xattrprops import xattrPropertyStore
+    from txweb2.dav.xattrprops import xattrPropertyStore
 except ImportError:
     xattrPropertyStore = None
 else:

Modified: CalendarServer/trunk/txweb2/dav/test/util.py
===================================================================
--- twext/trunk/twext/web2/dav/test/util.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/test/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -34,18 +34,18 @@
 from twisted.internet.defer import Deferred
 
 from twext.python.log import Logger
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2 import responsecode, server
-from twext.web2 import http_headers
-from twext.web2 import stream
+from txweb2.http import HTTPError, StatusResponse
+from txweb2 import responsecode, server
+from txweb2 import http_headers
+from txweb2 import stream
 
-from twext.web2.dav.resource import TwistedACLInheritable
-from twext.web2.dav.static import DAVFile
-from twext.web2.dav.util import joinURL
+from txweb2.dav.resource import TwistedACLInheritable
+from txweb2.dav.static import DAVFile
+from txweb2.dav.util import joinURL
 from txdav.xml import element
 from txdav.xml.base import encodeXMLName
-from twext.web2.http_headers import MimeType
-from twext.web2.dav.util import allDataFromStream
+from txweb2.http_headers import MimeType
+from txweb2.dav.util import allDataFromStream
 
 log = Logger()
 

Modified: CalendarServer/trunk/txweb2/dav/util.py
===================================================================
--- twext/trunk/twext/web2/dav/util.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/util.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_util -*-
+# -*- test-case-name: txweb2.test.test_util -*-
 ##
 # Copyright (c) 2005-2013 Apple Computer, Inc. All rights reserved.
 #
@@ -49,7 +49,7 @@
 from twisted.internet.defer import succeed
 
 from twext.python.log import Logger
-from twext.web2.stream import readStream
+from txweb2.stream import readStream
 from txdav.xml.parser import WebDAVDocument
 
 log = Logger()

Modified: CalendarServer/trunk/txweb2/dav/xattrprops.py
===================================================================
--- twext/trunk/twext/web2/dav/xattrprops.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/dav/xattrprops.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -52,9 +52,9 @@
 from twisted.python.log import err
 from txdav.xml.base import encodeXMLName
 from txdav.xml.parser import WebDAVDocument
-from twext.web2 import responsecode
-from twext.web2.http import HTTPError, StatusResponse
-from twext.web2.dav.http import statusForFailure
+from txweb2 import responsecode
+from txweb2.http import HTTPError, StatusResponse
+from txweb2.dav.http import statusForFailure
 
 # RFC 2518 Section 12.13.1 says that removal of non-existing property
 # is not an error.  python-xattr on Linux fails with ENODATA in this

Modified: CalendarServer/trunk/txweb2/error.py
===================================================================
--- twext/trunk/twext/web2/error.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/error.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_log -*-
+# -*- test-case-name: txweb2.test.test_log -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -24,11 +24,11 @@
 ##
 
 """
-Default error output filter for twext.web2.
+Default error output filter for txweb2.
 """
 
-from twext.web2 import stream, http_headers
-from twext.web2.responsecode import (
+from txweb2 import stream, http_headers
+from txweb2.responsecode import (
     MOVED_PERMANENTLY, FOUND, SEE_OTHER, USE_PROXY, TEMPORARY_REDIRECT,
     BAD_REQUEST, UNAUTHORIZED, PAYMENT_REQUIRED, FORBIDDEN, NOT_FOUND,
     NOT_ALLOWED, NOT_ACCEPTABLE, PROXY_AUTH_REQUIRED, REQUEST_TIMEOUT, CONFLICT,
@@ -199,7 +199,7 @@
     Handle errors which do not have any stream (i.e. output) associated with
     them, so that users will see a nice message in their browser.
 
-    This is used as a response filter in L{twext.web2.server.Request}.
+    This is used as a response filter in L{txweb2.server.Request}.
     """
     if response.stream is not None:
         # Already got an error message

Modified: CalendarServer/trunk/txweb2/fileupload.py
===================================================================
--- twext/trunk/twext/web2/fileupload.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/fileupload.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -29,9 +29,9 @@
 import tempfile
 
 from twisted.internet import defer
-from twext.web2.stream import IStream, FileStream, BufferedStream, readStream
-from twext.web2.stream import generatorToStream, readAndDiscard
-from twext.web2 import http_headers
+from txweb2.stream import IStream, FileStream, BufferedStream, readStream
+from txweb2.stream import generatorToStream, readAndDiscard
+from txweb2 import http_headers
 from cStringIO import StringIO
 
 ###################################

Modified: CalendarServer/trunk/txweb2/filter/__init__.py
===================================================================
--- twext/trunk/twext/web2/filter/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_cgi -*-
+# -*- test-case-name: txweb2.test.test_cgi -*-
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # See LICENSE for details.
 

Modified: CalendarServer/trunk/txweb2/filter/gzip.py
===================================================================
--- twext/trunk/twext/web2/filter/gzip.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/gzip.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,7 +1,7 @@
 from __future__ import generators
 import struct
 import zlib
-from twext.web2 import stream
+from txweb2 import stream
 
 # TODO: ungzip (can any browsers actually generate gzipped
 # upload data?) But it's necessary for client anyways.

Modified: CalendarServer/trunk/txweb2/filter/location.py
===================================================================
--- twext/trunk/twext/web2/filter/location.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/location.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-from twext.web2 import responsecode
+from txweb2 import responsecode
 import urlparse
 
 __all__ = ['addLocation']

Modified: CalendarServer/trunk/txweb2/filter/range.py
===================================================================
--- twext/trunk/twext/web2/filter/range.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/filter/range.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,8 +1,8 @@
-# -*- test-case-name: twext.web2.test.test_stream -*-
+# -*- test-case-name: txweb2.test.test_stream -*-
 
 import time, os
 
-from twext.web2 import http, http_headers, responsecode, stream
+from txweb2 import http, http_headers, responsecode, stream
 
 # Some starts at writing a response filter to handle request ranges.
 

Modified: CalendarServer/trunk/txweb2/http.py
===================================================================
--- twext/trunk/twext/web2/http.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/http.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_http -*-
+# -*- test-case-name: txweb2.test.test_http -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -42,11 +42,11 @@
 from zope.interface import implements
 
 from twext.python.log import Logger
-from twext.web2 import responsecode
-from twext.web2 import http_headers
-from twext.web2 import iweb
-from twext.web2 import stream
-from twext.web2.stream import IByteStream, readAndDiscard
+from txweb2 import responsecode
+from txweb2 import http_headers
+from txweb2 import iweb
+from txweb2 import stream
+from txweb2.stream import IByteStream, readAndDiscard
 
 log = Logger()
 
@@ -116,11 +116,11 @@
         @type code: C{int}
 
         @param headers: Headers to be sent to the client.
-        @type headers: C{dict}, L{twext.web2.http_headers.Headers}, or
+        @type headers: C{dict}, L{txweb2.http_headers.Headers}, or
             C{None}
 
         @param stream: Content body to send to the HTTP client
-        @type stream: L{twext.web2.stream.IByteStream}
+        @type stream: L{txweb2.stream.IByteStream}
         """
 
         if code is not None:

Modified: CalendarServer/trunk/txweb2/http_headers.py
===================================================================
--- twext/trunk/twext/web2/http_headers.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/http_headers.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_http_headers -*-
+# -*- test-case-name: txweb2.test.test_http_headers -*-
 ##
 # Copyright (c) 2008 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.

Modified: CalendarServer/trunk/txweb2/iweb.py
===================================================================
--- twext/trunk/twext/web2/iweb.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/iweb.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test -*-
+# -*- test-case-name: txweb2.test -*-
 ##
 # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.

Modified: CalendarServer/trunk/txweb2/log.py
===================================================================
--- twext/trunk/twext/web2/log.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/log.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_log -*-
+# -*- test-case-name: txweb2.test.test_log -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -32,7 +32,7 @@
 import time
 from twisted.internet import defer
 from twext.python.log import Logger
-from twext.web2 import iweb, stream, resource
+from txweb2 import iweb, stream, resource
 from zope.interface import implements, Attribute, Interface
 
 log = Logger()

Modified: CalendarServer/trunk/txweb2/metafd.py
===================================================================
--- twext/trunk/twext/web2/metafd.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/metafd.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_metafd -*-
+# -*- test-case-name: txweb2.test.test_metafd -*-
 ##
 # Copyright (c) 2011-2013 Apple Inc. All rights reserved.
 #
@@ -29,7 +29,7 @@
     InheritedPort, InheritedSocketDispatcher, InheritingProtocolFactory)
 from twext.internet.tcp import MaxAcceptTCPServer
 from twext.python.log import Logger
-from twext.web2.channel.http import HTTPFactory
+from txweb2.channel.http import HTTPFactory
 from twisted.application.service import MultiService, Service
 from twisted.internet import reactor
 from twisted.python.util import FancyStrMixin
@@ -56,7 +56,7 @@
 
     This is instantiated in the I{worker process}.
 
-    @ivar site: a twext.web2 'site' object, i.e. a request factory
+    @ivar site: a txweb2 'site' object, i.e. a request factory
 
     @ivar fd: the file descriptor of a UNIX socket being used to receive
         connections from a master process calling accept()

Modified: CalendarServer/trunk/txweb2/resource.py
===================================================================
--- twext/trunk/twext/web2/resource.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_server,twext.web2.test.test_resource -*-
+# -*- test-case-name: txweb2.test.test_server,twext.web2.test.test_resource -*-
 ##
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -32,7 +32,7 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
-from twext.web2 import iweb, http, server, responsecode
+from txweb2 import iweb, http, server, responsecode
 
 from twisted.internet.defer import maybeDeferred
 class RenderMixin(object):

Modified: CalendarServer/trunk/txweb2/responsecode.py
===================================================================
--- twext/trunk/twext/web2/responsecode.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/responsecode.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test -*-
+# -*- test-case-name: txweb2.test -*-
 ##
 # Copyright (c) 2001-2004 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.

Modified: CalendarServer/trunk/txweb2/server.py
===================================================================
--- twext/trunk/twext/web2/server.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/server.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_server -*-
+# -*- test-case-name: txweb2.test.test_server -*-
 ##
 # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -40,12 +40,12 @@
 from twisted.python import failure
 
 from twext.python.log import Logger
-from twext.web2 import http, iweb, fileupload, responsecode
-from twext.web2 import http_headers
-from twext.web2.filter.range import rangefilter
-from twext.web2 import error
+from txweb2 import http, iweb, fileupload, responsecode
+from txweb2 import http_headers
+from txweb2.filter.range import rangefilter
+from txweb2 import error
 
-from twext.web2 import __version__ as web2_version
+from txweb2 import __version__ as web2_version
 from twisted import __version__ as twisted_version
 
 VERSION = "Twisted/%s TwistedWeb/%s" % (twisted_version, web2_version)
@@ -90,7 +90,7 @@
     Parse data of a POST request.
 
     @param request: the request to parse.
-    @type request: L{twext.web2.http.Request}.
+    @type request: L{txweb2.http.Request}.
     @param maxMem: maximum memory used during the parsing of the data.
     @type maxMem: C{int}
     @param maxFields: maximum number of form fields allowed.

Modified: CalendarServer/trunk/txweb2/static.py
===================================================================
--- twext/trunk/twext/web2/static.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/static.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_static -*-
+# -*- test-case-name: txweb2.test.test_static -*-
 ##
 # Copyright (c) 2001-2008 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -33,9 +33,9 @@
 import tempfile
 
 # Sibling Imports
-from twext.web2 import http_headers, resource
-from twext.web2 import http, iweb, stream, responsecode, server
-from twext.web2.http import HTTPError
+from txweb2 import http_headers, resource
+from txweb2 import http, iweb, stream, responsecode, server
+from txweb2.http import HTTPError
 
 # Twisted Imports
 from twext.python.filepath import CachingFilePath as FilePath

Modified: CalendarServer/trunk/txweb2/stream.py
===================================================================
--- twext/trunk/twext/web2/stream.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/stream.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -1,4 +1,4 @@
-# -*- test-case-name: twext.web2.test.test_stream -*-
+# -*- test-case-name: txweb2.test.test_stream -*-
 ##
 # Copyright (c) 2001-2007 Twisted Matrix Laboratories.
 # Copyright (c) 2010-2013 Apple Computer, Inc. All rights reserved.
@@ -950,7 +950,7 @@
     takes care of ensuring that the input is not a deferred before
     you see it.
     
-    >>> from twext.web2 import stream
+    >>> from txweb2 import stream
     >>> from string import maketrans
     >>> alphabet = 'abcdefghijklmnopqrstuvwxyz'
     >>>

Modified: CalendarServer/trunk/txweb2/test/__init__.py
===================================================================
--- twext/trunk/twext/web2/test/__init__.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/__init__.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -3,7 +3,7 @@
 
 """
 
-twext.web2.test: unittests for the Twext.Web2, Web Server Framework
+txweb2.test: unittests for the Twext.Web2, Web Server Framework
 
 """
 

Modified: CalendarServer/trunk/txweb2/test/test_client.py
===================================================================
--- twext/trunk/twext/web2/test/test_client.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_client.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -8,10 +8,10 @@
 
 from twisted.internet import protocol, defer
 
-from twext.web2.client import http
-from twext.web2 import http_headers
-from twext.web2 import stream
-from twext.web2.test.test_http import LoopbackRelay, HTTPTests, TestConnection
+from txweb2.client import http
+from txweb2 import http_headers
+from txweb2 import stream
+from txweb2.test.test_http import LoopbackRelay, HTTPTests, TestConnection
 
 
 

Modified: CalendarServer/trunk/txweb2/test/test_fileupload.py
===================================================================
--- twext/trunk/twext/web2/test/test_fileupload.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_fileupload.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,15 +2,15 @@
 # See LICENSE for details.
 
 """
-Tests for L{twext.web2.fileupload} and its different parsing functions.
+Tests for L{txweb2.fileupload} and its different parsing functions.
 """
 
 from twisted.internet import defer
 from twisted.trial import unittest
 from twisted.internet.defer import waitForDeferred, deferredGenerator
 
-from twext.web2 import stream, fileupload
-from twext.web2.http_headers import MimeType
+from txweb2 import stream, fileupload
+from txweb2.http_headers import MimeType
 
 
 

Modified: CalendarServer/trunk/txweb2/test/test_http.py
===================================================================
--- twext/trunk/twext/web2/test/test_http.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_http.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -6,15 +6,15 @@
 from zope.interface import implements
 
 from twisted.trial import unittest
-from twext.web2 import http, http_headers, responsecode, iweb, stream
-from twext.web2 import channel
+from txweb2 import http, http_headers, responsecode, iweb, stream
+from txweb2 import channel
 
 from twisted.internet import reactor, protocol, address, interfaces, utils
 from twisted.internet import defer
 from twisted.internet.defer import waitForDeferred, deferredGenerator
 from twisted.protocols import loopback
 from twisted.python import util, runtime
-from twext.web2.channel.http import SSLRedirectRequest, HTTPFactory, HTTPChannel
+from txweb2.channel.http import SSLRedirectRequest, HTTPFactory, HTTPChannel
 from twisted.internet.task import deferLater
 
 

Modified: CalendarServer/trunk/txweb2/test/test_http_headers.py
===================================================================
--- twext/trunk/twext/web2/test/test_http_headers.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_http_headers.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,15 +2,15 @@
 # See LICENSE for details.
 
 """
-Tests for L{twext.web2.http_headers}.
+Tests for L{txweb2.http_headers}.
 """
 
 from twisted.trial import unittest
 import random
 import time
 
-from twext.web2 import http_headers
-from twext.web2.http_headers import Cookie, HeaderHandler, quoteString, generateKeyValues
+from txweb2 import http_headers
+from txweb2.http_headers import Cookie, HeaderHandler, quoteString, generateKeyValues
 from twisted.python import util
 
 class parsedvalue:

Modified: CalendarServer/trunk/txweb2/test/test_httpauth.py
===================================================================
--- twext/trunk/twext/web2/test/test_httpauth.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_httpauth.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -5,12 +5,12 @@
 from twisted.internet import address
 from twisted.trial import unittest
 from twisted.cred import error
-from twext.web2 import http, responsecode
-from twext.web2.auth import basic, digest, wrapper
-from twext.web2.auth.interfaces import IAuthenticatedRequest, IHTTPUser
-from twext.web2.test.test_server import SimpleRequest
+from txweb2 import http, responsecode
+from txweb2.auth import basic, digest, wrapper
+from txweb2.auth.interfaces import IAuthenticatedRequest, IHTTPUser
+from txweb2.test.test_server import SimpleRequest
 
-from twext.web2.test import test_server
+from txweb2.test import test_server
 
 import base64
 
@@ -43,7 +43,7 @@
     # FIXME: These tests are somewhat redundant with the tests for Twisted's
     # built-in digest auth; these private values need to be patched to
     # create deterministic results, but at some future point the whole
-    # digest module should be removed from twext.web2 (as all of twext.web2
+    # digest module should be removed from txweb2 (as all of twext.web2
     # should be removed) and we can just get rid of this.
 
     twistedDigestFactory._generateNonce = _fakeStaticNonce

Modified: CalendarServer/trunk/txweb2/test/test_log.py
===================================================================
--- twext/trunk/twext/web2/test/test_log.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_log.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -3,10 +3,10 @@
 
 from twisted.python.log import addObserver, removeObserver
 
-from twext.web2.log import BaseCommonAccessLoggingObserver, LogWrapperResource
-from twext.web2.http import Response
-from twext.web2.resource import Resource, WrapperResource
-from twext.web2.test.test_server import BaseCase, BaseTestResource
+from txweb2.log import BaseCommonAccessLoggingObserver, LogWrapperResource
+from txweb2.http import Response
+from txweb2.resource import Resource, WrapperResource
+from txweb2.test.test_server import BaseCase, BaseTestResource
 
 class BufferingLogObserver(BaseCommonAccessLoggingObserver):
     """

Modified: CalendarServer/trunk/txweb2/test/test_metafd.py
===================================================================
--- twext/trunk/twext/web2/test/test_metafd.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_metafd.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -16,21 +16,21 @@
 
 
 """
-Tests for twext.web2.metafd.
+Tests for txweb2.metafd.
 """
 
 from socket import error as SocketError, AF_INET
 from errno import ENOTCONN
 
 from twext.internet import sendfdport
-from twext.web2 import metafd
-from twext.web2.channel.http import HTTPChannel
-from twext.web2.metafd import ReportingHTTPService, ConnectionLimiter
+from txweb2 import metafd
+from txweb2.channel.http import HTTPChannel
+from txweb2.metafd import ReportingHTTPService, ConnectionLimiter
 from twisted.internet.tcp import Server
 from twisted.application.service import Service
 
 from twext.internet.test.test_sendfdport import ReaderAdder
-from twext.web2.metafd import WorkerStatus
+from txweb2.metafd import WorkerStatus
 from twisted.trial.unittest import TestCase
 
 

Modified: CalendarServer/trunk/txweb2/test/test_resource.py
===================================================================
--- twext/trunk/twext/web2/test/test_resource.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_resource.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,7 +2,7 @@
 # See LICENSE for details.
 
 """
-A test harness for twext.web2.resource.
+A test harness for txweb2.resource.
 """
 
 from sets import Set as set
@@ -11,13 +11,13 @@
 
 from twisted.internet.defer import succeed, fail, inlineCallbacks
 from twisted.trial import unittest
-from twext.web2 import responsecode
-from twext.web2.iweb import IResource
-from twext.web2.http import Response
-from twext.web2.stream import MemoryStream
-from twext.web2.resource import RenderMixin, LeafResource
-from twext.web2.server import Site, StopTraversal
-from twext.web2.test.test_server import SimpleRequest
+from txweb2 import responsecode
+from txweb2.iweb import IResource
+from txweb2.http import Response
+from txweb2.stream import MemoryStream
+from txweb2.resource import RenderMixin, LeafResource
+from txweb2.server import Site, StopTraversal
+from txweb2.test.test_server import SimpleRequest
 
 class PreconditionError (Exception):
     "Precondition Failure"

Modified: CalendarServer/trunk/txweb2/test/test_server.py
===================================================================
--- twext/trunk/twext/web2/test/test_server.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_server.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,15 +2,15 @@
 # See LICENSE for details.
 
 """
-A test harness for the twext.web2 server.
+A test harness for the txweb2 server.
 """
 
 from zope.interface import implementer
 
 from twisted.python import components
-from twext.web2 import http, http_headers, iweb, server
-from twext.web2 import resource, stream
-from twext.web2.dav.test.util import SimpleRequest
+from txweb2 import http, http_headers, iweb, server
+from txweb2 import resource, stream
+from txweb2.dav.test.util import SimpleRequest
 
 from twisted.trial import unittest
 from twisted.internet import reactor, defer, address

Modified: CalendarServer/trunk/txweb2/test/test_static.py
===================================================================
--- twext/trunk/twext/web2/test/test_static.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_static.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,16 +2,16 @@
 # See LICENSE for details.
 
 """
-Tests for L{twext.web2.static}.
+Tests for L{txweb2.static}.
 """
 
 import os
 
-from twext.web2.test.test_server import BaseCase
-from twext.web2 import static
-from twext.web2 import http_headers
-from twext.web2 import stream
-from twext.web2 import iweb
+from txweb2.test.test_server import BaseCase
+from txweb2 import static
+from txweb2 import http_headers
+from txweb2 import stream
+from txweb2 import iweb
 
 
 

Modified: CalendarServer/trunk/txweb2/test/test_stream.py
===================================================================
--- twext/trunk/twext/web2/test/test_stream.py	2013-12-14 01:09:25 UTC (rev 12098)
+++ CalendarServer/trunk/txweb2/test/test_stream.py	2013-12-14 02:44:35 UTC (rev 12100)
@@ -2,7 +2,7 @@
 # See LICENSE for details.
 
 """
-Tests for the stream implementations in L{twext.web2}.
+Tests for the stream implementations in L{txweb2}.
 """
 
 import tempfile, sys, os
@@ -14,7 +14,7 @@
 from twisted.python.hashlib import md5
 from twisted.internet import reactor, defer, interfaces
 from twisted.trial import unittest
-from twext.web2 import stream
+from txweb2 import stream
 
 
 def bufstr(data):
@@ -676,7 +676,7 @@
 
 
 
-__doctests__ = ['twext.web2.test.test_stream', 'twext.web2.stream']
+__doctests__ = ['txweb2.test.test_stream', 'twext.web2.stream']
 # TODO:
 # CompoundStreamTest
 # more tests for ProducerStreamTest
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/0396e4df/attachment.html>


More information about the calendarserver-changes mailing list