[CalendarServer-changes] [7544] CalDAVTester/branches/release/CalDAVTester-3.0-dev

source_changes at macosforge.org source_changes at macosforge.org
Tue May 31 19:19:49 PDT 2011


Revision: 7544
          http://trac.macosforge.org/projects/calendarserver/changeset/7544
Author:   cdaboo at apple.com
Date:     2011-05-31 19:19:49 -0700 (Tue, 31 May 2011)
Log Message:
-----------
Undo a portion of the trunk commits to get us back to a workable state for the release branch.

Modified Paths:
--------------
    CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-partitioning.xml
    CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-template.xml
    CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml
    CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/sslserverinfo.xml

Removed Paths:
-------------
    CalDAVTester/branches/release/CalDAVTester-3.0-dev/Resource/CardDAV/default-addressbook/
    CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV/default-addressbook.xml

Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-partitioning.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-partitioning.xml	2011-06-01 01:53:57 UTC (rev 7543)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-partitioning.xml	2011-06-01 02:19:49 UTC (rev 7544)
@@ -45,7 +45,7 @@
 		<feature>expand-property</feature>				<!-- Expand property REPORT -->
 		<feature>limits</feature>						<!-- max-collections and max-resources limits -->
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
-		<!-- <feature>quota-on-resources</feature> -->	<!-- WebDAV QUOTA on calendar and address book object resources -->
+		<feature>quota-on-resources</feature>			<!-- WebDAV QUOTA on calendar and address book object resources -->
 		<feature>resource-id</feature>					<!-- WebDAV BIND DAV:resource-id property -->
 		<feature>sync-report</feature>					<!-- WebDAV collection sync REPORT -->
 		<feature>well-known</feature>					<!-- well-known feature -->
@@ -60,7 +60,7 @@
 		<feature>EMAIL parameter</feature>				<!-- Server normalizes cuaddress and adds EMAIL parameter -->
 		<feature>implicit-scheduling</feature>			<!-- CalDAV scheduling - implicit -->
 		<feature>maskuid</feature>						<!-- maskuid extension -->
-		<feature>partitioning</feature>					<!-- Partitioned server -->
+		<feature>partitioning</feature> 				<!-- Partitioned server -->
 		<feature>private-comments</feature>				<!-- private-comments extension -->
 		<feature>private-events</feature>				<!-- private-events extension -->
 		<feature>proxy</feature>						<!-- calendar-user-proxy extension -->
@@ -73,10 +73,7 @@
 
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
-		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
 		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
-		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
-		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
 
 	</features>
 

Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-template.xml	2011-06-01 01:53:57 UTC (rev 7543)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo-template.xml	2011-06-01 02:19:49 UTC (rev 7544)
@@ -73,7 +73,6 @@
 
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
-		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
 		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
 		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
 		<!-- <feature>directory-gateway</feature> -->			<!-- Directory gateway extension -->

Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml	2011-06-01 01:53:57 UTC (rev 7543)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/serverinfo.xml	2011-06-01 02:19:49 UTC (rev 7544)
@@ -73,7 +73,6 @@
 
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
-		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
 		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
 		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
 		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->

Modified: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/sslserverinfo.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/sslserverinfo.xml	2011-06-01 01:53:57 UTC (rev 7543)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/server/sslserverinfo.xml	2011-06-01 02:19:49 UTC (rev 7544)
@@ -46,7 +46,7 @@
 		<feature>expand-property</feature>				<!-- Expand property REPORT -->
 		<feature>limits</feature>						<!-- max-collections and max-resources limits -->
 		<feature>quota</feature>						<!-- WebDAV QUOTA -->
-		<!-- <feature>quota-on-resources</feature> -->	<!-- WebDAV QUOTA on calendar and address book object resources -->
+		<feature>quota-on-resources</feature>			<!-- WebDAV QUOTA on calendar and address book object resources -->
 		<feature>resource-id</feature>					<!-- WebDAV BIND DAV:resource-id property -->
 		<feature>sync-report</feature>					<!-- WebDAV collection sync REPORT -->
 		<feature>well-known</feature>					<!-- well-known feature -->
