[CalendarServer-changes] [13096] CalendarServer/branches/users/sagen/move2who-4/conf/auth

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 1 12:54:06 PDT 2014


Revision: 13096
          http://trac.calendarserver.org//changeset/13096
Author:   sagen at apple.com
Date:     2014-04-01 12:54:06 -0700 (Tue, 01 Apr 2014)
Log Message:
-----------
To match CDT expectations, make uid the same as guid

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/proxies-test.xml
    CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml	2014-04-01 19:26:15 UTC (rev 13095)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml	2014-04-01 19:54:06 UTC (rev 13096)
@@ -18,7 +18,7 @@
 
 <directory realm="Test Realm">
 <record>
-    <uid>admin</uid>
+    <uid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</uid>
     <guid>0C8BDE62-E600-4696-83D3-8B5ECABDFD2E</guid>
     <short-name>admin</short-name>
     <password>admin</password>
@@ -26,7 +26,7 @@
     <email>admin at example.com</email>
 </record>
 <record>
-    <uid>apprentice</uid>
+    <uid>29B6C503-11DF-43EC-8CCA-40C7003149CE</uid>
     <guid>29B6C503-11DF-43EC-8CCA-40C7003149CE</guid>
     <short-name>apprentice</short-name>
     <password>apprentice</password>
@@ -34,7 +34,7 @@
     <email>apprentice at example.com</email>
 </record>
 <record>
-    <uid>i18nuser</uid>
+    <uid>860B3EE9-6D7C-4296-9639-E6B998074A78</uid>
     <guid>860B3EE9-6D7C-4296-9639-E6B998074A78</guid>
     <short-name>i18nuser</short-name>
     <password>i18nuser</password>
@@ -43,7 +43,7 @@
 </record>
 <record type="user">
     <short-name>user01</short-name>
-    <uid>user01</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</guid>
     <password>user01</password>
     <full-name>User 01</full-name>
@@ -51,7 +51,7 @@
 </record>
 <record type="user">
     <short-name>user02</short-name>
-    <uid>user02</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF002</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF002</guid>
     <password>user02</password>
     <full-name>User 02</full-name>
@@ -59,7 +59,7 @@
 </record>
 <record type="user">
     <short-name>user03</short-name>
-    <uid>user03</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</guid>
     <password>user03</password>
     <full-name>User 03</full-name>
@@ -67,7 +67,7 @@
 </record>
 <record type="user">
     <short-name>user04</short-name>
-    <uid>user04</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF004</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF004</guid>
     <password>user04</password>
     <full-name>User 04</full-name>
@@ -75,7 +75,7 @@
 </record>
 <record type="user">
     <short-name>user05</short-name>
-    <uid>user05</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF005</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF005</guid>
     <password>user05</password>
     <full-name>User 05</full-name>
@@ -83,7 +83,7 @@
 </record>
 <record type="user">
     <short-name>user06</short-name>
-    <uid>user06</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF006</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF006</guid>
     <password>user06</password>
     <full-name>User 06</full-name>
@@ -91,7 +91,7 @@
 </record>
 <record type="user">
     <short-name>user07</short-name>
-    <uid>user07</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF007</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF007</guid>
     <password>user07</password>
     <full-name>User 07</full-name>
@@ -99,7 +99,7 @@
 </record>
 <record type="user">
     <short-name>user08</short-name>
-    <uid>user08</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF008</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF008</guid>
     <password>user08</password>
     <full-name>User 08</full-name>
@@ -107,7 +107,7 @@
 </record>
 <record type="user">
     <short-name>user09</short-name>
-    <uid>user09</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF009</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF009</guid>
     <password>user09</password>
     <full-name>User 09</full-name>
@@ -115,7 +115,7 @@
 </record>
 <record type="user">
     <short-name>user10</short-name>
-    <uid>user10</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF010</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF010</guid>
     <password>user10</password>
     <full-name>User 10</full-name>
@@ -123,7 +123,7 @@
 </record>
 <record type="user">
     <short-name>user11</short-name>
-    <uid>user11</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF011</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF011</guid>
     <password>user11</password>
     <full-name>User 11</full-name>
@@ -131,7 +131,7 @@
 </record>
 <record type="user">
     <short-name>user12</short-name>
-    <uid>user12</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF012</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF012</guid>
     <password>user12</password>
     <full-name>User 12</full-name>
@@ -139,7 +139,7 @@
 </record>
 <record type="user">
     <short-name>user13</short-name>
-    <uid>user13</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF013</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF013</guid>
     <password>user13</password>
     <full-name>User 13</full-name>
@@ -147,7 +147,7 @@
 </record>
 <record type="user">
     <short-name>user14</short-name>
-    <uid>user14</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF014</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF014</guid>
     <password>user14</password>
     <full-name>User 14</full-name>
@@ -155,7 +155,7 @@
 </record>
 <record type="user">
     <short-name>user15</short-name>
-    <uid>user15</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF015</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF015</guid>
     <password>user15</password>
     <full-name>User 15</full-name>
@@ -163,7 +163,7 @@
 </record>
 <record type="user">
     <short-name>user16</short-name>
-    <uid>user16</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF016</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF016</guid>
     <password>user16</password>
     <full-name>User 16</full-name>
@@ -171,7 +171,7 @@
 </record>
 <record type="user">
     <short-name>user17</short-name>
-    <uid>user17</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF017</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF017</guid>
     <password>user17</password>
     <full-name>User 17</full-name>
@@ -179,7 +179,7 @@
 </record>
 <record type="user">
     <short-name>user18</short-name>
-    <uid>user18</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF018</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF018</guid>
     <password>user18</password>
     <full-name>User 18</full-name>
@@ -187,7 +187,7 @@
 </record>
 <record type="user">
     <short-name>user19</short-name>
-    <uid>user19</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF019</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF019</guid>
     <password>user19</password>
     <full-name>User 19</full-name>
@@ -195,7 +195,7 @@
 </record>
 <record type="user">
     <short-name>user20</short-name>
-    <uid>user20</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF020</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF020</guid>
     <password>user20</password>
     <full-name>User 20</full-name>
@@ -203,7 +203,7 @@
 </record>
 <record type="user">
     <short-name>user21</short-name>
-    <uid>user21</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF021</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF021</guid>
     <password>user21</password>
     <full-name>User 21</full-name>
@@ -211,7 +211,7 @@
 </record>
 <record type="user">
     <short-name>user22</short-name>
-    <uid>user22</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF022</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF022</guid>
     <password>user22</password>
     <full-name>User 22</full-name>
@@ -219,7 +219,7 @@
 </record>
 <record type="user">
     <short-name>user23</short-name>
-    <uid>user23</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF023</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF023</guid>
     <password>user23</password>
     <full-name>User 23</full-name>
@@ -227,7 +227,7 @@
 </record>
 <record type="user">
     <short-name>user24</short-name>
-    <uid>user24</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF024</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF024</guid>
     <password>user24</password>
     <full-name>User 24</full-name>
@@ -235,7 +235,7 @@
 </record>
 <record type="user">
     <short-name>user25</short-name>
-    <uid>user25</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF025</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF025</guid>
     <password>user25</password>
     <full-name>User 25</full-name>
@@ -243,7 +243,7 @@
 </record>
 <record type="user">
     <short-name>user26</short-name>
-    <uid>user26</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF026</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF026</guid>
     <password>user26</password>
     <full-name>User 26</full-name>
@@ -251,7 +251,7 @@
 </record>
 <record type="user">
     <short-name>user27</short-name>
-    <uid>user27</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF027</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF027</guid>
     <password>user27</password>
     <full-name>User 27</full-name>
@@ -259,7 +259,7 @@
 </record>
 <record type="user">
     <short-name>user28</short-name>
-    <uid>user28</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF028</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF028</guid>
     <password>user28</password>
     <full-name>User 28</full-name>
@@ -267,7 +267,7 @@
 </record>
 <record type="user">
     <short-name>user29</short-name>
-    <uid>user29</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF029</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF029</guid>
     <password>user29</password>
     <full-name>User 29</full-name>
@@ -275,7 +275,7 @@
 </record>
 <record type="user">
     <short-name>user30</short-name>
-    <uid>user30</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF030</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF030</guid>
     <password>user30</password>
     <full-name>User 30</full-name>
@@ -283,7 +283,7 @@
 </record>
 <record type="user">
     <short-name>user31</short-name>
-    <uid>user31</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF031</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF031</guid>
     <password>user31</password>
     <full-name>User 31</full-name>
@@ -291,7 +291,7 @@
 </record>
 <record type="user">
     <short-name>user32</short-name>
-    <uid>user32</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF032</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF032</guid>
     <password>user32</password>
     <full-name>User 32</full-name>
@@ -299,7 +299,7 @@
 </record>
 <record type="user">
     <short-name>user33</short-name>
-    <uid>user33</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF033</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF033</guid>
     <password>user33</password>
     <full-name>User 33</full-name>
@@ -307,7 +307,7 @@
 </record>
 <record type="user">
     <short-name>user34</short-name>
-    <uid>user34</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF034</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF034</guid>
     <password>user34</password>
     <full-name>User 34</full-name>
@@ -315,7 +315,7 @@
 </record>
 <record type="user">
     <short-name>user35</short-name>
-    <uid>user35</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF035</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF035</guid>
     <password>user35</password>
     <full-name>User 35</full-name>
@@ -323,7 +323,7 @@
 </record>
 <record type="user">
     <short-name>user36</short-name>
-    <uid>user36</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF036</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF036</guid>
     <password>user36</password>
     <full-name>User 36</full-name>
@@ -331,7 +331,7 @@
 </record>
 <record type="user">
     <short-name>user37</short-name>
-    <uid>user37</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF037</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF037</guid>
     <password>user37</password>
     <full-name>User 37</full-name>
@@ -339,7 +339,7 @@
 </record>
 <record type="user">
     <short-name>user38</short-name>
-    <uid>user38</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF038</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF038</guid>
     <password>user38</password>
     <full-name>User 38</full-name>
@@ -347,7 +347,7 @@
 </record>
 <record type="user">
     <short-name>user39</short-name>
-    <uid>user39</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF039</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF039</guid>
     <password>user39</password>
     <full-name>User 39</full-name>
@@ -355,7 +355,7 @@
 </record>
 <record type="user">
     <short-name>user40</short-name>
-    <uid>user40</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF040</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF040</guid>
     <password>user40</password>
     <full-name>User 40</full-name>
@@ -363,7 +363,7 @@
 </record>
 <record type="user">
     <short-name>user41</short-name>
-    <uid>user41</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF041</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF041</guid>
     <password>user41</password>
     <full-name>User 41</full-name>
@@ -371,7 +371,7 @@
 </record>
 <record type="user">
     <short-name>user42</short-name>
-    <uid>user42</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF042</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF042</guid>
     <password>user42</password>
     <full-name>User 42</full-name>
@@ -379,7 +379,7 @@
 </record>
 <record type="user">
     <short-name>user43</short-name>
-    <uid>user43</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF043</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF043</guid>
     <password>user43</password>
     <full-name>User 43</full-name>
@@ -387,7 +387,7 @@
 </record>
 <record type="user">
     <short-name>user44</short-name>
-    <uid>user44</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF044</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF044</guid>
     <password>user44</password>
     <full-name>User 44</full-name>
@@ -395,7 +395,7 @@
 </record>
 <record type="user">
     <short-name>user45</short-name>
-    <uid>user45</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF045</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF045</guid>
     <password>user45</password>
     <full-name>User 45</full-name>
@@ -403,7 +403,7 @@
 </record>
 <record type="user">
     <short-name>user46</short-name>
