You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/08/09 19:03:00 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics ProppAutovsnNProppcomment.xml
juergen 2002/08/09 10:02:59
Modified: testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code
copy.xml copyFile.xml move.xml moveFile.xml
testsuite/testsuite/junit/xmltestcases/functional/proppatch/code
DAV_CCI.xml DAV_CDI.xml DAV_CIC.xml DAV_CID.xml
DAV_CIM.xml DAV_CMI.xml DAV_ICC.xml DAV_ICD.xml
DAV_ICM.xml Default_CCI.xml Default_CDI.xml
Default_CIC.xml Default_CID.xml Default_CIM.xml
Default_CMI.xml Default_ICC.xml Default_ICD.xml
Default_ICM.xml proppatch207.xml
PropPatchDeleteDAVPropertyWithPropFindOnContentLanguage.xml
PropPatchDeleteDAVPropertyWithPropFindOnContentLength.xml
PropPatchDeleteDAVPropertyWithPropFindOnContentType.xml
PropPatchDeleteDAVPropertyWithPropFindOnCreationDate.xml
PropPatchDeleteDAVPropertyWithPropFindOnETag.xml
PropPatchDeleteDAVPropertyWithPropFindOnLastModified.xml
PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
PropPatchDeleteDAVPropertyWithPropFindOnresourcetype.xml
PropPatchDeleteDAVPropertyWithPropFindOnSource.xml
PropPatchDeleteDAVPropertyWithPropFindOnSupportedLock.xml
UserDefined_CCI.xml UserDefined_CDI.xml
UserDefined_CIC.xml UserDefined_CID.xml
UserDefined_CIM.xml UserDefined_CMI.xml
UserDefined_ICC.xml UserDefined_ICD.xml
UserDefined_ICM.xml
testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML
Propfind1Get1Head1PropPatch1Put1Copy1Move1Identical.xml
PropPatch2Put2Copy2Move2Identical.xml
Search1Get1Head1PropPatch1Put1Copy1Move1Identical.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/proppatch/code
proppatch207.xml
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics
ProppAutovsnNProppcomment.xml
Log:
mostly added: responsedescription. Some refactoring.
Revision Changes Path
1.2 +4 -4 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/copy.xml
Index: copy.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/copy.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copy.xml 26 Jun 2002 08:33:37 -0000 1.1
+++ copy.xml 9 Aug 2002 17:02:57 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
<specification>
@@ -92,7 +92,7 @@
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
@@ -113,7 +113,7 @@
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
@@ -135,7 +135,7 @@
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
1.2 +2 -2 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/copyFile.xml
Index: copyFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/copyFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copyFile.xml 26 Jun 2002 08:33:37 -0000 1.1
+++ copyFile.xml 9 Aug 2002 17:02:57 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
<specification>
@@ -37,7 +37,7 @@
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
1.2 +4 -4 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/move.xml
Index: move.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/move.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- move.xml 26 Jun 2002 08:33:37 -0000 1.1
+++ move.xml 9 Aug 2002 17:02:57 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
<specification>
@@ -88,7 +88,7 @@
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
@@ -109,7 +109,7 @@
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
@@ -131,7 +131,7 @@
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
1.2 +2 -2 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/moveFile.xml
Index: moveFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/multiplestores/code/moveFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- moveFile.xml 26 Jun 2002 08:33:37 -0000 1.1
+++ moveFile.xml 9 Aug 2002 17:02:57 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
<specification>
@@ -33,7 +33,7 @@
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../contentDirectory/validXML.xm1">
</body>
</request>
1.6 +77 -72 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CCI.xml
Index: DAV_CCI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CCI.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_CCI.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_CCI.xml 9 Aug 2002 17:02:57 -0000 1.6
@@ -54,33 +54,35 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <D:authors2>test</D:authors2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors2>test</D:authors2>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>
+ ]]>
+ </body>
</request>
<response>
@@ -88,36 +90,39 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
-
- <d:propstat>
- <d:prop>
- <d:authors2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
-
- </d:response>
- </d:multistatus></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:authors2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
+
+ </d:response>
+ </d:multistatus>
+ ]]>
+ </body>
</response>
</step>
@@ -140,18 +145,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
@@ -172,18 +177,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors2/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors2/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +61 -56 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CDI.xml
Index: DAV_CDI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CDI.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_CDI.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_CDI.xml 9 Aug 2002 17:02:57 -0000 1.6
@@ -55,37 +55,37 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:authors1/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:authors1/>
+ </D:prop>
+ </D:remove>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -93,36 +93,39 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:">
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:">
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
-
- </d:response>
- </d:multistatus></body>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
+
+ </d:response>
+ </d:multistatus>
+ ]]>
+ </body>
</response>
</step>
@@ -144,18 +147,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>
+ ]]>
+ </body>
</response>
</step>
1.6 +68 -67 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CIC.xml
Index: DAV_CIC.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CIC.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_CIC.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_CIC.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -52,35 +52,35 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <D:authors2>test</D:authors2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors2>test</D:authors2>
+ </D:prop>
+ </D:set>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -88,36 +88,37 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:authors2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:authors2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -140,18 +141,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
@@ -172,18 +173,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors2/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors2/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +59 -58 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CID.xml
Index: DAV_CID.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CID.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_CID.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_CID.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -55,37 +55,37 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:remove>
- <D:prop>
- <D:authors1/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:authors1/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -93,35 +93,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -143,18 +144,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +59 -58 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CIM.xml
Index: DAV_CIM.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CIM.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_CIM.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_CIM.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,32 +53,32 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <D:authors1>test2</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test2</D:authors1>
+ </D:prop>
+ </D:set>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -86,35 +86,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -136,18 +137,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +59 -58 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CMI.xml
Index: DAV_CMI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_CMI.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_CMI.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_CMI.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,33 +53,33 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <D:authors1>test2</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test2</D:authors1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -87,35 +87,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -137,18 +138,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +69 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_ICC.xml
Index: DAV_ICC.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_ICC.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_ICC.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_ICC.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,35 +53,35 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <D:authors2>test</D:authors2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors2>test</D:authors2>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <D:authors3>test</D:authors3>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors3>test</D:authors3>
+ </D:prop>
+ </D:set>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -89,36 +89,37 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:authors2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:authors3/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:authors2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors3/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -141,18 +142,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
@@ -173,18 +174,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors2/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors2/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +58 -57 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_ICD.xml
Index: DAV_ICD.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_ICD.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_ICD.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_ICD.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -56,35 +56,35 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:authors1/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:authors1/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -92,37 +92,38 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -144,18 +145,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +59 -58 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_ICM.xml
Index: DAV_ICM.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/DAV_ICM.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DAV_ICM.xml 6 Aug 2002 07:19:34 -0000 1.5
+++ DAV_ICM.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,31 +53,31 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <D:authors1>test</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test</D:authors1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <D:authors1>test2</D:authors1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <D:authors1>test2</D:authors1>
+ </D:prop>
+ </D:set>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -85,35 +85,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
-
- <d:propstat>
- <d:prop>
- <d:authors1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+
+ <d:propstat>
+ <d:prop>
+ <d:authors1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <d:responsedescription>Property <creationdate xmlns="DAV:" /> is protected</d:responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -135,18 +136,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <authors1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <authors1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.7 +70 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CCI.xml
Index: Default_CCI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CCI.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_CCI.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_CCI.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -52,29 +52,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <ud2>test</ud2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud2>test</ud2>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -83,35 +84,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -135,19 +137,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
@@ -169,19 +171,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud2/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CDI.xml
Index: Default_CDI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CDI.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_CDI.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_CDI.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -54,29 +54,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <ud1/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <ud1/>
+ </D:prop>
+ </D:remove>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -85,34 +86,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -136,19 +138,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +70 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CIC.xml
Index: Default_CIC.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CIC.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_CIC.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_CIC.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -52,29 +52,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <ud2>test</ud2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud2>test</ud2>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -83,35 +84,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -135,19 +137,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
@@ -169,19 +171,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud2/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CID.xml
Index: Default_CID.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CID.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_CID.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_CID.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -54,29 +54,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:remove>
- <D:prop>
- <ud1/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <ud1/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -85,35 +86,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -137,19 +139,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CIM.xml
Index: Default_CIM.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CIM.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_CIM.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_CIM.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -53,29 +53,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <ud1>test2</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test2</ud1>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -84,36 +85,37 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -137,19 +139,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +126 -152 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CMI.xml
Index: Default_CMI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_CMI.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_CMI.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_CMI.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Juergen Pill (Software AG) -->
+<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
-
-
<specification>
-
<abstract>Test to see if proppatch commands are ignored and a rollback occurs if one statement is invalid.</abstract>
-
<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
-
<description>
1)Put a document.
@@ -17,165 +13,143 @@
3)One propfind expecting 404 not found response code to check that no property has been created.
4)Delete created file.</description>
-
<expectedResult>No propertie should have been created. 404 Should be returned by propfind.</expectedResult>
-
</specification>
-
-
-
- <step>
- <request>
- <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../contentDirectory/html.html">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../contentDirectory/html.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>Pragma: no-cache</header>
+ <header>Connection: close</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <ud1>test2</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test2</ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
- </body>
-
- </request>
- <response>
- <command>HTTP/1.0 207 Multi Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ </D:propertyupdate>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi Status</command>
+ <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
- </response>
- </step>
-
-
-
-
- <step>
-
-
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><D:propfind xmlns:D="DAV:"><D:prop><ud1/></D:prop></D:propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
-
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
- </body>
- </response>
- </step>
-
-<cleanup>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-</cleanup>
-
-
+ </d:response>
+ </d:multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><D:propfind xmlns:D="DAV:"><D:prop><ud1/></D:prop></D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.7 +70 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_ICC.xml
Index: Default_ICC.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_ICC.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_ICC.xml 6 Aug 2002 07:19:34 -0000 1.6
+++ Default_ICC.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -52,30 +52,31 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <ud2>test</ud2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud2>test</ud2>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -84,35 +85,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -136,19 +138,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
@@ -170,19 +172,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud2/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_ICD.xml
Index: Default_ICD.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_ICD.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_ICD.xml 6 Aug 2002 07:19:33 -0000 1.6
+++ Default_ICD.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -54,29 +54,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <ud1/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <ud1/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -85,35 +86,36 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -137,19 +139,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_ICM.xml
Index: Default_ICM.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/Default_ICM.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Default_ICM.xml 6 Aug 2002 07:19:33 -0000 1.6
+++ Default_ICM.xml 9 Aug 2002 17:02:58 -0000 1.7
@@ -53,30 +53,31 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <ud1>test</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test</ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <ud1>test2</ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <ud1>test2</ud1>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -85,36 +86,37 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -138,19 +140,19 @@
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <ud1/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
- </d:multistatus>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 404 Not Found</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.4 +29 -3 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/proppatch207.xml
Index: proppatch207.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/proppatch207.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- proppatch207.xml 1 Feb 2002 10:27:46 -0000 1.3
+++ proppatch207.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -46,7 +46,21 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test.html</d:href><d:propstat><d:prop><getlastmodified/></d:prop><d:status>HTTP/1.1 409 Conflict</d:status></d:propstat></d:response></d:multistatus>]]></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV">
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <getlastmodified/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getlastmodified xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
+ </body>
</response>
</step>
<step>
@@ -65,8 +79,20 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test.html</d:href><d:propstat><d:prop><getlastmodified/></d:prop><d:status>HTTP/1.1 409 Conflict</d:status></d:propstat></d:response></d:multistatus>]]>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV">
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/test.html</d:href>
+ <d:propstat>
+ <d:prop>
+ <getlastmodified/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getlastmodified xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]>
</body>
</response>
</step>
1.4 +32 -31 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnContentLanguage.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnContentLanguage.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnContentLanguage.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnContentLanguage.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnContentLanguage.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -54,18 +54,18 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:getcontentlanguage/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:getcontentlanguage/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -73,21 +73,22 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:getcontentlanguage/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:getcontentlanguage/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getcontentlanguage xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -110,17 +111,17 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <getcontentlanguage>resource1.html</getcontentlanguage>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <getcontentlanguage>resource1.html</getcontentlanguage>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.4 +33 -32 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnContentLength.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnContentLength.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnContentLength.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnContentLength.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnContentLength.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -55,19 +55,19 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:getcontentlength/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -75,21 +75,22 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:getcontentlength/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:getcontentlength/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getcontentlength xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -112,18 +113,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <getcontentlength>1539</getcontentlength>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <getcontentlength>1539</getcontentlength>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.4 +33 -32 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnContentType.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnContentType.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnContentType.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnContentType.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnContentType.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -54,19 +54,19 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:getcontenttype/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:getcontenttype/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -74,22 +74,23 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:getcontenttype/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:getcontenttype/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getcontenttype xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -112,18 +113,18 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <getcontenttype>
- </getcontenttype>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
- </multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <getcontenttype>
+ </getcontenttype>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.4 +22 -21 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnCreationDate.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnCreationDate.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnCreationDate.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnCreationDate.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnCreationDate.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -55,18 +55,18 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -74,21 +74,22 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -111,7 +112,7 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><creationdate>resource1.html</creationdate></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><creationdate>resource1.html</creationdate></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus>]]></body>
</response>
</step>
1.4 +22 -21 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnETag.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnETag.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnETag.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnETag.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnETag.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -55,18 +55,18 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:getetag/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:getetag/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -74,21 +74,22 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:getetag/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:getetag/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getetag xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -111,7 +112,7 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><getetag>*</getetag></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><getetag>*</getetag></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus>]]></body>
</response>
</step>
1.4 +22 -21 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLastModified.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnLastModified.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLastModified.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnLastModified.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnLastModified.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -55,18 +55,18 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:getlastmodified/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:getlastmodified/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -74,21 +74,22 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:getlastmodified/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:getlastmodified/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <getlastmodified xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -111,7 +112,7 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><getlastmodified>resource1.html</getlastmodified></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><getlastmodified>resource1.html</getlastmodified></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus>]]></body>
</response>
</step>
1.8 +144 -178 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml 1 Aug 2002 14:44:23 -0000 1.7
+++ PropPatchDeleteDAVPropertyWithPropFindOnLockDiscovery.xml 9 Aug 2002 17:02:58 -0000 1.8
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
-
<specification>
-
<abstract>Test to try and deleted DAV properties.</abstract>
-
<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
-
<description>1) Put a document.
2)Proppatch command trying to delete the DAV property Lock Discovery,
@@ -16,99 +12,87 @@
3)Propfind to check property has not been deleted and still exists.
4)Delete created file.</description>
-
<expectedResult>Property isn't deleted. 207 multi status with 409 conflict in body.
Propfind finds property. 207 multi status with 200 OK in body.</expectedResult>
-
</specification>
-
-
- <step>
- <request>
- <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../contentDirectory/html.html">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../contentDirectory/html.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>Pragma: no-cache</header>
+ <header>Connection: close</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:lockdiscovery/>
- </D:prop>
- </D:remove>
-
- </D:propertyupdate></body>
-
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <D:remove>
+ <D:prop>
+ <D:lockdiscovery/>
+ </D:prop>
+ </D:remove>
+
+ </D:propertyupdate>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:lockdiscovery/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:lockdiscovery/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <lockdiscovery xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Connection: Keep-Alive, TE</header>
- <header>TE: trailers, deflate, gzip, compress</header>
- <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
- <header>Timeout: Second-604800</header>
- <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
- <header>Content-type: text/xml</header>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableUserPath,globalVariableServerName,user,host">
- <![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </d:response>
+ </d:multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Connection: Keep-Alive, TE</header>
+ <header>TE: trailers, deflate, gzip, compress</header>
+ <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
+ <header>Timeout: Second-604800</header>
+ <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
+ <header>Content-type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<d:prop xmlns:d="DAV:">
<d:lockdiscovery>
<d:activelock>
@@ -120,95 +104,77 @@
<d:locktoken><d:href></d:href></d:locktoken>
</d:activelock>
</d:lockdiscovery>
- </d:prop>]]>
- </body>
- </response>
- </step>
-
-
-
- <step>
-
-
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><lockdiscovery/></prop></propfind>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,automaticVariable1,globalVariableUserPath,globalVariableServerName,user,host"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <lockdiscovery>
- <activelock>
- <locktype><write/></locktype>
- <lockscope><exclusive/></lockscope>
- <depth>infinity</depth>
- <owner>%globalVariableUserPath%</owner>
- <timeout>*</timeout>
- <locktoken><href>%automaticVariable1%</href></locktoken>
- </activelock>
- </lockdiscovery>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
- </multistatus>
-
- </body>
- </response>
- </step>
-
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Connection: Keep-Alive, TE</header>
- <header>TE: trailers, deflate, gzip, compress</header>
- <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
- <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
- <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
-<cleanup>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-</cleanup>
-
-
+ </d:prop>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><lockdiscovery/></prop></propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,automaticVariable1,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <lockdiscovery>
+ <activelock>
+ <locktype><write/></locktype>
+ <lockscope><exclusive/></lockscope>
+ <depth>infinity</depth>
+ <owner>%globalVariableUserPath%</owner>
+ <timeout>*</timeout>
+ <locktoken><href>%automaticVariable1%</href></locktoken>
+ </activelock>
+ </lockdiscovery>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Connection: Keep-Alive, TE</header>
+ <header>TE: trailers, deflate, gzip, compress</header>
+ <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
+ <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
+ <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.4 +22 -21 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnresourcetype.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnresourcetype.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnresourcetype.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnresourcetype.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnresourcetype.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -54,18 +54,18 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:resourcetype/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:resourcetype/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
</request>
<response>
@@ -73,21 +73,22 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:resourcetype/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:resourcetype/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <resourcetype xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -110,7 +111,7 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><resourcetype></resourcetype></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus></body>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href><propstat><prop><resourcetype></resourcetype></prop><status>HTTP/1.1 200 OK</status></propstat></response></multistatus>]]></body>
</response>
</step>
1.4 +122 -148 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnSource.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnSource.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnSource.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnSource.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnSource.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
+<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
-
<specification>
-
<abstract>Test to try and deleted DAV properties.</abstract>
-
<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
-
<description>1) Put a document.
2)Proppatch command trying to delete the DAV property Source,
@@ -16,154 +12,132 @@
3)Propfind to check property has not been deleted and still exists.
4)Delete created file.</description>
-
<expectedResult>Property isn't deleted. 207 multi status with 409 conflict in body.
Propfind finds property. 207 multi status with 200 OK in body.</expectedResult>
-
</specification>
-
-
-
- <step>
- <request>
- <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../contentDirectory/html.html">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>Pragma: no-cache</header>
- <header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
-
-
- <D:remove>
- <D:prop>
- <D:source/>
- </D:prop>
- </D:remove>
-
-
- </D:propertyupdate></body>
-
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../contentDirectory/html.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>Pragma: no-cache</header>
+ <header>Connection: close</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+
+
+ <D:remove>
+ <D:prop>
+ <D:source/>
+ </D:prop>
+ </D:remove>
+
+
+ </D:propertyupdate>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:source/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:source/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <source xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
- </response>
- </step>
-
-
-
-
- <step>
-
-
- <request>
- <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><?xml version="1.0" ?>
-<propfind xmlns="DAV:">
-<prop>
-
-<source/>
-
-</prop>
-</propfind></body>
-
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <multistatus>
-
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
-
- <prop xmlns="DAV:">
- <source>
-
-
- </source>
-
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-
- </multistatus>
- </body>
- </response>
- </step>
-
-
-
-
-<cleanup>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-</cleanup>
-
-
+ </d:response>
+ </d:multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <propfind xmlns="DAV:">
+ <prop>
+
+ <source/>
+
+ </prop>
+ </propfind>
+
+]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus>
+
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+
+ <prop xmlns="DAV:">
+ <source>
+
+
+ </source>
+
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+
+ </multistatus>
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/resource1.html HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
</test>
1.4 +47 -46 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnSupportedLock.xml
Index: PropPatchDeleteDAVPropertyWithPropFindOnSupportedLock.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/PropPatchDeleteDAVPropertyWithPropFindOnSupportedLock.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropPatchDeleteDAVPropertyWithPropFindOnSupportedLock.xml 1 Aug 2002 14:44:23 -0000 1.3
+++ PropPatchDeleteDAVPropertyWithPropFindOnSupportedLock.xml 9 Aug 2002 17:02:58 -0000 1.4
@@ -55,18 +55,18 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:supportedlock/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:supportedlock/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate></body>
+ </D:propertyupdate>]]></body>
@@ -77,23 +77,24 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <d:supportedlock/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:supportedlock/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <supportedlock xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -115,35 +116,35 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <supportedlock>
- <lockentry>
- <lockscope>
- <exclusive/>
- </lockscope>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" ><response><href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <supportedlock>
+ <lockentry>
+ <lockscope>
+ <exclusive/>
+ </lockscope>
- <locktype>
- <write/>
- </locktype>
+ <locktype>
+ <write/>
+ </locktype>
- </lockentry>
+ </lockentry>
- <lockentry>
- <lockscope>
- <shared/>
- </lockscope>
- <locktype>
- <write/>
- </locktype>
- </lockentry>
- </supportedlock>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
- </multistatus></body>
+ <lockentry>
+ <lockscope>
+ <shared/>
+ </lockscope>
+ <locktype>
+ <write/>
+ </locktype>
+ </lockentry>
+ </supportedlock>
+ </prop>
+ <status>HTTP/1.1 200 OK</status>
+ </propstat>
+ </response>
+ </multistatus>]]></body>
</response>
</step>
1.6 +70 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CCI.xml
Index: UserDefined_CCI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CCI.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_CCI.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_CCI.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -51,28 +51,29 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <Z:ud2>test</Z:ud2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud2>test</Z:ud2>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -81,34 +82,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -131,20 +133,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
@@ -165,20 +167,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud2/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud2/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CDI.xml
Index: UserDefined_CDI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CDI.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_CDI.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_CDI.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,30 +53,31 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <Z:ud2/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <Z:ud2/>
+ </D:prop>
+ </D:remove>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -85,36 +86,37 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -137,20 +139,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +70 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CIC.xml
Index: UserDefined_CIC.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CIC.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_CIC.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_CIC.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -51,29 +51,30 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <Z:ud2>test</Z:ud2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud2>test</Z:ud2>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -82,34 +83,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -132,20 +134,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
@@ -166,20 +168,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud2/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud2/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CID.xml
Index: UserDefined_CID.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CID.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_CID.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_CID.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,32 +53,33 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:remove>
- <D:prop>
- <Z:ud2/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <Z:ud2/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -87,38 +88,39 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -141,20 +143,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CIM.xml
Index: UserDefined_CIM.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CIM.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_CIM.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_CIM.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,30 +53,31 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <Z:ud1>test2</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test2</Z:ud1>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -85,34 +86,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -135,20 +137,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CMI.xml
Index: UserDefined_CMI.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_CMI.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_CMI.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_CMI.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,28 +53,29 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <Z:ud1>test2</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test2</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -83,34 +84,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -133,20 +135,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +70 -68 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_ICC.xml
Index: UserDefined_ICC.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_ICC.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_ICC.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_ICC.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -51,30 +51,31 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <Z:ud2>test</Z:ud2>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud2>test</Z:ud2>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -83,34 +84,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -133,20 +135,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
@@ -167,20 +169,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud2/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud2/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +58 -56 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_ICD.xml
Index: UserDefined_ICD.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_ICD.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_ICD.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_ICD.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,34 +53,35 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:remove>
- <D:prop>
- <Z:ud2/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <Z:ud2/>
+ </D:prop>
+ </D:remove>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -89,38 +90,39 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud2/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud2/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -138,21 +140,21 @@
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
-
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.6 +57 -55 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_ICM.xml
Index: UserDefined_ICM.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/proppatch/code/UserDefined_ICM.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserDefined_ICM.xml 6 Aug 2002 07:19:33 -0000 1.5
+++ UserDefined_ICM.xml 9 Aug 2002 17:02:58 -0000 1.6
@@ -53,31 +53,32 @@
<header>Translate: f</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
- <body><?xml version="1.0" ?>
- <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:Z="http://www.com/">
- <D:remove>
- <D:prop>
- <D:creationdate/>
- </D:prop>
- </D:remove>
+ <D:remove>
+ <D:prop>
+ <D:creationdate/>
+ </D:prop>
+ </D:remove>
- <D:set>
- <D:prop>
- <Z:ud1>test</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test</Z:ud1>
+ </D:prop>
+ </D:set>
- <D:set>
- <D:prop>
- <Z:ud1>test2</Z:ud1>
- </D:prop>
- </D:set>
+ <D:set>
+ <D:prop>
+ <Z:ud1>test2</Z:ud1>
+ </D:prop>
+ </D:set>
- </D:propertyupdate>
+ </D:propertyupdate>
+ ]]>
</body>
</request>
@@ -86,34 +87,35 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><?xml version="1.0" encoding="utf-8" ?>
- <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
- <d:response>
- <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <d:multistatus xmlns:d="DAV" xmlns:Z="DAVxxxx:" >
+ <d:response>
+ <d:href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</d:href>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <Z:ud1/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <Z:ud1/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
- <d:propstat>
- <d:prop>
- <d:creationdate/>
- </d:prop>
- <d:status>HTTP/1.1 409 Conflict</d:status>
- </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <d:creationdate/>
+ </d:prop>
+ <d:status>HTTP/1.1 409 Conflict</d:status>
+ <responsedescription>Property <creationdate xmlns="DAV:" /> is protected</responsedescription>
+ </d:propstat>
- </d:response>
- </d:multistatus></body>
+ </d:response>
+ </d:multistatus>]]></body>
</response>
</step>
@@ -136,20 +138,20 @@
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- <?xml version="1.0" encoding="utf-8" ?>
- <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
- <response>
- <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
- <propstat>
- <prop>
- <Z:ud1/>
- </prop>
- <status>HTTP/1.1 404 Not Found</status>
- </propstat>
+ <body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <multistatus xmlns="DAV:" xmlns:Z="http://www.com/" >
+ <response>
+ <href>/%globalVariableServerName%/%globalVariableCollection%/resource1.html</href>
+ <propstat>
+ <prop>
+ <Z:ud1/>
+ </prop>
+ <status>HTTP/1.1 404 Not Found</status>
+ </propstat>
- </response>
- </multistatus>
+ </response>
+ </multistatus>
+ ]]>
</body>
</response>
</step>
1.7 +1 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML/Propfind1Get1Head1PropPatch1Put1Copy1Move1Identical.xml
Index: Propfind1Get1Head1PropPatch1Put1Copy1Move1Identical.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML/Propfind1Get1Head1PropPatch1Put1Copy1Move1Identical.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Propfind1Get1Head1PropPatch1Put1Copy1Move1Identical.xml 9 Aug 2002 12:43:34 -0000 1.6
+++ Propfind1Get1Head1PropPatch1Put1Copy1Move1Identical.xml 9 Aug 2002 17:02:59 -0000 1.7
@@ -190,7 +190,7 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
</response>
</step>
</repeater>
1.6 +2 -2 jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML/PropPatch2Put2Copy2Move2Identical.xml
Index: PropPatch2Put2Copy2Move2Identical.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML/PropPatch2Put2Copy2Move2Identical.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropPatch2Put2Copy2Move2Identical.xml 9 Aug 2002 12:43:34 -0000 1.5
+++ PropPatch2Put2Copy2Move2Identical.xml 9 Aug 2002 17:02:59 -0000 1.6
@@ -93,7 +93,7 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
</response>
</step>
</repeater>
@@ -117,7 +117,7 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
</response>
</step>
</repeater>
1.4 +2 -2 jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML/Search1Get1Head1PropPatch1Put1Copy1Move1Identical.xml
Index: Search1Get1Head1PropPatch1Put1Copy1Move1Identical.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/IdenticalResources/validXML/Search1Get1Head1PropPatch1Put1Copy1Move1Identical.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Search1Get1Head1PropPatch1Put1Copy1Move1Identical.xml 9 Aug 2002 12:43:34 -0000 1.3
+++ Search1Get1Head1PropPatch1Put1Copy1Move1Identical.xml 9 Aug 2002 17:02:59 -0000 1.4
@@ -151,7 +151,7 @@
<body varUsage="globalVariableCollection,globalVariableServerName,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</D:href>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</D:href>
<D:propstat>
<D:prop>
<D:displayname>resource1.xml</D:displayname>
@@ -193,7 +193,7 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/test/resource1.xml</d:href><d:propstat><d:prop><displayname/></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>]]></body>
</response>
</step>
</repeater>
1.3 +1 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/proppatch/code/proppatch207.xml
Index: proppatch207.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/proppatch/code/proppatch207.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proppatch207.xml 1 Feb 2002 09:34:00 -0000 1.2
+++ proppatch207.xml 9 Aug 2002 17:02:59 -0000 1.3
@@ -40,7 +40,7 @@
<header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
<header>Content-Language: en</header>
<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/help-doc.html</d:href><d:propstat><d:prop><getlastmodified/></d:prop><d:status>HTTP/1.1 409 Conflict</d:status></d:propstat></d:response></d:multistatus>]]></body>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response><d:href>/%globalVariableServerName%/%globalVariableCollection%/help-doc.html</d:href><d:propstat><d:prop><getlastmodified/></d:prop><d:status>HTTP/1.1 409 Conflict</d:status><d:responsedescription>Property <getlastmodified xmlns="DAV:" /> is protected</d:responsedescription></d:propstat></d:response></d:multistatus>]]></body>
</response>
</step>
<step>
1.4 +11 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics/ProppAutovsnNProppcomment.xml
Index: ProppAutovsnNProppcomment.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Proppatch_semantics/ProppAutovsnNProppcomment.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProppAutovsnNProppcomment.xml 5 Aug 2002 07:56:55 -0000 1.3
+++ ProppAutovsnNProppcomment.xml 9 Aug 2002 17:02:59 -0000 1.4
@@ -99,9 +99,16 @@
<body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:error xmlns:D="DAV:">
<D:cannot-modify-version-controlled-property />
- </D:error> ]]></body>
+ </D:error>
+ ]]>
+ </body>
</response>
</step>
+
+
+
+
+
<cleanup>
<step>
<request>
@@ -112,4 +119,7 @@
</response>
</step>
</cleanup>
+
+
+
</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>