[CalendarServer-changes] [8030] CalendarServer/trunk/conf/auth

source_changes at macosforge.org source_changes at macosforge.org
Fri Aug 26 13:29:55 PDT 2011


Revision: 8030
          http://trac.macosforge.org/projects/calendarserver/changeset/8030
Author:   cdaboo at apple.com
Date:     2011-08-26 13:29:55 -0700 (Fri, 26 Aug 2011)
Log Message:
-----------
Fixes to account for new group caching behavior and odsetup based testing.

Modified Paths:
--------------
    CalendarServer/trunk/conf/auth/accounts-test.xml
    CalendarServer/trunk/conf/auth/augments-test.xml
    CalendarServer/trunk/conf/auth/proxies-test.xml

Modified: CalendarServer/trunk/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/accounts-test.xml	2011-08-26 20:29:37 UTC (rev 8029)
+++ CalendarServer/trunk/conf/auth/accounts-test.xml	2011-08-26 20:29:55 UTC (rev 8030)
@@ -147,43 +147,43 @@
       <member type="users">user10</member>
     </members>
   </group>
-  <group>
-    <uid>disabledgroup</uid>
-    <guid>disabledgroup</guid>
-    <password>disabledgroup</password>
-    <name>Disabled Group</name>
+  <group> <!-- delegategroup -->
+    <uid>group05</uid>
+    <guid>group05</guid>
+    <password>group05</password>
+    <name>Group 05</name>
     <members>
-      <member type="users">user01</member>
-    </members>
-  </group>
-  <group>
-    <uid>delegategroup</uid>
-    <guid>delegategroup</guid>
-    <password>delegategroup</password>
-    <name>Delegated Group</name>
-    <members>
-      <member type="groups">delegatesubgroup</member>
+      <member type="groups">group06</member>
       <member type="users">user20</member>
     </members>
   </group>
-  <group>
-    <uid>delegatesubgroup</uid>
-    <guid>delegatesubgroup</guid>
-    <password>delegatesubgroup</password>
-    <name>Delegated Subgroup</name>
+  <group> <!-- delegatesubgroup -->
+    <uid>group06</uid>
+    <guid>group06</guid>
+    <password>group06</password>
+    <name>Group 06</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>
+  <group> <!-- readonlydelegategroup -->
+    <uid>group07</uid>
+    <guid>group07</guid>
+    <password>group07</password>
+    <name>Group 07</name>
     <members>
       <member type="users">user22</member>
       <member type="users">user23</member>
       <member type="users">user24</member>
     </members>
   </group>
+  <group>
+    <uid>disabledgroup</uid>
+    <guid>disabledgroup</guid>
+    <password>disabledgroup</password>
+    <name>Disabled Group</name>
+    <members>
+      <member type="users">user01</member>
+    </members>
+  </group>
 </accounts>

Modified: CalendarServer/trunk/conf/auth/augments-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/augments-test.xml	2011-08-26 20:29:37 UTC (rev 8029)
+++ CalendarServer/trunk/conf/auth/augments-test.xml	2011-08-26 20:29:55 UTC (rev 8030)
@@ -39,7 +39,7 @@
     <enable-addressbook>true</enable-addressbook>
     <auto-schedule>true</auto-schedule>
   </record>
-  <record repeat="4">
+  <record repeat="10">
     <uid>group%02d</uid>
     <enable>true</enable>
   </record>

Modified: CalendarServer/trunk/conf/auth/proxies-test.xml
===================================================================
--- CalendarServer/trunk/conf/auth/proxies-test.xml	2011-08-26 20:29:37 UTC (rev 8029)
+++ CalendarServer/trunk/conf/auth/proxies-test.xml	2011-08-26 20:29:55 UTC (rev 8030)
@@ -31,10 +31,10 @@
   <record>
     <guid>delegatedroom</guid>
     <proxies>
-      <member>delegategroup</member>
+      <member>group05</member>
     </proxies>
     <read-only-proxies>
-      <member>readonlydelegategroup</member>
+      <member>group07</member>
     </read-only-proxies>
   </record>
 </proxies>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110826/e0a6c566/attachment.html>


More information about the calendarserver-changes mailing list