-    <uid>user46</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF046</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF046</guid>
     <password>user46</password>
     <full-name>User 46</full-name>
@@ -411,7 +411,7 @@
 </record>
 <record type="user">
     <short-name>user47</short-name>
-    <uid>user47</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF047</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF047</guid>
     <password>user47</password>
     <full-name>User 47</full-name>
@@ -419,7 +419,7 @@
 </record>
 <record type="user">
     <short-name>user48</short-name>
-    <uid>user48</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF048</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF048</guid>
     <password>user48</password>
     <full-name>User 48</full-name>
@@ -427,7 +427,7 @@
 </record>
 <record type="user">
     <short-name>user49</short-name>
-    <uid>user49</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF049</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF049</guid>
     <password>user49</password>
     <full-name>User 49</full-name>
@@ -435,7 +435,7 @@
 </record>
 <record type="user">
     <short-name>user50</short-name>
-    <uid>user50</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF050</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF050</guid>
     <password>user50</password>
     <full-name>User 50</full-name>
@@ -443,7 +443,7 @@
 </record>
 <record type="user">
     <short-name>user51</short-name>
-    <uid>user51</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF051</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF051</guid>
     <password>user51</password>
     <full-name>User 51</full-name>
@@ -451,7 +451,7 @@
 </record>
 <record type="user">
     <short-name>user52</short-name>
-    <uid>user52</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF052</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF052</guid>
     <password>user52</password>
     <full-name>User 52</full-name>
@@ -459,7 +459,7 @@
 </record>
 <record type="user">
     <short-name>user53</short-name>
-    <uid>user53</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF053</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF053</guid>
     <password>user53</password>
     <full-name>User 53</full-name>
@@ -467,7 +467,7 @@
 </record>
 <record type="user">
     <short-name>user54</short-name>
-    <uid>user54</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF054</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF054</guid>
     <password>user54</password>
     <full-name>User 54</full-name>
@@ -475,7 +475,7 @@
 </record>
 <record type="user">
     <short-name>user55</short-name>
-    <uid>user55</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF055</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF055</guid>
     <password>user55</password>
     <full-name>User 55</full-name>
@@ -483,7 +483,7 @@
 </record>
 <record type="user">
     <short-name>user56</short-name>
-    <uid>user56</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF056</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF056</guid>
     <password>user56</password>
     <full-name>User 56</full-name>
@@ -491,7 +491,7 @@
 </record>
 <record type="user">
     <short-name>user57</short-name>
-    <uid>user57</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF057</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF057</guid>
     <password>user57</password>
     <full-name>User 57</full-name>
@@ -499,7 +499,7 @@
 </record>
 <record type="user">
     <short-name>user58</short-name>
-    <uid>user58</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF058</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF058</guid>
     <password>user58</password>
     <full-name>User 58</full-name>
@@ -507,7 +507,7 @@
 </record>
 <record type="user">
     <short-name>user59</short-name>
-    <uid>user59</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF059</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF059</guid>
     <password>user59</password>
     <full-name>User 59</full-name>
@@ -515,7 +515,7 @@
 </record>
 <record type="user">
     <short-name>user60</short-name>
-    <uid>user60</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF060</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF060</guid>
     <password>user60</password>
     <full-name>User 60</full-name>
@@ -523,7 +523,7 @@
 </record>
 <record type="user">
     <short-name>user61</short-name>
-    <uid>user61</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF061</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF061</guid>
     <password>user61</password>
     <full-name>User 61</full-name>
@@ -531,7 +531,7 @@
 </record>
 <record type="user">
     <short-name>user62</short-name>
-    <uid>user62</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF062</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF062</guid>
     <password>user62</password>
     <full-name>User 62</full-name>
@@ -539,7 +539,7 @@
 </record>
 <record type="user">
     <short-name>user63</short-name>
-    <uid>user63</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF063</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF063</guid>
     <password>user63</password>
     <full-name>User 63</full-name>
@@ -547,7 +547,7 @@
 </record>
 <record type="user">
     <short-name>user64</short-name>
-    <uid>user64</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF064</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF064</guid>
     <password>user64</password>
     <full-name>User 64</full-name>
@@ -555,7 +555,7 @@
 </record>
 <record type="user">
     <short-name>user65</short-name>
-    <uid>user65</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF065</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF065</guid>
     <password>user65</password>
     <full-name>User 65</full-name>
@@ -563,7 +563,7 @@
 </record>
 <record type="user">
     <short-name>user66</short-name>
-    <uid>user66</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF066</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF066</guid>
     <password>user66</password>
     <full-name>User 66</full-name>
@@ -571,7 +571,7 @@
 </record>
 <record type="user">
     <short-name>user67</short-name>
-    <uid>user67</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF067</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF067</guid>
     <password>user67</password>
     <full-name>User 67</full-name>
@@ -579,7 +579,7 @@
 </record>
 <record type="user">
     <short-name>user68</short-name>
-    <uid>user68</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF068</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF068</guid>
     <password>user68</password>
     <full-name>User 68</full-name>
@@ -587,7 +587,7 @@
 </record>
 <record type="user">
     <short-name>user69</short-name>
-    <uid>user69</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF069</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF069</guid>
     <password>user69</password>
     <full-name>User 69</full-name>
@@ -595,7 +595,7 @@
 </record>
 <record type="user">
     <short-name>user70</short-name>
-    <uid>user70</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF070</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF070</guid>
     <password>user70</password>
     <full-name>User 70</full-name>
@@ -603,7 +603,7 @@
 </record>
 <record type="user">
     <short-name>user71</short-name>
-    <uid>user71</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF071</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF071</guid>
     <password>user71</password>
     <full-name>User 71</full-name>
@@ -611,7 +611,7 @@
 </record>
 <record type="user">
     <short-name>user72</short-name>
-    <uid>user72</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF072</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF072</guid>
     <password>user72</password>
     <full-name>User 72</full-name>
@@ -619,7 +619,7 @@
 </record>
 <record type="user">
     <short-name>user73</short-name>
-    <uid>user73</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF073</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF073</guid>
     <password>user73</password>
     <full-name>User 73</full-name>
@@ -627,7 +627,7 @@
 </record>
 <record type="user">
     <short-name>user74</short-name>
-    <uid>user74</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF074</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF074</guid>
     <password>user74</password>
     <full-name>User 74</full-name>
@@ -635,7 +635,7 @@
 </record>
 <record type="user">
     <short-name>user75</short-name>
-    <uid>user75</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF075</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF075</guid>
     <password>user75</password>
     <full-name>User 75</full-name>
@@ -643,7 +643,7 @@
 </record>
 <record type="user">
     <short-name>user76</short-name>
-    <uid>user76</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF076</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF076</guid>
     <password>user76</password>
     <full-name>User 76</full-name>
@@ -651,7 +651,7 @@
 </record>
 <record type="user">
     <short-name>user77</short-name>
-    <uid>user77</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF077</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF077</guid>
     <password>user77</password>
     <full-name>User 77</full-name>
@@ -659,7 +659,7 @@
 </record>
 <record type="user">
     <short-name>user78</short-name>
-    <uid>user78</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF078</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF078</guid>
     <password>user78</password>
     <full-name>User 78</full-name>
@@ -667,7 +667,7 @@
 </record>
 <record type="user">
     <short-name>user79</short-name>
-    <uid>user79</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF079</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF079</guid>
     <password>user79</password>
     <full-name>User 79</full-name>
@@ -675,7 +675,7 @@
 </record>
 <record type="user">
     <short-name>user80</short-name>
-    <uid>user80</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF080</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF080</guid>
     <password>user80</password>
     <full-name>User 80</full-name>
@@ -683,7 +683,7 @@
 </record>
 <record type="user">
     <short-name>user81</short-name>
-    <uid>user81</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF081</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF081</guid>
     <password>user81</password>
     <full-name>User 81</full-name>
@@ -691,7 +691,7 @@
 </record>
 <record type="user">
     <short-name>user82</short-name>
-    <uid>user82</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF082</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF082</guid>
     <password>user82</password>
     <full-name>User 82</full-name>
@@ -699,7 +699,7 @@
 </record>
 <record type="user">
     <short-name>user83</short-name>
-    <uid>user83</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF083</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF083</guid>
     <password>user83</password>
     <full-name>User 83</full-name>
@@ -707,7 +707,7 @@
 </record>
 <record type="user">
     <short-name>user84</short-name>
-    <uid>user84</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF084</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF084</guid>
     <password>user84</password>
     <full-name>User 84</full-name>
@@ -715,7 +715,7 @@
 </record>
 <record type="user">
     <short-name>user85</short-name>
-    <uid>user85</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF085</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF085</guid>
     <password>user85</password>
     <full-name>User 85</full-name>
@@ -723,7 +723,7 @@
 </record>
 <record type="user">
     <short-name>user86</short-name>
-    <uid>user86</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF086</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF086</guid>
     <password>user86</password>
     <full-name>User 86</full-name>
@@ -731,7 +731,7 @@
 </record>
 <record type="user">
     <short-name>user87</short-name>
-    <uid>user87</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF087</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF087</guid>
     <password>user87</password>
     <full-name>User 87</full-name>
@@ -739,7 +739,7 @@
 </record>
 <record type="user">
     <short-name>user88</short-name>
-    <uid>user88</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF088</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF088</guid>
     <password>user88</password>
     <full-name>User 88</full-name>
@@ -747,7 +747,7 @@
 </record>
 <record type="user">
     <short-name>user89</short-name>
-    <uid>user89</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF089</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF089</guid>
     <password>user89</password>
     <full-name>User 89</full-name>
@@ -755,7 +755,7 @@
 </record>
 <record type="user">
     <short-name>user90</short-name>
-    <uid>user90</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF090</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF090</guid>
     <password>user90</password>
     <full-name>User 90</full-name>
@@ -763,7 +763,7 @@
 </record>
 <record type="user">
     <short-name>user91</short-name>
-    <uid>user91</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF091</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF091</guid>
     <password>user91</password>
     <full-name>User 91</full-name>
@@ -771,7 +771,7 @@
 </record>
 <record type="user">
     <short-name>user92</short-name>
-    <uid>user92</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF092</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF092</guid>
     <password>user92</password>
     <full-name>User 92</full-name>
@@ -779,7 +779,7 @@
 </record>
 <record type="user">
     <short-name>user93</short-name>
-    <uid>user93</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF093</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF093</guid>
     <password>user93</password>
     <full-name>User 93</full-name>
@@ -787,7 +787,7 @@
 </record>
 <record type="user">
     <short-name>user94</short-name>
-    <uid>user94</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF094</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF094</guid>
     <password>user94</password>
     <full-name>User 94</full-name>
@@ -795,7 +795,7 @@
 </record>
 <record type="user">
     <short-name>user95</short-name>
-    <uid>user95</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF095</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF095</guid>
     <password>user95</password>
     <full-name>User 95</full-name>
@@ -803,7 +803,7 @@
 </record>
 <record type="user">
     <short-name>user96</short-name>
-    <uid>user96</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF096</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF096</guid>
     <password>user96</password>
     <full-name>User 96</full-name>
@@ -811,7 +811,7 @@
 </record>
 <record type="user">
     <short-name>user97</short-name>
-    <uid>user97</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF097</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF097</guid>
     <password>user97</password>
     <full-name>User 97</full-name>
@@ -819,7 +819,7 @@
 </record>
 <record type="user">
     <short-name>user98</short-name>
-    <uid>user98</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF098</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF098</guid>
     <password>user98</password>
     <full-name>User 98</full-name>
@@ -827,7 +827,7 @@
 </record>
 <record type="user">
     <short-name>user99</short-name>
