<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14350] CalendarServer/trunk/twistedcaldav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14350">14350</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 20:11:47 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Upgrade resources.xml and augments.xml prior to using store/directory</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14349 => 14350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-01-28 00:51:37 UTC (rev 14349)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-01-28 04:11:47 UTC (rev 14350)
</span><span class="lines">@@ -15,30 +15,27 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+import copy
</ins><span class="cx"> import os
</span><del>-import copy
</del><ins>+from plistlib import PlistParser # @UnresolvedImport
</ins><span class="cx"> import re
</span><span class="cx"> from socket import getfqdn, gethostbyname
</span><span class="cx">
</span><ins>+from calendarserver.push.util import getAPNTopicFromCertificate
+from twext.python.log import Logger, InvalidLogLevelError, LogLevel
+from twisted.python.filepath import FilePath
</ins><span class="cx"> from twisted.python.runtime import platform
</span><del>-
-from plistlib import PlistParser # @UnresolvedImport
-from twext.python.log import Logger, InvalidLogLevelError, LogLevel
-from txweb2.dav.resource import TwistedACLInheritable
-
-from txdav.xml import element as davxml
-
</del><span class="cx"> from twistedcaldav import caldavxml, customxml, carddavxml, mkcolxml
</span><ins>+from twistedcaldav import ical
</ins><span class="cx"> from twistedcaldav.config import ConfigProvider, ConfigurationError, ConfigDict
</span><span class="cx"> from twistedcaldav.config import config, mergeData, fullServerPath
</span><del>-from twistedcaldav.util import getPasswordFromKeychain
</del><ins>+from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
</ins><span class="cx"> from twistedcaldav.util import KeychainAccessError, KeychainPasswordNotFound
</span><span class="cx"> from twistedcaldav.util import computeProcessCount
</span><del>-from twistedcaldav.datafilters.peruserdata import PerUserDataFilter
</del><ins>+from twistedcaldav.util import getPasswordFromKeychain
+from txdav.xml import element as davxml
+from txweb2.dav.resource import TwistedACLInheritable
</ins><span class="cx">
</span><del>-from calendarserver.push.util import getAPNTopicFromCertificate
-from twistedcaldav import ical
-
</del><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1363,8 +1360,18 @@
</span><span class="cx"> if param not in DEFAULT_RESOURCE_PARAMS[configDict.ResourceService.type]:
</span><span class="cx"> del configDict.ResourceService.params[param]
</span><span class="cx">
</span><ins>+ # Upgrading resources.xml must be done prior to using the store/directory
+ if configDict.ResourceService.Enabled and configDict.ResourceService.type == "xml":
+ resourcesFileName = configDict.ResourceService.params.xmlFile
+ if resourcesFileName[0] not in ("/", "."):
+ resourcesFileName = os.path.join(configDict.DataRoot, resourcesFileName)
+ resourcesFilePath = FilePath(resourcesFileName)
+ if resourcesFilePath.exists():
+ from twistedcaldav.upgrade import upgradeResourcesXML
+ upgradeResourcesXML(resourcesFilePath)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def _preUpdateDirectoryAddressBookBackingDirectoryService(configDict, items, reloading=False):
</span><span class="cx"> #
</span><span class="cx"> # Special handling for directory address book configs
</span><span class="lines">@@ -1402,6 +1409,15 @@
</span><span class="cx"> log.warn("Parameter %s is not supported by service %s" % (param, configDict.AugmentService.type))
</span><span class="cx"> del configDict.AugmentService.params[param]
</span><span class="cx">
</span><ins>+ # Upgrading augments.xml must be done prior to using the store/directory
+ if configDict.AugmentService.type == "twistedcaldav.directory.augment.AugmentXMLDB":
+ for fileName in configDict.AugmentService.params.xmlFiles:
+ if fileName[0] not in ("/", "."):
+ fileName = os.path.join(configDict.DataRoot, fileName)
+ filePath = FilePath(fileName)
+ if filePath.exists():
+ from twistedcaldav.upgrade import upgradeAugmentsXML
+ upgradeAugmentsXML(filePath)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _updateACLs(configDict, reloading=False):
</span><span class="lines">@@ -1714,6 +1730,7 @@
</span><span class="cx"> _updateCompliance,
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def _cleanup(configDict, defaultDict):
</span><span class="cx"> cleanDict = copy.deepcopy(configDict)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (14349 => 14350)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py 2015-01-28 00:51:37 UTC (rev 14349)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2015-01-28 04:11:47 UTC (rev 14350)
</span><span class="lines">@@ -758,22 +758,6 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def upgradeData(config, directory):
</span><span class="cx">
</span><del>- if config.ResourceService.Enabled:
- resourcesFileName = config.ResourceService.params.xmlFile
- if resourcesFileName[0] not in ("/", "."):
- resourcesFileName = os.path.join(config.DataRoot, resourcesFileName)
- resourcesFilePath = FilePath(resourcesFileName)
- if resourcesFilePath.exists():
- upgradeResourcesXML(resourcesFilePath)
-
- if config.AugmentService.type == "twistedcaldav.directory.augment.AugmentXMLDB":
- for fileName in config.AugmentService.params.xmlFiles:
- if fileName[0] not in ("/", "."):
- fileName = os.path.join(config.DataRoot, fileName)
- filePath = FilePath(fileName)
- if filePath.exists():
- upgradeAugmentsXML(filePath)
-
</del><span class="cx"> triggerPath = os.path.join(config.ServerRoot, TRIGGER_FILE)
</span><span class="cx"> if os.path.exists(triggerPath):
</span><span class="cx"> try:
</span></span></pre>
</div>
</div>
</body>
</html>