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 pn...@apache.org on 2002/11/19 15:25:30 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix colLockEdit.xml colLock424.xml colLock.xml

pnever      2002/11/19 06:25:30

  Modified:    testsuite/testsuite/junit/xmltestcases/functional/delete/mix
                        deleteDependency.xml
               testsuite/testsuite/junit/xmltestcases/functional/extra/delete/mix
                        deleteDependency.xml
               testsuite/testsuite/junit/xmltestcases/functional/lock/mix
                        colLockEdit.xml colLock424.xml colLock.xml
  Log:
  Expects now full path in multistatus href's
  
  Revision  Changes    Path
  1.6       +132 -132  jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/delete/mix/deleteDependency.xml
  
  Index: deleteDependency.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/delete/mix/deleteDependency.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- deleteDependency.xml	13 Aug 2002 12:45:21 -0000	1.5
  +++ deleteDependency.xml	19 Nov 2002 14:25:30 -0000	1.6
  @@ -1,136 +1,136 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
   <test>
  -	<specification>
  -		<abstract> Checks if Delete Method can be applied to a directory where one of the files is locked. </abstract>
  -		<description> The test case consist of following major steps (unnecessary step like propfind, head are not mentioned): mkcol a directory, puts a number of files, locks one of the files, try to delete the directory (cannot), unlocks the file and finally deletes the directory </description>
  -		<expectedResult> Status code returned by first Delete Method must be 207 multi-status and inside that it should be 423 locked , in that case one should not be able to delete the directory. </expectedResult>
  -	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Wed, 14 Mar 2001 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.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 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.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 13:04:54 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 13:04:54 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">LOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 varUsage="globalVariableServerName"><![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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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 207 Multi-Status</command>
  -			<header>Date: Wed, 14 Mar 2001 13:35:29 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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response xmlns:d="DAV"><d:href>/%globalVariableCollection%/test/help-doc.html</d:href><d:status>HTTP/1.1 423 Locked</d:status></d:response></d:multistatus>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Wed, 14 Mar 2001 13:43:44 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>
  +    <specification>
  +        <abstract> Checks if Delete Method can be applied to a directory where one of the files is locked. </abstract>
  +        <description> The test case consist of following major steps (unnecessary step like propfind, head are not mentioned): mkcol a directory, puts a number of files, locks one of the files, try to delete the directory (cannot), unlocks the file and finally deletes the directory </description>
  +        <expectedResult> Status code returned by first Delete Method must be 207 multi-status and inside that it should be 423 locked , in that case one should not be able to delete the directory. </expectedResult>
  +    </specification>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +            <header>Date: Wed, 14 Mar 2001 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.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 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.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 13:04:54 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 13:04:54 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">LOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 varUsage="globalVariableServerName"><![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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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 207 Multi-Status</command>
  +            <header>Date: Wed, 14 Mar 2001 13:35:29 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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response xmlns:d="DAV"><d:href>/%globalVariableServerName%/%globalVariableCollection%/test/help-doc.html</d:href><d:status>HTTP/1.1 423 Locked</d:status></d:response></d:multistatus>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Wed, 14 Mar 2001 13:43:44 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>
   </test>
  
  
  
  1.6       +132 -132  jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/delete/mix/deleteDependency.xml
  
  Index: deleteDependency.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/delete/mix/deleteDependency.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- deleteDependency.xml	13 Aug 2002 12:45:21 -0000	1.5
  +++ deleteDependency.xml	19 Nov 2002 14:25:30 -0000	1.6
  @@ -1,136 +1,136 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -	<specification>
  -		<abstract> Checks if Delete Method can be applied to a directory where one of the files is locked. </abstract>
  -		<description> The test case consist of following major steps (unnecessary step like propfind, head are not mentioned): mkcol a directory, puts a number of files, locks one of the files, try to delete the directory (cannot), unlocks the file and finally deletes the directory </description>
  -		<expectedResult> Status code returned by first Delete Method must be 207 multi-status and inside that it should be 423 locked , in that case one should not be able to delete the directory. </expectedResult>
  -	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Wed, 14 Mar 2001 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.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 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.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 13:04:54 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 13:04:54 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">LOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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-86400</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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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 207 Multi-Status</command>
  -			<header>Date: Wed, 14 Mar 2001 13:35:29 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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response xmlns:d="DAV"><d:href>/%globalVariableCollection%/test/help-doc.html</d:href><d:status>HTTP/1.1 423 Locked</d:status></d:response></d:multistatus>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Wed, 14 Mar 2001 13:43:44 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>
  +    <specification>
  +        <abstract> Checks if Delete Method can be applied to a directory where one of the files is locked. </abstract>
  +        <description> The test case consist of following major steps (unnecessary step like propfind, head are not mentioned): mkcol a directory, puts a number of files, locks one of the files, try to delete the directory (cannot), unlocks the file and finally deletes the directory </description>
  +        <expectedResult> Status code returned by first Delete Method must be 207 multi-status and inside that it should be 423 locked , in that case one should not be able to delete the directory. </expectedResult>
  +    </specification>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +            <header>Date: Wed, 14 Mar 2001 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.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 13:04:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.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 13:04:54 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 13:04:54 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">LOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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-86400</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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-86400</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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 207 Multi-Status</command>
  +            <header>Date: Wed, 14 Mar 2001 13:35:29 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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:multistatus xmlns:d="DAV"><d:response xmlns:d="DAV"><d:href>/%globalVariableServerName%/%globalVariableCollection%/test/help-doc.html</d:href><d:status>HTTP/1.1 423 Locked</d:status></d:response></d:multistatus>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Wed, 14 Mar 2001 13:43:44 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>
   </test>
  
  
  
  1.6       +117 -117  jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLockEdit.xml
  
  Index: colLockEdit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLockEdit.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- colLockEdit.xml	13 Aug 2002 12:45:01 -0000	1.5
  +++ colLockEdit.xml	19 Nov 2002 14:25:30 -0000	1.6
  @@ -1,127 +1,127 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
   <test>
  -	<specification>
  -		<abstract> Checks if locking a collection works fine. </abstract>
  -		<description> The test case consist of following major steps: creates a directory (mkcol), puts a file in that directory, locks the directory, tries to put a file again in the given directory, unlocks the directory and finally deletes the directory (the file also gets deleted)</description>
  -		<expectedResult> Status code returned by second Put Method must be 423 Lock. </expectedResult>
  -	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Thu, 1 Mar 2001 16:54:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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: Thu, 1 Mar 2001 16:54:53 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">LOCK /%globalVariableServerName%/%globalVariableCollection% 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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test 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-86400</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 207</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="globalVariableCollection"><![CDATA[<?xml version="1.0"?>
  +    <specification>
  +        <abstract> Checks if locking a collection works fine. </abstract>
  +        <description> The test case consist of following major steps: creates a directory (mkcol), puts a file in that directory, locks the directory, tries to put a file again in the given directory, unlocks the directory and finally deletes the directory (the file also gets deleted)</description>
  +        <expectedResult> Status code returned by second Put Method must be 423 Lock. </expectedResult>
  +    </specification>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +            <header>Date: Thu, 1 Mar 2001 16:54:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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: Thu, 1 Mar 2001 16:54:53 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">LOCK /%globalVariableServerName%/%globalVariableCollection% 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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test 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-86400</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 207</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="globalVariableCollection"><![CDATA[<?xml version="1.0"?>
      <d:multistatus xmlns:d="DAV">
     <d:response>
  -    <d:href>/%globalVariableCollection%</d:href>
  +    <d:href>/%globalVariableServerName%/%globalVariableCollection%</d:href>
       <d:status>HTTP/1.1 423 Locked</d:status>
     </d:response>
   </d:multistatus>
   ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 423 Locked</command>
  -			<header>Date: Mon, 19 Feb 2001 10:55:32 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">UNLOCK /%globalVariableServerName%/%globalVariableCollection% 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>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Thu, 1 Mar 2001 16:55:03 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>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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 423 Locked</command>
  +            <header>Date: Mon, 19 Feb 2001 10:55:32 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">UNLOCK /%globalVariableServerName%/%globalVariableCollection% 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>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Thu, 1 Mar 2001 16:55:03 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>
   </test>
  
  
  
  1.7       +75 -76    jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock424.xml
  
  Index: colLock424.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock424.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- colLock424.xml	14 Aug 2002 15:45:52 -0000	1.6
  +++ colLock424.xml	19 Nov 2002 14:25:30 -0000	1.7
  @@ -1,89 +1,88 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
   <test>
  -	<specification>
  -		<abstract> Checks if Lock with status code 424. </abstract>
  -		<description> The test case consist of following major steps: creates a collection, puts two %globalVariableCollection% under give collection, locks one of the file tries to lock the collection, unlocks the file and delete the collection</description>
  -		<expectedResult> Status code returned by all MkCol  Method must be 201 Created. </expectedResult>
  -	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.html HTTP/1.1</command>
  -			<body fileReference="../../../contentDirectory/html.html"/>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html HTTP/1.1</command>
  -			<body fileReference="../../../contentDirectory/html.html"/>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html HTTP/1.1</command>
  -			<header>Timeout: Second-604800</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>
  -			<body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -			<header>Timeout: Second-86400</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 207 multi-status</command>
  -			<body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +    <specification>
  +        <abstract> Checks if Lock with status code 424. </abstract>
  +        <description> The test case consist of following major steps: creates a collection, puts two %globalVariableCollection% under give collection, locks one of the file tries to lock the collection, unlocks the file and delete the collection</description>
  +        <expectedResult> Status code returned by all MkCol  Method must be 201 Created. </expectedResult>
  +    </specification>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/allclasses-frame.html HTTP/1.1</command>
  +            <body fileReference="../../../contentDirectory/html.html"/>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html HTTP/1.1</command>
  +            <body fileReference="../../../contentDirectory/html.html"/>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html HTTP/1.1</command>
  +            <header>Timeout: Second-604800</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>
  +            <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?><d:prop xmlns:d="DAV:"><d:lockdiscovery><d:activelock><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +            <header>Timeout: Second-86400</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 207 multi-status</command>
  +            <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
                 <d:multistatus xmlns:d="DAV:">
                    <d:response>
  -                    <d:href>/%globalVariableCollection%/test/deprecated-list.html</d:href>
  +                    <d:href>/%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html</d:href>
                       <d:status>HTTP/1.1 423 Locked</d:status>
                    </d:response>
                    
                    <d:response>
  -                    <d:href>/%globalVariableCollection%/test</d:href>
  +                    <d:href>/%globalVariableServerName%/%globalVariableCollection%/test</d:href>
                       <d:status>HTTP/1.1 424 Failed Dependency</d:status>
                    </d:response>
                 </d:multistatus>
  -              ]]>
  -          </body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html HTTP/1.1</command>
  -			<header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 204 No Content</command>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 204 No Content</command>
  -		</response>
  -	</step>
  +              ]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/test/deprecated-list.html HTTP/1.1</command>
  +            <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 204 No Content</command>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 204 No Content</command>
  +        </response>
  +    </step>
   </test>
  
  
  
  1.6       +101 -101  jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock.xml
  
  Index: colLock.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/lock/mix/colLock.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- colLock.xml	13 Aug 2002 12:45:01 -0000	1.5
  +++ colLock.xml	19 Nov 2002 14:25:30 -0000	1.6
  @@ -1,111 +1,111 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
   <test>
  -	<specification>
  -		<abstract> Checks if Lock of collection works fine.</abstract>
  -		<description> The test case consist of following major steps : Creates a collection under collection %globalVariableCollection%, puts a file under the given collection, Locks the collection %globalVariableCollection%, tries to lock the created collection, unlocks collection file, deletes the created collection</description>
  -		<expectedResult> Status code returned by second Lock method must be 423. </expectedResult>
  -	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Thu, 1 Mar 2001 16:54:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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: Thu, 1 Mar 2001 16:54:53 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">LOCK /%globalVariableServerName%/%globalVariableCollection% 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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test 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-86400</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 207</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="globalVariableCollection"><![CDATA[<?xml version="1.0"?>
  +    <specification>
  +        <abstract> Checks if Lock of collection works fine.</abstract>
  +        <description> The test case consist of following major steps : Creates a collection under collection %globalVariableCollection%, puts a file under the given collection, Locks the collection %globalVariableCollection%, tries to lock the created collection, unlocks collection file, deletes the created collection</description>
  +        <expectedResult> Status code returned by second Lock method must be 423. </expectedResult>
  +    </specification>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test 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>
  +        </request>
  +        <response>
  +            <command>HTTP/1.0 201 Created</command>
  +            <header>Date: Thu, 1 Mar 2001 16:54:53 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">PUT /%globalVariableServerName%/%globalVariableCollection%/test/help-doc.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: Thu, 1 Mar 2001 16:54:53 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">LOCK /%globalVariableServerName%/%globalVariableCollection% 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><d:locktype><d:write/></d:locktype><d:lockscope><d:exclusive/></d:lockscope><d:depth>infinity</d:depth><d:owner>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]></body>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection%/test 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-86400</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 207</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="globalVariableCollection"><![CDATA[<?xml version="1.0"?>
      <d:multistatus xmlns:d="DAV">
     <d:response>
  -    <d:href>/%globalVariableCollection%</d:href>
  +    <d:href>/%globalVariableServerName%/%globalVariableCollection%</d:href>
       <d:status>HTTP/1.1 423 Locked</d:status>
     </d:response>
   </d:multistatus>
   ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection% 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>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Thu, 1 Mar 2001 16:55:03 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>
  +        </response>
  +    </step>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection% 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>
  +    <step>
  +        <request>
  +            <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test 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: Thu, 1 Mar 2001 16:55:03 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>
   </test>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>