@@ -74,10 +74,7 @@
 
 		<!-- CardDAV specific extension -->
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
-		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
 		<feature>global-addressbook</feature> 			<!-- Global address book for each user -->
-		<feature>shared-addressbooks</feature>			<!-- Shared address books extension -->
-		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
 
 	</features>
 

Deleted: CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV/default-addressbook.xml
===================================================================
--- CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV/default-addressbook.xml	2011-06-01 01:53:57 UTC (rev 7543)
+++ CalDAVTester/branches/release/CalDAVTester-3.0-dev/scripts/tests/CardDAV/default-addressbook.xml	2011-06-01 02:19:49 UTC (rev 7544)
@@ -1,241 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-
-<!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
-
-<!--
- 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.
- -->
-
-<caldavtest>
-	<require-feature>
-		<feature>carddav</feature>
-		<feature>default-addressbook</feature>
-	</require-feature>
-
-	<start/>
-	
-	<test-suite name='Existing property'>
-		<test name='1'>
-			<description>PROPFIND on home</description>
-			<request end-delete='yes'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookpath1:</href>]]></value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='Change property'>
-		<test name='1'>
-			<description>MKCOL with correct request body</description>
-			<request end-delete='yes'>
-				<method>MKCOL</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
-				</data>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>201</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>Set invalid property on home</description>
-			<request print-response='no'>
-				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/2.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>badprops</name>
-						<value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>Set property on home</description>
-			<request print-response='no'>
-				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/3.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>PROPFIND on home</description>
-			<request end-delete='yes'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookhome1:/adbktest1</href>]]></value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='Move delete'>
-		<test name='1'>
-			<description>MOVE</description>
-			<request end-delete='yes'>
-				<method>MOVE</method>
-				<ruri>$addressbookhome1:/adbktest1/</ruri>
-				<header>
-					<name>Destination</name>
-					<value>$host:$addressbookhome1:/adbktest2/</value>
-				</header>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>PROPFIND on home</description>
-			<request end-delete='yes'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookhome1:/adbktest2</href>]]></value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<test-suite name='No default delete'>
-		<test name='1'>
-			<description>DELETE</description>
-			<request end-delete='yes'>
-				<method>DELETE</method>
-				<ruri>$addressbookhome1:/adbktest2/</ruri>
-				<verify>
-					<callback>prepostcondition</callback>
-					<arg>
-						<name>error</name>
-						<value>{urn:ietf:params:xml:ns:carddav}default-addressbook-delete-allowed</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='2'>
-			<description>Set property on home</description>
-			<request print-response='no'>
-				<method>PROPPATCH</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/4.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value>{urn:ietf:params:xml:ns:carddav}default-addressbook-URL</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='3'>
-			<description>DELETE</description>
-			<request end-delete='yes'>
-				<method>DELETE</method>
-				<ruri>$addressbookhome1:/adbktest2/</ruri>
-				<verify>
-					<callback>statusCode</callback>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>PROPFIND on home</description>
-			<request end-delete='yes'>
-				<method>PROPFIND</method>
-				<ruri>$addressbookhome1:/</ruri>
-				<header>
-					<name>Depth</name>
-					<value>0</value>
-				</header>
-				<data>
-					<content-type>text/xml; charset=utf-8</content-type>
-					<filepath>Resource/CardDAV/default-addressbook/1.xml</filepath>
-				</data>
-				<verify>
-					<callback>propfindItems</callback>
-					<arg>
-						<name>okprops</name>
-						<value><![CDATA[{urn:ietf:params:xml:ns:carddav}default-addressbook-URL$<href xmlns="DAV:">$addressbookpath1:</href>]]></value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-	</test-suite>
-
-	<end/>
-
-</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110531/7084edf6/attachment-0001.html>


More information about the calendarserver-changes mailing list