[CalendarServer-changes] [807] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Dec 12 09:56:38 PST 2006


Revision: 807
          http://trac.macosforge.org/projects/calendarserver/changeset/807
Author:   cdaboo at apple.com
Date:     2006-12-12 09:56:37 -0800 (Tue, 12 Dec 2006)

Log Message:
-----------
Remove repository.xml and related configuration and comments.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/conf/caldavd.plist
    CalendarServer/trunk/doc/caldavd.8
    CalendarServer/trunk/setup.py
    CalendarServer/trunk/twistedcaldav/config.py

Removed Paths:
-------------
    CalendarServer/trunk/conf/repository.dtd
    CalendarServer/trunk/conf/repository.xml

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2006-12-12 17:56:37 UTC (rev 807)
@@ -150,9 +150,6 @@
   <key>NotificationsEnabled</key>
   <true/>
 
-  <key>Repository</key>
-  <string>conf/repository.xml</string>
-
   <key>twistdLocation</key>
   <string>../Twisted/bin/twistd</string>
 

Modified: CalendarServer/trunk/conf/caldavd.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd.plist	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/conf/caldavd.plist	2006-12-12 17:56:37 UTC (rev 807)
@@ -99,9 +99,6 @@
   <key>NotificationsEnabled</key>
   <true/>
 
-  <key>Repository</key>
-  <string>/etc/caldavd/repository.xml</string>
-
   <key>SACLEnable</key>
   <true/>
 

Deleted: CalendarServer/trunk/conf/repository.dtd
===================================================================
--- CalendarServer/trunk/conf/repository.dtd	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/conf/repository.dtd	2006-12-12 17:56:37 UTC (rev 807)
@@ -1,63 +0,0 @@
-<!--
-Copyright (c) 2006 Apple Computer, 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.
-
-DRI: Cyrus Daboo, cdaboo at apple.com
- -->
-
-<!ELEMENT repository (docroot, authentication) >
-
-  <!ELEMENT docroot (collection) >
-    <!ELEMENT collection (pytype, params?, properties, members)>
-      <!ATTLIST collection name CDATA ""
-                             tag (none|principals|calendars) "none"
-                             account (yes|no) "no"
-                             initialize (yes|no) "no">
-      <!ELEMENT pytype     (#PCDATA)>
-      <!ELEMENT params     (param*)>
-        <!ELEMENT param    (key, value)>
-          <!ELEMENT key    (#PCDATA)>
-          <!ELEMENT value  (#PCDATA)>          
-      <!ELEMENT properties (acl?, prop*)>
-        <!ELEMENT prop     ANY>
-      <!ELEMENT members    (collection*)>
-
-      <!ELEMENT acl                   (ace*) >  
-           <!ELEMENT ace              (principal, (grant|deny), protected?, inheritable?)>
-            <!ELEMENT principal       (href | all | authenticated | unauthenticated)>
-            <!ELEMENT href            (#PCDATA)>
-            <!ELEMENT all             EMPTY>
-            <!ELEMENT authenticated   EMPTY>
-            <!ELEMENT unauthenticated EMPTY>
-          <!ELEMENT grant             (privilege+)>
-          <!ELEMENT deny              (privilege+)>
-            <!ELEMENT privilege       ANY>
-          <!ELEMENT protected         EMPTY>
-          <!ELEMENT inheritable       EMPTY>
-
-          <!ELEMENT read EMPTY>
-
-  <!ELEMENT authentication (basic, digest, kerberos) >
-    <!ELEMENT basic (realm, service?)>
-      <!ATTLIST basic enable  (yes|no) "yes"
-                      onlyssl (yes|no) "yes">
-    <!ELEMENT digest (realm)>
-      <!ATTLIST digest enable  (yes|no) "no"
-                       onlyssl (yes|no) "no">
-    <!ELEMENT kerberos (service)>
-      <!ATTLIST kerberos enable  (yes|no) "no"
-                         onlyssl (yes|no) "no">
-    
-    <!ELEMENT realm         (#PCDATA)>
-    <!ELEMENT service       (#PCDATA)>

Deleted: CalendarServer/trunk/conf/repository.xml
===================================================================
--- CalendarServer/trunk/conf/repository.xml	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/conf/repository.xml	2006-12-12 17:56:37 UTC (rev 807)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2006 Apple Computer, 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 repository SYSTEM "repository.dtd">
-
-<repository>
-
-  <docroot>
-    <collection>
-      <pytype>twistedcaldav.root.RootResource</pytype>
-      <properties>
-        <acl>
-          <ace>
-            <principal><all/></principal>
-            <grant><privilege><read/></privilege></grant>
-          </ace>
-          <ace>
-            <principal><href>/principals/user/admin</href></principal>
-            <grant><privilege><all/></privilege></grant>
-            <protected/>
-            <inheritable/>
-          </ace>
-        </acl>
-      </properties>
-      <members>
-        <collection name="principals">
-          <pytype>twistedcaldav.directory.principal.DirectoryPrincipalProvisioningResource</pytype>
-          <properties/>
-          <members/>
-        </collection>
-        <collection name="calendars">
-          <pytype>twistedcaldav.static.CalendarHomeProvisioningFile</pytype>
-          <properties/>
-          <members/>
-        </collection>
-      </members>
-    </collection>
-  </docroot>
-
-  <authentication>
-    <basic enable="yes" onlyssl="yes">
-      <realm></realm>
-    </basic>
-    <digest enable="no" onlyssl="no">
-      <realm></realm>
-    </digest>
-    <kerberos enable="no" onlyssl="no">
-      <service></service>
-    </kerberos>
-  </authentication>
-
-</repository>

Modified: CalendarServer/trunk/doc/caldavd.8
===================================================================
--- CalendarServer/trunk/doc/caldavd.8	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/doc/caldavd.8	2006-12-12 17:56:37 UTC (rev 807)
@@ -53,10 +53,6 @@
 The main configuration file for caldavd.  It is an XML property list
 in server options such as the port to bind to, whether to use SSL, and
 the names of other files can specified.
-.It /etc/caldavd/repository.xml
-An XML file describing the basic set of resources that are in the URL
-namespace of the server, and which underlying classes control these
-resources.
 .It /etc/caldavd/server.pem
 PEM-format server keys for use with SSL.
 .It /Library/CalendarServer/Documents

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/setup.py	2006-12-12 17:56:37 UTC (rev 807)
@@ -73,7 +73,7 @@
 
 from distutils.core import setup
 
-data_files = [("caldavd", ["conf/repository.xml", "conf/caldavd.plist"])]
+data_files = [("caldavd", ["conf/caldavd.plist",])]
 
 if sys.platform == 'darwin':
     data_files.append(('sbs_backup', ['conf/85-calendar.plist']))

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2006-12-12 17:06:56 UTC (rev 806)
+++ CalendarServer/trunk/twistedcaldav/config.py	2006-12-12 17:56:37 UTC (rev 807)
@@ -36,7 +36,6 @@
     'NotificationsEnabled': False,
     'PIDFile': '/var/run/caldavd.pid',
     'Port': 8008,
-    'Repository': '/etc/caldavd/repository.xml',
     'ResetAccountACLs': False,
     'RunStandalone': True,
     'SSLCertificate': '/etc/certificates/Default.crt',

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061212/1af93171/attachment.html


More information about the calendarserver-changes mailing list