[CalendarServer-changes] [5061] CalendarServer/branches/users/sagen/locations-resources-2/conf

[source_changes at macosforge.org]

Revision: 5061
          http://trac.macosforge.org/projects/calendarserver/changeset/5061
Author:   sagen at apple.com
Date:     2010-02-08 14:31:59 -0800 (Mon, 08 Feb 2010)
Log Message:
-----------
Updating the test plists to split out locations and reources to the new service

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/accounts-test.xml
    CalendarServer/branches/users/sagen/locations-resources-2/conf/caldavd-test.plist

Added Paths:
-----------
    CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/resources-test.xml

Modified: CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/accounts-test.xml	2010-02-08 22:05:30 UTC (rev 5060)
+++ CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/accounts-test.xml	2010-02-08 22:31:59 UTC (rev 5061)
@@ -53,18 +53,6 @@
     <first-name>Public</first-name>
     <last-name>%02d</last-name>
   </user>
-  <location repeat="10">
-    <uid>location%02d</uid>
-    <guid>location%02d</guid>
-    <password>location%02d</password>
-    <name>Room %02d</name>
-  </location>
-  <resource repeat="10">
-    <uid>resource%02d</uid>
-    <guid>resource%02d</guid>
-    <password>resource%02d</password>
-    <name>Resource %02d</name>
-  </resource>
   <group>
     <uid>group01</uid>
     <guid>group01</guid>

Added: CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/resources-test.xml
===================================================================
--- CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/resources-test.xml	                        (rev 0)
+++ CalendarServer/branches/users/sagen/locations-resources-2/conf/auth/resources-test.xml	2010-02-08 22:31:59 UTC (rev 5061)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<accounts realm="Test Realm">
+  <location repeat="10">
+    <uid>location%02d</uid>
+    <guid>location%02d</guid>
+    <password>location%02d</password>
+    <name>Room %02d</name>
+  </location>
+  <resource repeat="10">
+    <uid>resource%02d</uid>
+    <guid>resource%02d</guid>
+    <password>resource%02d</password>
+    <name>Resource %02d</name>
+  </resource>
+</accounts>

Modified: CalendarServer/branches/users/sagen/locations-resources-2/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/sagen/locations-resources-2/conf/caldavd-test.plist	2010-02-08 22:05:30 UTC (rev 5060)
+++ CalendarServer/branches/users/sagen/locations-resources-2/conf/caldavd-test.plist	2010-02-08 22:31:59 UTC (rev 5061)
@@ -131,9 +131,34 @@
       <dict>
         <key>xmlFile</key>
         <string>conf/auth/accounts-test.xml</string>
+        <key>recordTypes</key>
+        <array>
+            <string>users</string>
+            <string>groups</string>
+        </array>
       </dict>
     </dict>
     
+    <!-- Resource and Location Service -->
+    <key>ResourceService</key>
+    <dict>
+      <key>Enabled</key>
+      <true/>
+      <key>type</key>
+      <string>twistedcaldav.directory.xmlfile.XMLDirectoryService</string>
+      
+      <key>params</key>
+      <dict>
+        <key>xmlFile</key>
+        <string>conf/auth/resources-test.xml</string>
+        <key>recordTypes</key>
+        <array>
+            <string>locations</string>
+            <string>resources</string>
+        </array>
+      </dict>
+    </dict>
+    
     <!-- Open Directory Service (Mac OS X) -->
     <!--
     <key>DirectoryService</key>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100208/61599b49/attachment-0001.html>