-    <uid>user99</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF099</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF099</guid>
     <password>user99</password>
     <full-name>User 99</full-name>
@@ -835,7 +835,7 @@
 </record>
 <record type="user">
     <short-name>user100</short-name>
-    <uid>user100</uid>
+    <uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF100</uid>
     <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF100</guid>
     <password>user100</password>
     <full-name>User 100</full-name>
@@ -843,7 +843,7 @@
 </record>
 <record type="user">
     <short-name>public01</short-name>
-    <uid>public01</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF01</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF01</guid>
     <password>public01</password>
     <full-name>Public 01</full-name>
@@ -851,7 +851,7 @@
 </record>
 <record type="user">
     <short-name>public02</short-name>
-    <uid>public02</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF02</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF02</guid>
     <password>public02</password>
     <full-name>Public 02</full-name>
@@ -859,7 +859,7 @@
 </record>
 <record type="user">
     <short-name>public03</short-name>
-    <uid>public03</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF03</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF03</guid>
     <password>public03</password>
     <full-name>Public 03</full-name>
@@ -867,7 +867,7 @@
 </record>
 <record type="user">
     <short-name>public04</short-name>
-    <uid>public04</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF04</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF04</guid>
     <password>public04</password>
     <full-name>Public 04</full-name>
@@ -875,7 +875,7 @@
 </record>
 <record type="user">
     <short-name>public05</short-name>
-    <uid>public05</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF05</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF05</guid>
     <password>public05</password>
     <full-name>Public 05</full-name>
@@ -883,7 +883,7 @@
 </record>
 <record type="user">
     <short-name>public06</short-name>
-    <uid>public06</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF06</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF06</guid>
     <password>public06</password>
     <full-name>Public 06</full-name>
@@ -891,7 +891,7 @@
 </record>
 <record type="user">
     <short-name>public07</short-name>
-    <uid>public07</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF07</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF07</guid>
     <password>public07</password>
     <full-name>Public 07</full-name>
@@ -899,7 +899,7 @@
 </record>
 <record type="user">
     <short-name>public08</short-name>
-    <uid>public08</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF08</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF08</guid>
     <password>public08</password>
     <full-name>Public 08</full-name>
@@ -907,7 +907,7 @@
 </record>
 <record type="user">
     <short-name>public09</short-name>
-    <uid>public09</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF09</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF09</guid>
     <password>public09</password>
     <full-name>Public 09</full-name>
@@ -915,7 +915,7 @@
 </record>
 <record type="user">
     <short-name>public10</short-name>
-    <uid>public10</uid>
+    <uid>42DCA7BD-588A-458F-A1B6-1F778A85DF10</uid>
     <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF10</guid>
     <password>public10</password>
     <full-name>Public 10</full-name>
@@ -923,70 +923,70 @@
 </record>
 <record type="group">
     <short-name>group01</short-name>
-    <uid>group01</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136001</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136001</guid>
     <full-name>Group 01</full-name>
     <email>group01 at example.com</email>
-    <member-uid>user01</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member-uid>
 </record>
 <record type="group">
     <short-name>group02</short-name>
-    <uid>group02</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136002</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136002</guid>
     <full-name>Group 02</full-name>
     <email>group02 at example.com</email>
-    <member-uid>user06</member-uid>
-    <member-uid>user07</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF006</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF007</member-uid>
 </record>
 <record type="group">
     <short-name>group03</short-name>
-    <uid>group03</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136003</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136003</guid>
     <full-name>Group 03</full-name>
     <email>group03 at example.com</email>
-    <member-uid>user08</member-uid>
-    <member-uid>user09</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF008</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF009</member-uid>
 </record>
 <record type="group">
     <short-name>group04</short-name>
-    <uid>group04</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136004</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136004</guid>
     <full-name>Group 04</full-name>
     <email>group04 at example.com</email>
-    <member-uid>group02</member-uid>
-    <member-uid>group03</member-uid>
-    <member-uid>user10</member-uid>
+    <member-uid>97C1351D-35E7-41E9-8F6F-72DDB9136002</member-uid>
+    <member-uid>97C1351D-35E7-41E9-8F6F-72DDB9136003</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF010</member-uid>
 </record>
 <record type="group">
     <short-name>group05</short-name>
-    <uid>group05</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136005</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136005</guid>
     <full-name>Group 05</full-name>
     <email>group05 at example.com</email>
-    <member-uid>group06</member-uid>
-    <member-uid>user20</member-uid>
+    <member-uid>97C1351D-35E7-41E9-8F6F-72DDB9136006</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF020</member-uid>
 </record>
 <record type="group">
     <short-name>group06</short-name>
-    <uid>group06</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136006</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136006</guid>
     <full-name>Group 06</full-name>
     <email>group06 at example.com</email>
-    <member-uid>user21</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF021</member-uid>
 </record>
 <record type="group">
     <short-name>group07</short-name>
-    <uid>group07</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136007</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136007</guid>
     <full-name>Group 07</full-name>
     <email>group07 at example.com</email>
-    <member-uid>user22</member-uid>
-    <member-uid>user23</member-uid>
-    <member-uid>user24</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF022</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF023</member-uid>
+    <member-uid>708C5C91-082E-4DEB-ADD3-7CFB19ADF024</member-uid>
 </record>
 <record type="group">
     <short-name>group08</short-name>
-    <uid>group08</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136008</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136008</guid>
     <full-name>Group 08</full-name>
     <email>group08 at example.com</email>
@@ -994,7 +994,7 @@
 </record>
 <record type="group">
     <short-name>group09</short-name>
-    <uid>group09</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136009</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136009</guid>
     <full-name>Group 09</full-name>
     <email>group09 at example.com</email>
@@ -1002,7 +1002,7 @@
 </record>
 <record type="group">
     <short-name>group10</short-name>
-    <uid>group10</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136010</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136010</guid>
     <full-name>Group 10</full-name>
     <email>group10 at example.com</email>
@@ -1010,7 +1010,7 @@
 </record>
 <record type="group">
     <short-name>group11</short-name>
-    <uid>group11</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136011</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136011</guid>
     <full-name>Group 11</full-name>
     <email>group11 at example.com</email>
@@ -1018,7 +1018,7 @@
 </record>
 <record type="group">
     <short-name>group12</short-name>
-    <uid>group12</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136012</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136012</guid>
     <full-name>Group 12</full-name>
     <email>group12 at example.com</email>
@@ -1026,7 +1026,7 @@
 </record>
 <record type="group">
     <short-name>group13</short-name>
-    <uid>group13</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136013</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136013</guid>
     <full-name>Group 13</full-name>
     <email>group13 at example.com</email>
@@ -1034,7 +1034,7 @@
 </record>
 <record type="group">
     <short-name>group14</short-name>
-    <uid>group14</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136014</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136014</guid>
     <full-name>Group 14</full-name>
     <email>group14 at example.com</email>
@@ -1042,7 +1042,7 @@
 </record>
 <record type="group">
     <short-name>group15</short-name>
-    <uid>group15</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136015</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136015</guid>
     <full-name>Group 15</full-name>
     <email>group15 at example.com</email>
@@ -1050,7 +1050,7 @@
 </record>
 <record type="group">
     <short-name>group16</short-name>
-    <uid>group16</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136016</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136016</guid>
     <full-name>Group 16</full-name>
     <email>group16 at example.com</email>
@@ -1058,7 +1058,7 @@
 </record>
 <record type="group">
     <short-name>group17</short-name>
-    <uid>group17</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136017</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136017</guid>
     <full-name>Group 17</full-name>
     <email>group17 at example.com</email>
@@ -1066,7 +1066,7 @@
 </record>
 <record type="group">
     <short-name>group18</short-name>
-    <uid>group18</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136018</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136018</guid>
     <full-name>Group 18</full-name>
     <email>group18 at example.com</email>
@@ -1074,7 +1074,7 @@
 </record>
 <record type="group">
     <short-name>group19</short-name>
-    <uid>group19</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136019</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136019</guid>
     <full-name>Group 19</full-name>
     <email>group19 at example.com</email>
@@ -1082,7 +1082,7 @@
 </record>
 <record type="group">
     <short-name>group20</short-name>
-    <uid>group20</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136020</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136020</guid>
     <full-name>Group 20</full-name>
     <email>group20 at example.com</email>
@@ -1090,7 +1090,7 @@
 </record>
 <record type="group">
     <short-name>group21</short-name>
-    <uid>group21</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136021</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136021</guid>
     <full-name>Group 21</full-name>
     <email>group21 at example.com</email>
@@ -1098,7 +1098,7 @@
 </record>
 <record type="group">
     <short-name>group22</short-name>
-    <uid>group22</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136022</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136022</guid>
     <full-name>Group 22</full-name>
     <email>group22 at example.com</email>
@@ -1106,7 +1106,7 @@
 </record>
 <record type="group">
     <short-name>group23</short-name>
-    <uid>group23</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136023</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136023</guid>
     <full-name>Group 23</full-name>
     <email>group23 at example.com</email>
@@ -1114,7 +1114,7 @@
 </record>
 <record type="group">
     <short-name>group24</short-name>
-    <uid>group24</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136024</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136024</guid>
     <full-name>Group 24</full-name>
     <email>group24 at example.com</email>
@@ -1122,7 +1122,7 @@
 </record>
 <record type="group">
     <short-name>group25</short-name>
-    <uid>group25</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136025</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136025</guid>
     <full-name>Group 25</full-name>
     <email>group25 at example.com</email>
@@ -1130,7 +1130,7 @@
 </record>
 <record type="group">
     <short-name>group26</short-name>
-    <uid>group26</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136026</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136026</guid>
     <full-name>Group 26</full-name>
     <email>group26 at example.com</email>
@@ -1138,7 +1138,7 @@
 </record>
 <record type="group">
     <short-name>group27</short-name>
-    <uid>group27</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136027</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136027</guid>
     <full-name>Group 27</full-name>
     <email>group27 at example.com</email>
@@ -1146,7 +1146,7 @@
 </record>
 <record type="group">
     <short-name>group28</short-name>
-    <uid>group28</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136028</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136028</guid>
     <full-name>Group 28</full-name>
     <email>group28 at example.com</email>
@@ -1154,7 +1154,7 @@
 </record>
 <record type="group">
     <short-name>group29</short-name>
-    <uid>group29</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136029</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136029</guid>
     <full-name>Group 29</full-name>
     <email>group29 at example.com</email>
@@ -1162,7 +1162,7 @@
 </record>
 <record type="group">
     <short-name>group30</short-name>
-    <uid>group30</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136030</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136030</guid>
     <full-name>Group 30</full-name>
     <email>group30 at example.com</email>
@@ -1170,7 +1170,7 @@
 </record>
 <record type="group">
     <short-name>group31</short-name>
-    <uid>group31</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136031</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136031</guid>
     <full-name>Group 31</full-name>
     <email>group31 at example.com</email>
@@ -1178,7 +1178,7 @@
 </record>
 <record type="group">
     <short-name>group32</short-name>
-    <uid>group32</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136032</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136032</guid>
     <full-name>Group 32</full-name>
     <email>group32 at example.com</email>
@@ -1186,7 +1186,7 @@
 </record>
 <record type="group">
     <short-name>group33</short-name>
-    <uid>group33</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136033</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136033</guid>
     <full-name>Group 33</full-name>
     <email>group33 at example.com</email>
@@ -1194,7 +1194,7 @@
 </record>
 <record type="group">
     <short-name>group34</short-name>
-    <uid>group34</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136034</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136034</guid>
     <full-name>Group 34</full-name>
     <email>group34 at example.com</email>
@@ -1202,7 +1202,7 @@
 </record>
 <record type="group">
     <short-name>group35</short-name>
