[CalendarServer-changes] [7808] CalendarServer/trunk/conf
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jul 20 10:00:21 PDT 2011
Revision: 7808
http://trac.macosforge.org/projects/calendarserver/changeset/7808
Author: sagen at apple.com
Date: 2011-07-20 10:00:21 -0700 (Wed, 20 Jul 2011)
Log Message:
-----------
Turning on GroupCaching by default, updating test accounts/proxies for corresponding CDT changes
Modified Paths:
--------------
CalendarServer/trunk/conf/auth/accounts-test.xml
CalendarServer/trunk/conf/auth/augments-test.xml
CalendarServer/trunk/conf/auth/proxies-test.xml
CalendarServer/trunk/conf/auth/resources-test.xml
CalendarServer/trunk/conf/caldavd-test.plist
Modified: CalendarServer/trunk/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/accounts-test.xml 2011-07-20 03:19:01 UTC (rev 7807)
+++ CalendarServer/trunk/conf/auth/accounts-test.xml 2011-07-20 17:00:21 UTC (rev 7808)
@@ -156,58 +156,34 @@
<member type="users">user01</member>
</members>
</group>
- <location>
- <uid>mercury</uid>
- <guid>mercury</guid>
- <password>test</password>
- <name>Mecury Conference Room, Building 1, 2nd Floor</name>
- </location>
- <location>
- <uid>venus</uid>
- <guid>venus</guid>
- <password>test</password>
- <name>Venus Conference Room, Building 1, 2nd Floor</name>
- </location>
- <location>
- <uid>Earth</uid>
- <guid>Earth</guid>
- <password>test</password>
- <name>Earth Conference Room, Building 1, 1st Floor</name>
- </location>
- <location>
- <uid>mars</uid>
- <guid>mars</guid>
- <password>test</password>
- <name>Mars Conference Room, Building 1, 1st Floor</name>
- </location>
- <location>
- <uid>jupiter</uid>
- <guid>jupiter</guid>
- <password>test</password>
- <name>Jupiter Conference Room, Building 2, 1st Floor</name>
- </location>
- <location>
- <uid>neptune</uid>
- <guid>neptune</guid>
- <password>test</password>
- <name>Neptune Conference Room, Building 2, 1st Floor</name>
- </location>
- <location>
- <uid>pluto</uid>
- <guid>pluto</guid>
- <password>test</password>
- <name>Pluto Conference Room, Building 2, 1st Floor</name>
- </location>
- <location>
- <uid>saturn</uid>
- <guid>saturn</guid>
- <password>test</password>
- <name>Saturn Conference Room, Building 2, 1st Floor</name>
- </location>
- <location>
- <uid>uranus</uid>
- <guid>uranus</guid>
- <password>test</password>
- <name>Uranus Conference Room, Building 3, 1st Floor</name>
- </location>
+ <group>
+ <uid>delegategroup</uid>
+ <guid>delegategroup</guid>
+ <password>delegategroup</password>
+ <name>Delegated Group</name>
+ <members>
+ <member type="groups">delegatesubgroup</member>
+ <member type="users">user20</member>
+ </members>
+ </group>
+ <group>
+ <uid>delegatesubgroup</uid>
+ <guid>delegatesubgroup</guid>
+ <password>delegatesubgroup</password>
+ <name>Delegated Subgroup</name>
+ <members>
+ <member type="users">user21</member>
+ </members>
+ </group>
+ <group>
+ <uid>readonlydelegategroup</uid>
+ <guid>readonlydelegategroup</guid>
+ <password>readonlydelegategroup</password>
+ <name>Read Only Delegated Group</name>
+ <members>
+ <member type="users">user22</member>
+ <member type="users">user23</member>
+ <member type="users">user24</member>
+ </members>
+ </group>
</accounts>
Modified: CalendarServer/trunk/conf/auth/augments-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/augments-test.xml 2011-07-20 03:19:01 UTC (rev 7807)
+++ CalendarServer/trunk/conf/auth/augments-test.xml 2011-07-20 17:00:21 UTC (rev 7808)
@@ -47,4 +47,11 @@
<uid>disabledgroup</uid>
<enable>false</enable>
</record>
+ <record>
+ <uid>delegatedroom</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>false</enable-addressbook>
+ <auto-schedule>false</auto-schedule>
+ </record>
</augments>
Modified: CalendarServer/trunk/conf/auth/proxies-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/proxies-test.xml 2011-07-20 03:19:01 UTC (rev 7807)
+++ CalendarServer/trunk/conf/auth/proxies-test.xml 2011-07-20 17:00:21 UTC (rev 7808)
@@ -28,4 +28,13 @@
<member>user03</member>
</read-only-proxies>
</record>
+ <record>
+ <guid>delegatedroom</guid>
+ <proxies>
+ <member>delegategroup</member>
+ </proxies>
+ <read-only-proxies>
+ <member>readonlydelegategroup</member>
+ </read-only-proxies>
+ </record>
</proxies>
Modified: CalendarServer/trunk/conf/auth/resources-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/resources-test.xml 2011-07-20 03:19:01 UTC (rev 7807)
+++ CalendarServer/trunk/conf/auth/resources-test.xml 2011-07-20 17:00:21 UTC (rev 7808)
@@ -31,4 +31,64 @@
<password>resource%02d</password>
<name>Resource %02d</name>
</resource>
+ <location>
+ <uid>mercury</uid>
+ <guid>mercury</guid>
+ <password>test</password>
+ <name>Mecury Conference Room, Building 1, 2nd Floor</name>
+ </location>
+ <location>
+ <uid>venus</uid>
+ <guid>venus</guid>
+ <password>test</password>
+ <name>Venus Conference Room, Building 1, 2nd Floor</name>
+ </location>
+ <location>
+ <uid>Earth</uid>
+ <guid>Earth</guid>
+ <password>test</password>
+ <name>Earth Conference Room, Building 1, 1st Floor</name>
+ </location>
+ <location>
+ <uid>mars</uid>
+ <guid>mars</guid>
+ <password>test</password>
+ <name>Mars Conference Room, Building 1, 1st Floor</name>
+ </location>
+ <location>
+ <uid>jupiter</uid>
+ <guid>jupiter</guid>
+ <password>test</password>
+ <name>Jupiter Conference Room, Building 2, 1st Floor</name>
+ </location>
+ <location>
+ <uid>neptune</uid>
+ <guid>neptune</guid>
+ <password>test</password>
+ <name>Neptune Conference Room, Building 2, 1st Floor</name>
+ </location>
+ <location>
+ <uid>pluto</uid>
+ <guid>pluto</guid>
+ <password>test</password>
+ <name>Pluto Conference Room, Building 2, 1st Floor</name>
+ </location>
+ <location>
+ <uid>saturn</uid>
+ <guid>saturn</guid>
+ <password>test</password>
+ <name>Saturn Conference Room, Building 2, 1st Floor</name>
+ </location>
+ <location>
+ <uid>uranus</uid>
+ <guid>uranus</guid>
+ <password>test</password>
+ <name>Uranus Conference Room, Building 3, 1st Floor</name>
+ </location>
+ <location>
+ <uid>delegatedroom</uid>
+ <guid>delegatedroom</guid>
+ <password>delegatedroom</password>
+ <name>Delegated Conference Room</name>
+ </location>
</accounts>
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2011-07-20 03:19:01 UTC (rev 7807)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2011-07-20 17:00:21 UTC (rev 7808)
@@ -915,7 +915,7 @@
<key>GroupCaching</key>
<dict>
<key>Enabled</key>
- <false/>
+ <true/>
<key>EnableUpdater</key>
<true/>
<key>MemcachedPool</key>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110720/76e25b79/attachment.html>
More information about the calendarserver-changes
mailing list