[CalendarServer-changes] [5138] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5138
          http://trac.macosforge.org/projects/calendarserver/changeset/5138
Author:   sagen at apple.com
Date:     2010-02-16 15:35:40 -0800 (Tue, 16 Feb 2010)
Log Message:
-----------
Change the defaults for resources.xml such that nothing required in plist

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-apple.plist
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/conf/caldavd-apple.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-apple.plist	2010-02-16 23:30:39 UTC (rev 5137)
+++ CalendarServer/trunk/conf/caldavd-apple.plist	2010-02-16 23:35:40 UTC (rev 5138)
@@ -170,23 +170,6 @@
       </dict>
     </dict>
 
-
-    <!-- Resource and Locations service -->
-    <key>ResourceService</key>
-    <dict>
-      <key>Enabled</key>
-      <true/>
-      <key>type</key>
-      <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
-
-      <key>params</key>
-      <dict>
-        <key>xmlFile</key>
-        <string>resources.xml</string>
-      </dict>
-    </dict>
-
-
     <!--
         Augment service
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-02-16 23:30:39 UTC (rev 5137)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2010-02-16 23:35:40 UTC (rev 5138)
@@ -197,7 +197,7 @@
     #    and resources.
     #
     "ResourceService": {
-        "Enabled" : False,
+        "Enabled" : True,
         "type": "twistedcaldav.directory.xmlfile.XMLDirectoryService",
         "params": DEFAULT_RESOURCE_PARAMS["twistedcaldav.directory.xmlfile.XMLDirectoryService"],
     },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100216/88719394/attachment.html>