-    <uid>group35</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136035</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136035</guid>
     <full-name>Group 35</full-name>
     <email>group35 at example.com</email>
@@ -1210,7 +1210,7 @@
 </record>
 <record type="group">
     <short-name>group36</short-name>
-    <uid>group36</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136036</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136036</guid>
     <full-name>Group 36</full-name>
     <email>group36 at example.com</email>
@@ -1218,7 +1218,7 @@
 </record>
 <record type="group">
     <short-name>group37</short-name>
-    <uid>group37</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136037</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136037</guid>
     <full-name>Group 37</full-name>
     <email>group37 at example.com</email>
@@ -1226,7 +1226,7 @@
 </record>
 <record type="group">
     <short-name>group38</short-name>
-    <uid>group38</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136038</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136038</guid>
     <full-name>Group 38</full-name>
     <email>group38 at example.com</email>
@@ -1234,7 +1234,7 @@
 </record>
 <record type="group">
     <short-name>group39</short-name>
-    <uid>group39</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136039</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136039</guid>
     <full-name>Group 39</full-name>
     <email>group39 at example.com</email>
@@ -1242,7 +1242,7 @@
 </record>
 <record type="group">
     <short-name>group40</short-name>
-    <uid>group40</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136040</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136040</guid>
     <full-name>Group 40</full-name>
     <email>group40 at example.com</email>
@@ -1250,7 +1250,7 @@
 </record>
 <record type="group">
     <short-name>group41</short-name>
-    <uid>group41</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136041</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136041</guid>
     <full-name>Group 41</full-name>
     <email>group41 at example.com</email>
@@ -1258,7 +1258,7 @@
 </record>
 <record type="group">
     <short-name>group42</short-name>
-    <uid>group42</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136042</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136042</guid>
     <full-name>Group 42</full-name>
     <email>group42 at example.com</email>
@@ -1266,7 +1266,7 @@
 </record>
 <record type="group">
     <short-name>group43</short-name>
-    <uid>group43</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136043</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136043</guid>
     <full-name>Group 43</full-name>
     <email>group43 at example.com</email>
@@ -1274,7 +1274,7 @@
 </record>
 <record type="group">
     <short-name>group44</short-name>
-    <uid>group44</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136044</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136044</guid>
     <full-name>Group 44</full-name>
     <email>group44 at example.com</email>
@@ -1282,7 +1282,7 @@
 </record>
 <record type="group">
     <short-name>group45</short-name>
-    <uid>group45</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136045</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136045</guid>
     <full-name>Group 45</full-name>
     <email>group45 at example.com</email>
@@ -1290,7 +1290,7 @@
 </record>
 <record type="group">
     <short-name>group46</short-name>
-    <uid>group46</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136046</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136046</guid>
     <full-name>Group 46</full-name>
     <email>group46 at example.com</email>
@@ -1298,7 +1298,7 @@
 </record>
 <record type="group">
     <short-name>group47</short-name>
-    <uid>group47</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136047</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136047</guid>
     <full-name>Group 47</full-name>
     <email>group47 at example.com</email>
@@ -1306,7 +1306,7 @@
 </record>
 <record type="group">
     <short-name>group48</short-name>
-    <uid>group48</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136048</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136048</guid>
     <full-name>Group 48</full-name>
     <email>group48 at example.com</email>
@@ -1314,7 +1314,7 @@
 </record>
 <record type="group">
     <short-name>group49</short-name>
-    <uid>group49</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136049</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136049</guid>
     <full-name>Group 49</full-name>
     <email>group49 at example.com</email>
@@ -1322,7 +1322,7 @@
 </record>
 <record type="group">
     <short-name>group50</short-name>
-    <uid>group50</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136050</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136050</guid>
     <full-name>Group 50</full-name>
     <email>group50 at example.com</email>
@@ -1330,7 +1330,7 @@
 </record>
 <record type="group">
     <short-name>group51</short-name>
-    <uid>group51</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136051</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136051</guid>
     <full-name>Group 51</full-name>
     <email>group51 at example.com</email>
@@ -1338,7 +1338,7 @@
 </record>
 <record type="group">
     <short-name>group52</short-name>
-    <uid>group52</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136052</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136052</guid>
     <full-name>Group 52</full-name>
     <email>group52 at example.com</email>
@@ -1346,7 +1346,7 @@
 </record>
 <record type="group">
     <short-name>group53</short-name>
-    <uid>group53</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136053</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136053</guid>
     <full-name>Group 53</full-name>
     <email>group53 at example.com</email>
@@ -1354,7 +1354,7 @@
 </record>
 <record type="group">
     <short-name>group54</short-name>
-    <uid>group54</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136054</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136054</guid>
     <full-name>Group 54</full-name>
     <email>group54 at example.com</email>
@@ -1362,7 +1362,7 @@
 </record>
 <record type="group">
     <short-name>group55</short-name>
-    <uid>group55</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136055</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136055</guid>
     <full-name>Group 55</full-name>
     <email>group55 at example.com</email>
@@ -1370,7 +1370,7 @@
 </record>
 <record type="group">
     <short-name>group56</short-name>
-    <uid>group56</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136056</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136056</guid>
     <full-name>Group 56</full-name>
     <email>group56 at example.com</email>
@@ -1378,7 +1378,7 @@
 </record>
 <record type="group">
     <short-name>group57</short-name>
-    <uid>group57</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136057</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136057</guid>
     <full-name>Group 57</full-name>
     <email>group57 at example.com</email>
@@ -1386,7 +1386,7 @@
 </record>
 <record type="group">
     <short-name>group58</short-name>
-    <uid>group58</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136058</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136058</guid>
     <full-name>Group 58</full-name>
     <email>group58 at example.com</email>
@@ -1394,7 +1394,7 @@
 </record>
 <record type="group">
     <short-name>group59</short-name>
-    <uid>group59</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136059</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136059</guid>
     <full-name>Group 59</full-name>
     <email>group59 at example.com</email>
@@ -1402,7 +1402,7 @@
 </record>
 <record type="group">
     <short-name>group60</short-name>
-    <uid>group60</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136060</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136060</guid>
     <full-name>Group 60</full-name>
     <email>group60 at example.com</email>
@@ -1410,7 +1410,7 @@
 </record>
 <record type="group">
     <short-name>group61</short-name>
-    <uid>group61</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136061</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136061</guid>
     <full-name>Group 61</full-name>
     <email>group61 at example.com</email>
@@ -1418,7 +1418,7 @@
 </record>
 <record type="group">
     <short-name>group62</short-name>
-    <uid>group62</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136062</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136062</guid>
     <full-name>Group 62</full-name>
     <email>group62 at example.com</email>
@@ -1426,7 +1426,7 @@
 </record>
 <record type="group">
     <short-name>group63</short-name>
-    <uid>group63</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136063</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136063</guid>
     <full-name>Group 63</full-name>
     <email>group63 at example.com</email>
@@ -1434,7 +1434,7 @@
 </record>
 <record type="group">
     <short-name>group64</short-name>
-    <uid>group64</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136064</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136064</guid>
     <full-name>Group 64</full-name>
     <email>group64 at example.com</email>
@@ -1442,7 +1442,7 @@
 </record>
 <record type="group">
     <short-name>group65</short-name>
-    <uid>group65</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136065</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136065</guid>
     <full-name>Group 65</full-name>
     <email>group65 at example.com</email>
@@ -1450,7 +1450,7 @@
 </record>
 <record type="group">
     <short-name>group66</short-name>
-    <uid>group66</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136066</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136066</guid>
     <full-name>Group 66</full-name>
     <email>group66 at example.com</email>
@@ -1458,7 +1458,7 @@
 </record>
 <record type="group">
     <short-name>group67</short-name>
-    <uid>group67</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136067</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136067</guid>
     <full-name>Group 67</full-name>
     <email>group67 at example.com</email>
@@ -1466,7 +1466,7 @@
 </record>
 <record type="group">
     <short-name>group68</short-name>
-    <uid>group68</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136068</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136068</guid>
     <full-name>Group 68</full-name>
     <email>group68 at example.com</email>
@@ -1474,7 +1474,7 @@
 </record>
 <record type="group">
     <short-name>group69</short-name>
-    <uid>group69</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136069</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136069</guid>
     <full-name>Group 69</full-name>
     <email>group69 at example.com</email>
@@ -1482,7 +1482,7 @@
 </record>
 <record type="group">
     <short-name>group70</short-name>
-    <uid>group70</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136070</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136070</guid>
     <full-name>Group 70</full-name>
     <email>group70 at example.com</email>
@@ -1490,7 +1490,7 @@
 </record>
 <record type="group">
     <short-name>group71</short-name>
-    <uid>group71</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136071</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136071</guid>
     <full-name>Group 71</full-name>
     <email>group71 at example.com</email>
@@ -1498,7 +1498,7 @@
 </record>
 <record type="group">
     <short-name>group72</short-name>
-    <uid>group72</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136072</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136072</guid>
     <full-name>Group 72</full-name>
     <email>group72 at example.com</email>
@@ -1506,7 +1506,7 @@
 </record>
 <record type="group">
     <short-name>group73</short-name>
-    <uid>group73</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136073</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136073</guid>
     <full-name>Group 73</full-name>
     <email>group73 at example.com</email>
@@ -1514,7 +1514,7 @@
 </record>
 <record type="group">
     <short-name>group74</short-name>
-    <uid>group74</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136074</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136074</guid>
     <full-name>Group 74</full-name>
     <email>group74 at example.com</email>
@@ -1522,7 +1522,7 @@
 </record>
 <record type="group">
     <short-name>group75</short-name>
-    <uid>group75</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136075</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136075</guid>
     <full-name>Group 75</full-name>
     <email>group75 at example.com</email>
@@ -1530,7 +1530,7 @@
 </record>
 <record type="group">
     <short-name>group76</short-name>
-    <uid>group76</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136076</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136076</guid>
     <full-name>Group 76</full-name>
     <email>group76 at example.com</email>
@@ -1538,7 +1538,7 @@
 </record>
 <record type="group">
     <short-name>group77</short-name>
-    <uid>group77</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136077</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136077</guid>
     <full-name>Group 77</full-name>
     <email>group77 at example.com</email>
@@ -1546,7 +1546,7 @@
 </record>
 <record type="group">
     <short-name>group78</short-name>
-    <uid>group78</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136078</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136078</guid>
     <full-name>Group 78</full-name>
     <email>group78 at example.com</email>
@@ -1554,7 +1554,7 @@
 </record>
 <record type="group">
     <short-name>group79</short-name>
-    <uid>group79</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136079</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136079</guid>
     <full-name>Group 79</full-name>
     <email>group79 at example.com</email>
@@ -1562,7 +1562,7 @@
 </record>
 <record type="group">
     <short-name>group80</short-name>
-    <uid>group80</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136080</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136080</guid>
     <full-name>Group 80</full-name>
     <email>group80 at example.com</email>
@@ -1570,7 +1570,7 @@
 </record>
 <record type="group">
     <short-name>group81</short-name>
-    <uid>group81</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136081</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136081</guid>
     <full-name>Group 81</full-name>
     <email>group81 at example.com</email>
@@ -1578,7 +1578,7 @@
 </record>
 <record type="group">
     <short-name>group82</short-name>
-    <uid>group82</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136082</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136082</guid>
     <full-name>Group 82</full-name>
     <email>group82 at example.com</email>
@@ -1586,7 +1586,7 @@
 </record>
 <record type="group">
     <short-name>group83</short-name>
-    <uid>group83</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136083</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136083</guid>
     <full-name>Group 83</full-name>
     <email>group83 at example.com</email>
@@ -1594,7 +1594,7 @@
 </record>
 <record type="group">
     <short-name>group84</short-name>
-    <uid>group84</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136084</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136084</guid>
     <full-name>Group 84</full-name>
     <email>group84 at example.com</email>
@@ -1602,7 +1602,7 @@
 </record>
 <record type="group">
     <short-name>group85</short-name>
-    <uid>group85</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136085</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136085</guid>
     <full-name>Group 85</full-name>
     <email>group85 at example.com</email>
@@ -1610,7 +1610,7 @@
 </record>
 <record type="group">
     <short-name>group86</short-name>
-    <uid>group86</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136086</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136086</guid>
     <full-name>Group 86</full-name>
     <email>group86 at example.com</email>
@@ -1618,7 +1618,7 @@
 </record>
 <record type="group">
     <short-name>group87</short-name>
-    <uid>group87</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136087</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136087</guid>
     <full-name>Group 87</full-name>
     <email>group87 at example.com</email>
@@ -1626,7 +1626,7 @@
 </record>
 <record type="group">
     <short-name>group88</short-name>
-    <uid>group88</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136088</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136088</guid>
     <full-name>Group 88</full-name>
     <email>group88 at example.com</email>
@@ -1634,7 +1634,7 @@
 </record>
 <record type="group">
     <short-name>group89</short-name>
-    <uid>group89</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136089</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136089</guid>
     <full-name>Group 89</full-name>
     <email>group89 at example.com</email>
@@ -1642,7 +1642,7 @@
 </record>
 <record type="group">
     <short-name>group90</short-name>
-    <uid>group90</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136090</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136090</guid>
     <full-name>Group 90</full-name>
     <email>group90 at example.com</email>
@@ -1650,7 +1650,7 @@
 </record>
 <record type="group">
     <short-name>group91</short-name>
-    <uid>group91</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136091</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136091</guid>
     <full-name>Group 91</full-name>
     <email>group91 at example.com</email>
@@ -1658,7 +1658,7 @@
 </record>
 <record type="group">
     <short-name>group92</short-name>
-    <uid>group92</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136092</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136092</guid>
     <full-name>Group 92</full-name>
     <email>group92 at example.com</email>
@@ -1666,7 +1666,7 @@
 </record>
 <record type="group">
     <short-name>group93</short-name>
-    <uid>group93</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136093</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136093</guid>
     <full-name>Group 93</full-name>
     <email>group93 at example.com</email>
@@ -1674,7 +1674,7 @@
 </record>
 <record type="group">
     <short-name>group94</short-name>
-    <uid>group94</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136094</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136094</guid>
     <full-name>Group 94</full-name>
     <email>group94 at example.com</email>
@@ -1682,7 +1682,7 @@
 </record>
 <record type="group">
     <short-name>group95</short-name>
-    <uid>group95</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136095</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136095</guid>
     <full-name>Group 95</full-name>
     <email>group95 at example.com</email>
@@ -1690,7 +1690,7 @@
 </record>
 <record type="group">
     <short-name>group96</short-name>
-    <uid>group96</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136096</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136096</guid>
     <full-name>Group 96</full-name>
     <email>group96 at example.com</email>
@@ -1698,7 +1698,7 @@
 </record>
 <record type="group">
     <short-name>group97</short-name>
-    <uid>group97</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136097</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136097</guid>
     <full-name>Group 97</full-name>
     <email>group97 at example.com</email>
@@ -1706,7 +1706,7 @@
 </record>
 <record type="group">
     <short-name>group98</short-name>
-    <uid>group98</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136098</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136098</guid>
     <full-name>Group 98</full-name>
     <email>group98 at example.com</email>
@@ -1714,7 +1714,7 @@
 </record>
 <record type="group">
     <short-name>group99</short-name>
-    <uid>group99</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136099</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136099</guid>
     <full-name>Group 99</full-name>
     <email>group99 at example.com</email>
@@ -1722,7 +1722,7 @@
 </record>
 <record type="group">
     <short-name>group100</short-name>
-    <uid>group100</uid>
+    <uid>97C1351D-35E7-41E9-8F6F-72DDB9136100</uid>
     <guid>97C1351D-35E7-41E9-8F6F-72DDB9136100</guid>
     <full-name>Group 100</full-name>
     <email>group100 at example.com</email>

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml	2014-04-01 19:26:15 UTC (rev 13095)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/augments-test.xml	2014-04-01 19:54:06 UTC (rev 13096)
@@ -23,49 +23,49 @@
     <enable-addressbook>true</enable-addressbook>
 </record>
 <record>
-    <uid>resource04</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1004</uid>
     <auto-schedule-mode>none</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource05</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1005</uid>
     <auto-schedule-mode>none</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource06</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1006</uid>
     <auto-schedule-mode>accept-always</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource07</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1007</uid>
     <auto-schedule-mode>decline-always</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource08</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1008</uid>
     <auto-schedule-mode>accept-if-free</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource09</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1009</uid>
     <auto-schedule-mode>decline-if-busy</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource10</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1010</uid>
     <auto-schedule-mode>automatic</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>
 </record>
 <record>
-    <uid>resource11</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1011</uid>
     <auto-schedule-mode>automatic</auto-schedule-mode>
     <enable-addressbook>true</enable-addressbook>
     <enable-calendar>true</enable-calendar>

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py	2014-04-01 19:26:15 UTC (rev 13095)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/generate_test_accounts.py	2014-04-01 19:54:06 UTC (rev 13096)
@@ -24,6 +24,13 @@
 
 """
 
+# The uids and guids for CDT test accounts are the same
+# The short name is of the form userNN
+USERGUIDS = "708C5C91-082E-4DEB-ADD3-7CFB19ADF%03d"
+GROUPGUIDS = "97C1351D-35E7-41E9-8F6F-72DDB9136%03d"
+LOCATIONGUIDS = "34EB6DBA-B94C-4F82-8FEF-EB2C19258%03d"
+RESOURCEGUIDS = "9DD5F2A5-DAA7-4CEB-825C-2EEB458C1%03d"
+PUBLICGUIDS = "42DCA7BD-588A-458F-A1B6-1F778A85DF%02d"
 
 # accounts-test.xml
 
@@ -38,7 +45,7 @@
     ("i18nuser", u"\ud83d\udca3".encode("utf-8"), "860B3EE9-6D7C-4296-9639-E6B998074A78"),
 ):
     out.write("""<record>
-    <uid>{uid}</uid>
+    <uid>{guid}</uid>
     <guid>{guid}</guid>
     <short-name>{uid}</short-name>
     <password>{uid}</password>
@@ -51,42 +58,41 @@
 for i in xrange(1, 101):
     out.write("""<record type="user">
     <short-name>user%02d</short-name>
-    <uid>user%02d</uid>
-    <guid>708C5C91-082E-4DEB-ADD3-7CFB19ADF%03d</guid>
+    <uid>%s</uid>
+    <guid>%s</guid>
     <password>user%02d</password>
     <full-name>User %02d</full-name>
     <email>user%02d at example.com</email>
 </record>
-""" % (i, i, i, i, i, i))
+""" % (i, USERGUIDS % i, USERGUIDS % i, i, i, i))
 
 # public01-10
 for i in xrange(1, 11):
     out.write("""<record type="user">
     <short-name>public%02d</short-name>
-    <uid>public%02d</uid>
-    <guid>42DCA7BD-588A-458F-A1B6-1F778A85DF%02d</guid>
+    <uid>%s</uid>
+    <guid>%s</guid>
     <password>public%02d</password>
     <full-name>Public %02d</full-name>
     <email>public%02d at example.com</email>
 </record>
-""" % (i, i, i, i, i, i))
+""" % (i, PUBLICGUIDS % i, PUBLICGUIDS % i, i, i, i))
 
 # group01-100
 members = {
-    "group01": ("user01",),
-    "group02": ("user06", "user07"),
-    "group03": ("user08", "user09"),
-    "group04": ("group02", "group03", "user10"),
-    "group05": ("group06", "user20"),
-    "group06": ("user21",),
-    "group07": ("user22", "user23", "user24"),
-    "disabledgroup": ("user01",),
+    GROUPGUIDS % 1: (USERGUIDS % 1,),
+    GROUPGUIDS % 2: (USERGUIDS % 6, USERGUIDS % 7),
+    GROUPGUIDS % 3: (USERGUIDS % 8, USERGUIDS % 9),
+    GROUPGUIDS % 4: (GROUPGUIDS % 2, GROUPGUIDS % 3, USERGUIDS % 10),
+    GROUPGUIDS % 5: (GROUPGUIDS % 6, USERGUIDS % 20),
+    GROUPGUIDS % 6: (USERGUIDS % 21,),
+    GROUPGUIDS % 7: (USERGUIDS % 22, USERGUIDS % 23, USERGUIDS % 24),
 }
 
 for i in xrange(1, 101):
 
     memberElements = []
-    groupUID = "group%02d" % i
+    groupUID = GROUPGUIDS % i
     if groupUID in members:
         for uid in members[groupUID]:
             memberElements.append("<member-uid>{}</member-uid>".format(uid))
@@ -96,13 +102,13 @@
 
     out.write("""<record type="group">
     <short-name>group%02d</short-name>
-    <uid>group%02d</uid>
-    <guid>97C1351D-35E7-41E9-8F6F-72DDB9136%03d</guid>
+    <uid>%s</uid>
+    <guid>%s</guid>
     <full-name>Group %02d</full-name>
     <email>group%02d at example.com</email>
     %s
 </record>
-""" % (i, i, i, i, i, memberString))
+""" % (i, GROUPGUIDS % i, GROUPGUIDS % i, i, i, memberString))
 
 out.write("</directory>\n")
 out.close()
@@ -146,21 +152,21 @@
 for i in xrange(1, 101):
     out.write("""<record type="location">
     <short-name>location%02d</short-name>
-    <uid>location%02d</uid>
-    <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258%03d</guid>
+    <uid>%s</uid>
+    <guid>%s</guid>
     <full-name>Location %02d</full-name>
 </record>
-""" % (i, i, i, i))
+""" % (i, LOCATIONGUIDS % i, LOCATIONGUIDS % i, i))
 
 
 for i in xrange(1, 101):
     out.write("""<record type="resource">
     <short-name>resource%02d</short-name>
-    <uid>resource%02d</uid>
-    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1%03d</guid>
+    <uid>%s</uid>
+    <guid>%s</guid>
     <full-name>Resource %02d</full-name>
 </record>
-""" % (i, i, i, i))
+""" % (i, RESOURCEGUIDS % i, RESOURCEGUIDS % i, i))
 
 out.write("</directory>\n")
 out.close()
@@ -173,42 +179,50 @@
 out.write("<augments>\n")
 
 augments = (
-    ("resource04", {
+    # resource04
+    (RESOURCEGUIDS % 4, {
         "auto-schedule-mode": "none",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource05", {
+    # resource05
+    (RESOURCEGUIDS % 5, {
         "auto-schedule-mode": "none",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource06", {
+    # resource06
+    (RESOURCEGUIDS % 6, {
         "auto-schedule-mode": "accept-always",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource07", {
+    # resource07
+    (RESOURCEGUIDS % 7, {
         "auto-schedule-mode": "decline-always",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource08", {
+    # resource08
+    (RESOURCEGUIDS % 8, {
         "auto-schedule-mode": "accept-if-free",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource09", {
+    # resource09
+    (RESOURCEGUIDS % 9, {
         "auto-schedule-mode": "decline-if-busy",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource10", {
+    # resource10
+    (RESOURCEGUIDS % 10, {
         "auto-schedule-mode": "automatic",
         "enable-calendar": "true",
         "enable-addressbook": "true",
     }),
-    ("resource11", {
+    # resource11
+    (RESOURCEGUIDS % 11, {
         "auto-schedule-mode": "automatic",
         "auto-accept-group": "group01",
         "enable-calendar": "true",
@@ -246,45 +260,45 @@
 out.write("<proxies>\n")
 
 proxies = (
-    ("resource01", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1001", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource02", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1002", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource03", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1003", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource04", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1004", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource05", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1005", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource06", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1006", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource07", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1007", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource08", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1008", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource09", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1009", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
-    ("resource10", {
-        "proxies": ("user01",),
-        "read-only-proxies": ("user03",),
+    ("9DD5F2A5-DAA7-4CEB-825C-2EEB458C1010", {
+        "proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF001",),
+        "read-only-proxies": ("708C5C91-082E-4DEB-ADD3-7CFB19ADF003",),
     }),
 )
 

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/proxies-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/proxies-test.xml	2014-04-01 19:26:15 UTC (rev 13095)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/proxies-test.xml	2014-04-01 19:54:06 UTC (rev 13096)
@@ -18,93 +18,93 @@
 
 <proxies>
 <record>
-    <guid>resource01</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1001</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource02</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1002</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource03</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1003</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource04</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1004</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource05</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1005</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource06</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1006</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource07</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1007</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource08</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1008</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource09</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1009</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 <record>
-    <guid>resource10</guid>
+    <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1010</guid>
     <proxies>
-    <member>user01</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF001</member>
     </proxies>
     <read-only-proxies>
-    <member>user03</member>
+    <member>708C5C91-082E-4DEB-ADD3-7CFB19ADF003</member>
     </read-only-proxies>
 </record>
 </proxies>

Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml	2014-04-01 19:26:15 UTC (rev 13095)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml	2014-04-01 19:54:06 UTC (rev 13096)
@@ -46,1201 +46,1201 @@
   </record>
 <record type="location">
     <short-name>location01</short-name>
-    <uid>location01</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258001</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258001</guid>
     <full-name>Location 01</full-name>
 </record>
 <record type="location">
     <short-name>location02</short-name>
-    <uid>location02</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258002</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258002</guid>
     <full-name>Location 02</full-name>
 </record>
 <record type="location">
     <short-name>location03</short-name>
-    <uid>location03</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258003</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258003</guid>
     <full-name>Location 03</full-name>
 </record>
 <record type="location">
     <short-name>location04</short-name>
-    <uid>location04</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258004</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258004</guid>
     <full-name>Location 04</full-name>
 </record>
 <record type="location">
     <short-name>location05</short-name>
-    <uid>location05</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258005</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258005</guid>
     <full-name>Location 05</full-name>
 </record>
 <record type="location">
     <short-name>location06</short-name>
-    <uid>location06</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258006</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258006</guid>
     <full-name>Location 06</full-name>
 </record>
 <record type="location">
     <short-name>location07</short-name>
-    <uid>location07</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258007</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258007</guid>
     <full-name>Location 07</full-name>
 </record>
 <record type="location">
     <short-name>location08</short-name>
-    <uid>location08</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258008</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258008</guid>
     <full-name>Location 08</full-name>
 </record>
 <record type="location">
     <short-name>location09</short-name>
-    <uid>location09</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258009</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258009</guid>
     <full-name>Location 09</full-name>
 </record>
 <record type="location">
     <short-name>location10</short-name>
-    <uid>location10</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258010</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258010</guid>
     <full-name>Location 10</full-name>
 </record>
 <record type="location">
     <short-name>location11</short-name>
-    <uid>location11</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258011</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258011</guid>
     <full-name>Location 11</full-name>
 </record>
 <record type="location">
     <short-name>location12</short-name>
-    <uid>location12</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258012</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258012</guid>
     <full-name>Location 12</full-name>
 </record>
 <record type="location">
     <short-name>location13</short-name>
-    <uid>location13</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258013</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258013</guid>
     <full-name>Location 13</full-name>
 </record>
 <record type="location">
     <short-name>location14</short-name>
-    <uid>location14</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258014</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258014</guid>
     <full-name>Location 14</full-name>
 </record>
 <record type="location">
     <short-name>location15</short-name>
-    <uid>location15</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258015</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258015</guid>
     <full-name>Location 15</full-name>
 </record>
 <record type="location">
     <short-name>location16</short-name>
-    <uid>location16</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258016</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258016</guid>
     <full-name>Location 16</full-name>
 </record>
 <record type="location">
     <short-name>location17</short-name>
-    <uid>location17</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258017</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258017</guid>
     <full-name>Location 17</full-name>
 </record>
 <record type="location">
     <short-name>location18</short-name>
-    <uid>location18</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258018</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258018</guid>
     <full-name>Location 18</full-name>
 </record>
 <record type="location">
     <short-name>location19</short-name>
-    <uid>location19</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258019</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258019</guid>
     <full-name>Location 19</full-name>
 </record>
 <record type="location">
     <short-name>location20</short-name>
-    <uid>location20</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258020</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258020</guid>
     <full-name>Location 20</full-name>
 </record>
 <record type="location">
     <short-name>location21</short-name>
-    <uid>location21</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258021</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258021</guid>
     <full-name>Location 21</full-name>
 </record>
 <record type="location">
     <short-name>location22</short-name>
-    <uid>location22</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258022</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258022</guid>
     <full-name>Location 22</full-name>
 </record>
 <record type="location">
     <short-name>location23</short-name>
-    <uid>location23</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258023</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258023</guid>
     <full-name>Location 23</full-name>
 </record>
 <record type="location">
     <short-name>location24</short-name>
-    <uid>location24</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258024</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258024</guid>
     <full-name>Location 24</full-name>
 </record>
 <record type="location">
     <short-name>location25</short-name>
-    <uid>location25</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258025</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258025</guid>
     <full-name>Location 25</full-name>
 </record>
 <record type="location">
     <short-name>location26</short-name>
-    <uid>location26</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258026</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258026</guid>
     <full-name>Location 26</full-name>
 </record>
 <record type="location">
     <short-name>location27</short-name>
-    <uid>location27</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258027</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258027</guid>
     <full-name>Location 27</full-name>
 </record>
 <record type="location">
     <short-name>location28</short-name>
-    <uid>location28</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258028</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258028</guid>
     <full-name>Location 28</full-name>
 </record>
 <record type="location">
     <short-name>location29</short-name>
-    <uid>location29</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258029</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258029</guid>
     <full-name>Location 29</full-name>
 </record>
 <record type="location">
     <short-name>location30</short-name>
-    <uid>location30</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258030</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258030</guid>
     <full-name>Location 30</full-name>
 </record>
 <record type="location">
     <short-name>location31</short-name>
-    <uid>location31</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258031</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258031</guid>
     <full-name>Location 31</full-name>
 </record>
 <record type="location">
     <short-name>location32</short-name>
-    <uid>location32</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258032</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258032</guid>
     <full-name>Location 32</full-name>
 </record>
 <record type="location">
     <short-name>location33</short-name>
-    <uid>location33</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258033</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258033</guid>
     <full-name>Location 33</full-name>
 </record>
 <record type="location">
     <short-name>location34</short-name>
-    <uid>location34</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258034</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258034</guid>
     <full-name>Location 34</full-name>
 </record>
 <record type="location">
     <short-name>location35</short-name>
-    <uid>location35</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258035</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258035</guid>
     <full-name>Location 35</full-name>
 </record>
 <record type="location">
     <short-name>location36</short-name>
-    <uid>location36</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258036</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258036</guid>
     <full-name>Location 36</full-name>
 </record>
 <record type="location">
     <short-name>location37</short-name>
-    <uid>location37</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258037</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258037</guid>
     <full-name>Location 37</full-name>
 </record>
 <record type="location">
     <short-name>location38</short-name>
-    <uid>location38</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258038</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258038</guid>
     <full-name>Location 38</full-name>
 </record>
 <record type="location">
     <short-name>location39</short-name>
-    <uid>location39</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258039</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258039</guid>
     <full-name>Location 39</full-name>
 </record>
 <record type="location">
     <short-name>location40</short-name>
-    <uid>location40</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258040</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258040</guid>
     <full-name>Location 40</full-name>
 </record>
 <record type="location">
     <short-name>location41</short-name>
-    <uid>location41</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258041</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258041</guid>
     <full-name>Location 41</full-name>
 </record>
 <record type="location">
     <short-name>location42</short-name>
-    <uid>location42</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258042</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258042</guid>
     <full-name>Location 42</full-name>
 </record>
 <record type="location">
     <short-name>location43</short-name>
-    <uid>location43</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258043</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258043</guid>
     <full-name>Location 43</full-name>
 </record>
 <record type="location">
     <short-name>location44</short-name>
-    <uid>location44</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258044</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258044</guid>
     <full-name>Location 44</full-name>
 </record>
 <record type="location">
     <short-name>location45</short-name>
-    <uid>location45</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258045</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258045</guid>
     <full-name>Location 45</full-name>
 </record>
 <record type="location">
     <short-name>location46</short-name>
-    <uid>location46</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258046</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258046</guid>
     <full-name>Location 46</full-name>
 </record>
 <record type="location">
     <short-name>location47</short-name>
-    <uid>location47</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258047</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258047</guid>
     <full-name>Location 47</full-name>
 </record>
 <record type="location">
     <short-name>location48</short-name>
-    <uid>location48</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258048</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258048</guid>
     <full-name>Location 48</full-name>
 </record>
 <record type="location">
     <short-name>location49</short-name>
-    <uid>location49</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258049</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258049</guid>
     <full-name>Location 49</full-name>
 </record>
 <record type="location">
     <short-name>location50</short-name>
-    <uid>location50</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258050</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258050</guid>
     <full-name>Location 50</full-name>
 </record>
 <record type="location">
     <short-name>location51</short-name>
-    <uid>location51</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258051</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258051</guid>
     <full-name>Location 51</full-name>
 </record>
 <record type="location">
     <short-name>location52</short-name>
-    <uid>location52</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258052</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258052</guid>
     <full-name>Location 52</full-name>
 </record>
 <record type="location">
     <short-name>location53</short-name>
-    <uid>location53</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258053</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258053</guid>
     <full-name>Location 53</full-name>
 </record>
 <record type="location">
     <short-name>location54</short-name>
-    <uid>location54</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258054</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258054</guid>
     <full-name>Location 54</full-name>
 </record>
 <record type="location">
     <short-name>location55</short-name>
-    <uid>location55</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258055</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258055</guid>
     <full-name>Location 55</full-name>
 </record>
 <record type="location">
     <short-name>location56</short-name>
-    <uid>location56</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258056</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258056</guid>
     <full-name>Location 56</full-name>
 </record>
 <record type="location">
     <short-name>location57</short-name>
-    <uid>location57</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258057</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258057</guid>
     <full-name>Location 57</full-name>
 </record>
 <record type="location">
     <short-name>location58</short-name>
-    <uid>location58</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258058</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258058</guid>
     <full-name>Location 58</full-name>
 </record>
 <record type="location">
     <short-name>location59</short-name>
-    <uid>location59</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258059</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258059</guid>
     <full-name>Location 59</full-name>
 </record>
 <record type="location">
     <short-name>location60</short-name>
-    <uid>location60</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258060</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258060</guid>
     <full-name>Location 60</full-name>
 </record>
 <record type="location">
     <short-name>location61</short-name>
-    <uid>location61</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258061</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258061</guid>
     <full-name>Location 61</full-name>
 </record>
 <record type="location">
     <short-name>location62</short-name>
-    <uid>location62</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258062</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258062</guid>
     <full-name>Location 62</full-name>
 </record>
 <record type="location">
     <short-name>location63</short-name>
-    <uid>location63</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258063</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258063</guid>
     <full-name>Location 63</full-name>
 </record>
 <record type="location">
     <short-name>location64</short-name>
-    <uid>location64</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258064</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258064</guid>
     <full-name>Location 64</full-name>
 </record>
 <record type="location">
     <short-name>location65</short-name>
-    <uid>location65</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258065</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258065</guid>
     <full-name>Location 65</full-name>
 </record>
 <record type="location">
     <short-name>location66</short-name>
-    <uid>location66</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258066</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258066</guid>
     <full-name>Location 66</full-name>
 </record>
 <record type="location">
     <short-name>location67</short-name>
-    <uid>location67</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258067</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258067</guid>
     <full-name>Location 67</full-name>
 </record>
 <record type="location">
     <short-name>location68</short-name>
-    <uid>location68</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258068</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258068</guid>
     <full-name>Location 68</full-name>
 </record>
 <record type="location">
     <short-name>location69</short-name>
-    <uid>location69</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258069</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258069</guid>
     <full-name>Location 69</full-name>
 </record>
 <record type="location">
     <short-name>location70</short-name>
-    <uid>location70</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258070</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258070</guid>
     <full-name>Location 70</full-name>
 </record>
 <record type="location">
     <short-name>location71</short-name>
-    <uid>location71</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258071</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258071</guid>
     <full-name>Location 71</full-name>
 </record>
 <record type="location">
     <short-name>location72</short-name>
-    <uid>location72</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258072</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258072</guid>
     <full-name>Location 72</full-name>
 </record>
 <record type="location">
     <short-name>location73</short-name>
-    <uid>location73</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258073</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258073</guid>
     <full-name>Location 73</full-name>
 </record>
 <record type="location">
     <short-name>location74</short-name>
-    <uid>location74</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258074</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258074</guid>
     <full-name>Location 74</full-name>
 </record>
 <record type="location">
     <short-name>location75</short-name>
-    <uid>location75</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258075</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258075</guid>
     <full-name>Location 75</full-name>
 </record>
 <record type="location">
     <short-name>location76</short-name>
-    <uid>location76</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258076</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258076</guid>
     <full-name>Location 76</full-name>
 </record>
 <record type="location">
     <short-name>location77</short-name>
-    <uid>location77</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258077</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258077</guid>
     <full-name>Location 77</full-name>
 </record>
 <record type="location">
     <short-name>location78</short-name>
-    <uid>location78</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258078</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258078</guid>
     <full-name>Location 78</full-name>
 </record>
 <record type="location">
     <short-name>location79</short-name>
-    <uid>location79</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258079</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258079</guid>
     <full-name>Location 79</full-name>
 </record>
 <record type="location">
     <short-name>location80</short-name>
-    <uid>location80</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258080</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258080</guid>
     <full-name>Location 80</full-name>
 </record>
 <record type="location">
     <short-name>location81</short-name>
-    <uid>location81</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258081</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258081</guid>
     <full-name>Location 81</full-name>
 </record>
 <record type="location">
     <short-name>location82</short-name>
-    <uid>location82</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258082</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258082</guid>
     <full-name>Location 82</full-name>
 </record>
 <record type="location">
     <short-name>location83</short-name>
-    <uid>location83</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258083</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258083</guid>
     <full-name>Location 83</full-name>
 </record>
 <record type="location">
     <short-name>location84</short-name>
-    <uid>location84</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258084</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258084</guid>
     <full-name>Location 84</full-name>
 </record>
 <record type="location">
     <short-name>location85</short-name>
-    <uid>location85</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258085</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258085</guid>
     <full-name>Location 85</full-name>
 </record>
 <record type="location">
     <short-name>location86</short-name>
-    <uid>location86</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258086</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258086</guid>
     <full-name>Location 86</full-name>
 </record>
 <record type="location">
     <short-name>location87</short-name>
-    <uid>location87</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258087</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258087</guid>
     <full-name>Location 87</full-name>
 </record>
 <record type="location">
     <short-name>location88</short-name>
-    <uid>location88</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258088</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258088</guid>
     <full-name>Location 88</full-name>
 </record>
 <record type="location">
     <short-name>location89</short-name>
-    <uid>location89</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258089</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258089</guid>
     <full-name>Location 89</full-name>
 </record>
 <record type="location">
     <short-name>location90</short-name>
-    <uid>location90</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258090</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258090</guid>
     <full-name>Location 90</full-name>
 </record>
 <record type="location">
     <short-name>location91</short-name>
-    <uid>location91</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258091</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258091</guid>
     <full-name>Location 91</full-name>
 </record>
 <record type="location">
     <short-name>location92</short-name>
-    <uid>location92</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258092</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258092</guid>
     <full-name>Location 92</full-name>
 </record>
 <record type="location">
     <short-name>location93</short-name>
-    <uid>location93</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258093</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258093</guid>
     <full-name>Location 93</full-name>
 </record>
 <record type="location">
     <short-name>location94</short-name>
-    <uid>location94</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258094</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258094</guid>
     <full-name>Location 94</full-name>
 </record>
 <record type="location">
     <short-name>location95</short-name>
-    <uid>location95</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258095</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258095</guid>
     <full-name>Location 95</full-name>
 </record>
 <record type="location">
     <short-name>location96</short-name>
-    <uid>location96</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258096</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258096</guid>
     <full-name>Location 96</full-name>
 </record>
 <record type="location">
     <short-name>location97</short-name>
-    <uid>location97</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258097</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258097</guid>
     <full-name>Location 97</full-name>
 </record>
 <record type="location">
     <short-name>location98</short-name>
-    <uid>location98</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258098</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258098</guid>
     <full-name>Location 98</full-name>
 </record>
 <record type="location">
     <short-name>location99</short-name>
-    <uid>location99</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258099</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258099</guid>
     <full-name>Location 99</full-name>
 </record>
 <record type="location">
     <short-name>location100</short-name>
-    <uid>location100</uid>
+    <uid>34EB6DBA-B94C-4F82-8FEF-EB2C19258100</uid>
     <guid>34EB6DBA-B94C-4F82-8FEF-EB2C19258100</guid>
     <full-name>Location 100</full-name>
 </record>
 <record type="resource">
     <short-name>resource01</short-name>
-    <uid>resource01</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1001</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1001</guid>
     <full-name>Resource 01</full-name>
 </record>
 <record type="resource">
     <short-name>resource02</short-name>
-    <uid>resource02</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1002</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1002</guid>
     <full-name>Resource 02</full-name>
 </record>
 <record type="resource">
     <short-name>resource03</short-name>
-    <uid>resource03</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1003</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1003</guid>
     <full-name>Resource 03</full-name>
 </record>
 <record type="resource">
     <short-name>resource04</short-name>
-    <uid>resource04</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1004</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1004</guid>
     <full-name>Resource 04</full-name>
 </record>
 <record type="resource">
     <short-name>resource05</short-name>
-    <uid>resource05</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1005</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1005</guid>
     <full-name>Resource 05</full-name>
 </record>
 <record type="resource">
     <short-name>resource06</short-name>
-    <uid>resource06</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1006</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1006</guid>
     <full-name>Resource 06</full-name>
 </record>
 <record type="resource">
     <short-name>resource07</short-name>
-    <uid>resource07</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1007</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1007</guid>
     <full-name>Resource 07</full-name>
 </record>
 <record type="resource">
     <short-name>resource08</short-name>
-    <uid>resource08</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1008</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1008</guid>
     <full-name>Resource 08</full-name>
 </record>
 <record type="resource">
     <short-name>resource09</short-name>
-    <uid>resource09</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1009</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1009</guid>
     <full-name>Resource 09</full-name>
 </record>
 <record type="resource">
     <short-name>resource10</short-name>
-    <uid>resource10</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1010</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1010</guid>
     <full-name>Resource 10</full-name>
 </record>
 <record type="resource">
     <short-name>resource11</short-name>
-    <uid>resource11</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1011</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1011</guid>
     <full-name>Resource 11</full-name>
 </record>
 <record type="resource">
     <short-name>resource12</short-name>
-    <uid>resource12</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1012</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1012</guid>
     <full-name>Resource 12</full-name>
 </record>
 <record type="resource">
     <short-name>resource13</short-name>
-    <uid>resource13</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1013</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1013</guid>
     <full-name>Resource 13</full-name>
 </record>
 <record type="resource">
     <short-name>resource14</short-name>
-    <uid>resource14</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1014</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1014</guid>
     <full-name>Resource 14</full-name>
 </record>
 <record type="resource">
     <short-name>resource15</short-name>
-    <uid>resource15</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1015</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1015</guid>
     <full-name>Resource 15</full-name>
 </record>
 <record type="resource">
     <short-name>resource16</short-name>
-    <uid>resource16</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1016</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1016</guid>
     <full-name>Resource 16</full-name>
 </record>
 <record type="resource">
     <short-name>resource17</short-name>
-    <uid>resource17</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1017</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1017</guid>
     <full-name>Resource 17</full-name>
 </record>
 <record type="resource">
     <short-name>resource18</short-name>
-    <uid>resource18</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1018</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1018</guid>
     <full-name>Resource 18</full-name>
 </record>
 <record type="resource">
     <short-name>resource19</short-name>
-    <uid>resource19</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1019</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1019</guid>
     <full-name>Resource 19</full-name>
 </record>
 <record type="resource">
     <short-name>resource20</short-name>
-    <uid>resource20</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1020</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1020</guid>
     <full-name>Resource 20</full-name>
 </record>
 <record type="resource">
     <short-name>resource21</short-name>
-    <uid>resource21</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1021</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1021</guid>
     <full-name>Resource 21</full-name>
 </record>
 <record type="resource">
     <short-name>resource22</short-name>
-    <uid>resource22</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1022</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1022</guid>
     <full-name>Resource 22</full-name>
 </record>
 <record type="resource">
     <short-name>resource23</short-name>
-    <uid>resource23</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1023</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1023</guid>
     <full-name>Resource 23</full-name>
 </record>
 <record type="resource">
     <short-name>resource24</short-name>
-    <uid>resource24</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1024</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1024</guid>
     <full-name>Resource 24</full-name>
 </record>
 <record type="resource">
     <short-name>resource25</short-name>
-    <uid>resource25</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1025</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1025</guid>
     <full-name>Resource 25</full-name>
 </record>
 <record type="resource">
     <short-name>resource26</short-name>
-    <uid>resource26</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1026</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1026</guid>
     <full-name>Resource 26</full-name>
 </record>
 <record type="resource">
     <short-name>resource27</short-name>
-    <uid>resource27</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1027</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1027</guid>
     <full-name>Resource 27</full-name>
 </record>
 <record type="resource">
     <short-name>resource28</short-name>
-    <uid>resource28</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1028</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1028</guid>
     <full-name>Resource 28</full-name>
 </record>
 <record type="resource">
     <short-name>resource29</short-name>
-    <uid>resource29</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1029</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1029</guid>
     <full-name>Resource 29</full-name>
 </record>
 <record type="resource">
     <short-name>resource30</short-name>
-    <uid>resource30</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1030</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1030</guid>
     <full-name>Resource 30</full-name>
 </record>
 <record type="resource">
     <short-name>resource31</short-name>
-    <uid>resource31</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1031</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1031</guid>
     <full-name>Resource 31</full-name>
 </record>
 <record type="resource">
     <short-name>resource32</short-name>
-    <uid>resource32</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1032</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1032</guid>
     <full-name>Resource 32</full-name>
 </record>
 <record type="resource">
     <short-name>resource33</short-name>
-    <uid>resource33</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1033</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1033</guid>
     <full-name>Resource 33</full-name>
 </record>
 <record type="resource">
     <short-name>resource34</short-name>
-    <uid>resource34</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1034</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1034</guid>
     <full-name>Resource 34</full-name>
 </record>
 <record type="resource">
     <short-name>resource35</short-name>
-    <uid>resource35</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1035</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1035</guid>
     <full-name>Resource 35</full-name>
 </record>
 <record type="resource">
     <short-name>resource36</short-name>
-    <uid>resource36</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1036</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1036</guid>
     <full-name>Resource 36</full-name>
 </record>
 <record type="resource">
     <short-name>resource37</short-name>
-    <uid>resource37</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1037</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1037</guid>
     <full-name>Resource 37</full-name>
 </record>
 <record type="resource">
     <short-name>resource38</short-name>
-    <uid>resource38</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1038</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1038</guid>
     <full-name>Resource 38</full-name>
 </record>
 <record type="resource">
     <short-name>resource39</short-name>
-    <uid>resource39</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1039</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1039</guid>
     <full-name>Resource 39</full-name>
 </record>
 <record type="resource">
     <short-name>resource40</short-name>
-    <uid>resource40</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1040</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1040</guid>
     <full-name>Resource 40</full-name>
 </record>
 <record type="resource">
     <short-name>resource41</short-name>
-    <uid>resource41</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1041</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1041</guid>
     <full-name>Resource 41</full-name>
 </record>
 <record type="resource">
     <short-name>resource42</short-name>
-    <uid>resource42</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1042</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1042</guid>
     <full-name>Resource 42</full-name>
 </record>
 <record type="resource">
     <short-name>resource43</short-name>
-    <uid>resource43</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1043</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1043</guid>
     <full-name>Resource 43</full-name>
 </record>
 <record type="resource">
     <short-name>resource44</short-name>
-    <uid>resource44</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1044</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1044</guid>
     <full-name>Resource 44</full-name>
 </record>
 <record type="resource">
     <short-name>resource45</short-name>
-    <uid>resource45</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1045</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1045</guid>
     <full-name>Resource 45</full-name>
 </record>
 <record type="resource">
     <short-name>resource46</short-name>
-    <uid>resource46</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1046</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1046</guid>
     <full-name>Resource 46</full-name>
 </record>
 <record type="resource">
     <short-name>resource47</short-name>
-    <uid>resource47</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1047</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1047</guid>
     <full-name>Resource 47</full-name>
 </record>
 <record type="resource">
     <short-name>resource48</short-name>
-    <uid>resource48</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1048</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1048</guid>
     <full-name>Resource 48</full-name>
 </record>
 <record type="resource">
     <short-name>resource49</short-name>
-    <uid>resource49</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1049</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1049</guid>
     <full-name>Resource 49</full-name>
 </record>
 <record type="resource">
     <short-name>resource50</short-name>
-    <uid>resource50</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1050</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1050</guid>
     <full-name>Resource 50</full-name>
 </record>
 <record type="resource">
     <short-name>resource51</short-name>
-    <uid>resource51</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1051</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1051</guid>
     <full-name>Resource 51</full-name>
 </record>
 <record type="resource">
     <short-name>resource52</short-name>
-    <uid>resource52</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1052</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1052</guid>
     <full-name>Resource 52</full-name>
 </record>
 <record type="resource">
     <short-name>resource53</short-name>
-    <uid>resource53</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1053</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1053</guid>
     <full-name>Resource 53</full-name>
 </record>
 <record type="resource">
     <short-name>resource54</short-name>
-    <uid>resource54</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1054</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1054</guid>
     <full-name>Resource 54</full-name>
 </record>
 <record type="resource">
     <short-name>resource55</short-name>
-    <uid>resource55</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1055</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1055</guid>
     <full-name>Resource 55</full-name>
 </record>
 <record type="resource">
     <short-name>resource56</short-name>
-    <uid>resource56</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1056</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1056</guid>
     <full-name>Resource 56</full-name>
 </record>
 <record type="resource">
     <short-name>resource57</short-name>
-    <uid>resource57</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1057</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1057</guid>
     <full-name>Resource 57</full-name>
 </record>
 <record type="resource">
     <short-name>resource58</short-name>
-    <uid>resource58</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1058</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1058</guid>
     <full-name>Resource 58</full-name>
 </record>
 <record type="resource">
     <short-name>resource59</short-name>
-    <uid>resource59</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1059</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1059</guid>
     <full-name>Resource 59</full-name>
 </record>
 <record type="resource">
     <short-name>resource60</short-name>
-    <uid>resource60</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1060</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1060</guid>
     <full-name>Resource 60</full-name>
 </record>
 <record type="resource">
     <short-name>resource61</short-name>
-    <uid>resource61</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1061</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1061</guid>
     <full-name>Resource 61</full-name>
 </record>
 <record type="resource">
     <short-name>resource62</short-name>
-    <uid>resource62</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1062</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1062</guid>
     <full-name>Resource 62</full-name>
 </record>
 <record type="resource">
     <short-name>resource63</short-name>
-    <uid>resource63</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1063</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1063</guid>
     <full-name>Resource 63</full-name>
 </record>
 <record type="resource">
     <short-name>resource64</short-name>
-    <uid>resource64</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1064</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1064</guid>
     <full-name>Resource 64</full-name>
 </record>
 <record type="resource">
     <short-name>resource65</short-name>
-    <uid>resource65</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1065</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1065</guid>
     <full-name>Resource 65</full-name>
 </record>
 <record type="resource">
     <short-name>resource66</short-name>
-    <uid>resource66</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1066</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1066</guid>
     <full-name>Resource 66</full-name>
 </record>
 <record type="resource">
     <short-name>resource67</short-name>
-    <uid>resource67</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1067</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1067</guid>
     <full-name>Resource 67</full-name>
 </record>
 <record type="resource">
     <short-name>resource68</short-name>
-    <uid>resource68</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1068</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1068</guid>
     <full-name>Resource 68</full-name>
 </record>
 <record type="resource">
     <short-name>resource69</short-name>
-    <uid>resource69</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1069</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1069</guid>
     <full-name>Resource 69</full-name>
 </record>
 <record type="resource">
     <short-name>resource70</short-name>
-    <uid>resource70</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1070</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1070</guid>
     <full-name>Resource 70</full-name>
 </record>
 <record type="resource">
     <short-name>resource71</short-name>
-    <uid>resource71</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1071</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1071</guid>
     <full-name>Resource 71</full-name>
 </record>
 <record type="resource">
     <short-name>resource72</short-name>
-    <uid>resource72</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1072</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1072</guid>
     <full-name>Resource 72</full-name>
 </record>
 <record type="resource">
     <short-name>resource73</short-name>
-    <uid>resource73</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1073</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1073</guid>
     <full-name>Resource 73</full-name>
 </record>
 <record type="resource">
     <short-name>resource74</short-name>
-    <uid>resource74</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1074</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1074</guid>
     <full-name>Resource 74</full-name>
 </record>
 <record type="resource">
     <short-name>resource75</short-name>
-    <uid>resource75</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1075</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1075</guid>
     <full-name>Resource 75</full-name>
 </record>
 <record type="resource">
     <short-name>resource76</short-name>
-    <uid>resource76</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1076</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1076</guid>
     <full-name>Resource 76</full-name>
 </record>
 <record type="resource">
     <short-name>resource77</short-name>
-    <uid>resource77</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1077</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1077</guid>
     <full-name>Resource 77</full-name>
 </record>
 <record type="resource">
     <short-name>resource78</short-name>
-    <uid>resource78</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1078</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1078</guid>
     <full-name>Resource 78</full-name>
 </record>
 <record type="resource">
     <short-name>resource79</short-name>
-    <uid>resource79</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1079</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1079</guid>
     <full-name>Resource 79</full-name>
 </record>
 <record type="resource">
     <short-name>resource80</short-name>
-    <uid>resource80</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1080</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1080</guid>
     <full-name>Resource 80</full-name>
 </record>
 <record type="resource">
     <short-name>resource81</short-name>
-    <uid>resource81</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1081</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1081</guid>
     <full-name>Resource 81</full-name>
 </record>
 <record type="resource">
     <short-name>resource82</short-name>
-    <uid>resource82</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1082</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1082</guid>
     <full-name>Resource 82</full-name>
 </record>
 <record type="resource">
     <short-name>resource83</short-name>
-    <uid>resource83</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1083</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1083</guid>
     <full-name>Resource 83</full-name>
 </record>
 <record type="resource">
     <short-name>resource84</short-name>
-    <uid>resource84</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1084</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1084</guid>
     <full-name>Resource 84</full-name>
 </record>
 <record type="resource">
     <short-name>resource85</short-name>
-    <uid>resource85</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1085</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1085</guid>
     <full-name>Resource 85</full-name>
 </record>
 <record type="resource">
     <short-name>resource86</short-name>
-    <uid>resource86</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1086</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1086</guid>
     <full-name>Resource 86</full-name>
 </record>
 <record type="resource">
     <short-name>resource87</short-name>
-    <uid>resource87</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1087</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1087</guid>
     <full-name>Resource 87</full-name>
 </record>
 <record type="resource">
     <short-name>resource88</short-name>
-    <uid>resource88</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1088</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1088</guid>
     <full-name>Resource 88</full-name>
 </record>
 <record type="resource">
     <short-name>resource89</short-name>
-    <uid>resource89</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1089</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1089</guid>
     <full-name>Resource 89</full-name>
 </record>
 <record type="resource">
     <short-name>resource90</short-name>
-    <uid>resource90</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1090</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1090</guid>
     <full-name>Resource 90</full-name>
 </record>
 <record type="resource">
     <short-name>resource91</short-name>
-    <uid>resource91</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1091</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1091</guid>
     <full-name>Resource 91</full-name>
 </record>
 <record type="resource">
     <short-name>resource92</short-name>
-    <uid>resource92</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1092</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1092</guid>
     <full-name>Resource 92</full-name>
 </record>
 <record type="resource">
     <short-name>resource93</short-name>
-    <uid>resource93</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1093</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1093</guid>
     <full-name>Resource 93</full-name>
 </record>
 <record type="resource">
     <short-name>resource94</short-name>
-    <uid>resource94</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1094</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1094</guid>
     <full-name>Resource 94</full-name>
 </record>
 <record type="resource">
     <short-name>resource95</short-name>
-    <uid>resource95</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1095</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1095</guid>
     <full-name>Resource 95</full-name>
 </record>
 <record type="resource">
     <short-name>resource96</short-name>
-    <uid>resource96</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1096</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1096</guid>
     <full-name>Resource 96</full-name>
 </record>
 <record type="resource">
     <short-name>resource97</short-name>
-    <uid>resource97</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1097</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1097</guid>
     <full-name>Resource 97</full-name>
 </record>
 <record type="resource">
     <short-name>resource98</short-name>
-    <uid>resource98</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1098</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1098</guid>
     <full-name>Resource 98</full-name>
 </record>
 <record type="resource">
     <short-name>resource99</short-name>
-    <uid>resource99</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1099</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1099</guid>
     <full-name>Resource 99</full-name>
 </record>
 <record type="resource">
     <short-name>resource100</short-name>
-    <uid>resource100</uid>
+    <uid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1100</uid>
     <guid>9DD5F2A5-DAA7-4CEB-825C-2EEB458C1100</guid>
     <full-name>Resource 100</full-name>
 </record>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140401/a6221d99/attachment-0001.html>


More information about the calendarserver-changes mailing list