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/14 13:18:28 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV orderByContentLengthWhereGT.xml orderByContentLengthWhereGTDescending.xml

juergen     2002/08/14 04:18:28

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
                        43_orContentTypeContentLength.xml
                        44_orNonExistant.xml 46_orTwoOrStatements.xml
                        51_mixed.xml
               testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV
                        orderByContentLengthWhereGT.xml
                        orderByContentLengthWhereGTDescending.xml
  Log:
  reverted the formatting, for the body content was formatted too.
  
  Revision  Changes    Path
  1.3       +250 -177  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/43_orContentTypeContentLength.xml
  
  Index: 43_orContentTypeContentLength.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/43_orContentTypeContentLength.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 43_orContentTypeContentLength.xml	13 Aug 2002 12:44:55 -0000	1.2
  +++ 43_orContentTypeContentLength.xml	14 Aug 2002 11:18:28 -0000	1.3
  @@ -1,10 +1,14 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  +
   <test>
   	<specification>
  +		
   		<abstract> A Search is performed where the resource must have the property X with the value of Y OR 
   		the property A with the value of B.</abstract>
  +		
   		<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
  +		
   		<description>
   		1) A resource is Put to the server. This is XML but not over the searched for content length. Equal length to resource 4.
   		2) Put a file that is not XML but is over the searched for content length. Equal length to resource 3.
  @@ -16,18 +20,24 @@
   		content length must (as part of the OR) be greater than.		
   		7) A Search is performed looking for properties of a resource that is XML OR greater than the specified content length.
   		</description>
  +		
   		<expectedResult>A 207 Multi-Status response should be received as a results of the Search.
   		The first three files should be returned. The fourth should not.
   		The body of the response should contain a 200 OK respones code for each resource returning the requested properties.</expectedResult>
  +		
   	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +	
  +	
  +	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -46,23 +56,28 @@
   <ValidXML16>This is a test Valid XML document</ValidXML16>
   <ValidXML17>This is a test</ValidXML17>
   <ValidXML18>This</ValidXML18>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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><![CDATA[<html>
      <head>
      </head>
      <body>
  @@ -83,23 +98,28 @@
      <FONT SIZE="+3">This is a Test html Document</FONT></br>
      <FONT SIZE="+3">This is a T</FONT></br>
      </body>
  -</html>]]></body>
  +</html>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -118,23 +138,27 @@
   <ValidXML16>This is a test Valid XML document</ValidXML16>
   <ValidXML17>This is atest</ValidXML17>
   <ValidXML18>This i</ValidXML18>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test4.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test4.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><![CDATA[<html>
      <head>
      </head>
      <body>
  @@ -155,36 +179,44 @@
      <FONT SIZE="+3">This is a Test html Document</FONT></br>
      <FONT SIZE="+3">This is a </font></br>
      </body>
  -</html>]]></body>
  +</html>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml 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"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml 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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -196,30 +228,40 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  +
  + 	
  + 	
  + 	
  +          <step>
  + 	      <request>
  +   	         <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="test2resourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="test2resourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
  @@ -231,13 +273,22 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  -			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  +   			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   					<D:searchrequest xmlns:D="DAV:">
   						<D:basicsearch>
   							<D:select>
  @@ -277,11 +328,13 @@
   							</D:orderby>
   						</D:basicsearch>
   					</D:searchrequest>			
  -   					]]></body>
  +   					]]> 			
  +    				</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength,test2resourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  + 	
  + 		<response>
  +   			<command>HTTP/1.0 207 Multi-Status</command>
  +   			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength,test2resourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:multistatus xmlns:D="DAV:">
   							<D:response>
   								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -317,73 +370,93 @@
   									</D:propstat>
   							</D:response>
   						</D:multistatus>
  -				]]></body>
  -		</response>
  -	</step>
  +				]]>
  +   			</body>
  +   		</response>
  +   	</step>
  +
  +
  +
   	<cleanup>
  -		<step>
  -			<request>
  -				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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: Wed, 14 Mar 2001 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.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: Wed, 14 Mar 2001 14:47:37 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>
  +       		<step>
  +     			<request>
  +      				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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: Wed, 14 Mar 2001 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.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: Wed, 14 Mar 2001 14:47:37 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>	
  +	
  +	
  +	
  \ No newline at end of file
  
  
  
  1.3       +251 -177  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/44_orNonExistant.xml
  
  Index: 44_orNonExistant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/44_orNonExistant.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 44_orNonExistant.xml	13 Aug 2002 12:44:55 -0000	1.2
  +++ 44_orNonExistant.xml	14 Aug 2002 11:18:28 -0000	1.3
  @@ -1,13 +1,17 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  +
   <test>
   	<specification>
  +		
   		<abstract> Search for specific properties within resources that have the property:
   		X with the value Y
   		OR A with the value B 
   		OR C with the value D.
   		X does not exist on any property.</abstract>
  +		
   		<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
  +		
   		<description>
   		1) A resource is Put to the server. This is xml but not over the searched for content length. Equal length to resource 4.
   		2) Put a file that is not XML but is over the searched for content length. Equal length to resource 3.
  @@ -20,19 +24,27 @@
   		7) A Search is performed looking for properties of a resource that is XML OR greater than the specified content length OR has a displayname
   		of 'doesntexist'. This displayname value does not exist on any of the resources. 
   		</description>
  +		
   		<expectedResult>A 207 Multi-Status response should be returned as a result of the Search.
   		The requested properties for the first three resources should be returned. The fourth should be ignored.
   		No error should occur as a result of the non-existing displayname property.
   		Inside the body, a 200 OK response code should be returned for each resource where the property has been discovered.</expectedResult>
  +		
   	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +	
  +	
  +	
  +	
  +	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -51,23 +63,28 @@
   <ValidXML16>This is a test Valid XML document</ValidXML16>
   <ValidXML17>This is a test</ValidXML17>
   <ValidXML18>This</ValidXML18>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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><![CDATA[<html>
      <head>
      </head>
      <body>
  @@ -88,23 +105,28 @@
      <FONT SIZE="+3">This is a Test html Document</FONT></br>
      <FONT SIZE="+3">This is a T</FONT></br>
      </body>
  -</html>]]></body>
  +</html>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -123,23 +145,28 @@
   <ValidXML16>This is a test Valid XML document</ValidXML16>
   <ValidXML17>This is atest</ValidXML17>
   <ValidXML18>This i</ValidXML18>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test4.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test4.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><![CDATA[<html>
      <head>
      </head>
      <body>
  @@ -160,36 +187,43 @@
      <FONT SIZE="+3">This is a Test html Document</FONT></br>
      <FONT SIZE="+3">This is a </font></br>
      </body>
  -</html>]]></body>
  +</html>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml 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"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml 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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -201,30 +235,37 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  +          <step>
  + 	      <request>
  +   	         <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="test2resourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="test2resourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
  @@ -236,13 +277,27 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  -			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  +   			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   				<D:searchrequest xmlns:D="DAV:">
   					<D:basicsearch>
   						<D:select>
  @@ -288,11 +343,13 @@
   						</D:orderby>
   					</D:basicsearch>
   				</D:searchrequest>
  -   				]]></body>
  +   				]]> 			
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,test2resourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 207 Multi-Status</command>
  +   			<body varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,test2resourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   					<D:multistatus xmlns:D="DAV:">
   						<D:response>
   							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -328,73 +385,90 @@
   								</D:propstat>
   						</D:response>
   					</D:multistatus>
  -			]]></body>
  -		</response>
  -	</step>
  +			]]>
  +			</body>
  +  		</response>	
  + 	</step>
  + 	
   	<cleanup>
  -		<step>
  -			<request>
  -				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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: Wed, 14 Mar 2001 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.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: Wed, 14 Mar 2001 14:47:37 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>
  +    
  +   
  +    		<step>
  +     			<request>
  +      				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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: Wed, 14 Mar 2001 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.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: Wed, 14 Mar 2001 14:47:37 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>
  \ No newline at end of file
  
  
  
  1.3       +252 -177  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/46_orTwoOrStatements.xml
  
  Index: 46_orTwoOrStatements.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/46_orTwoOrStatements.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 46_orTwoOrStatements.xml	13 Aug 2002 12:44:55 -0000	1.2
  +++ 46_orTwoOrStatements.xml	14 Aug 2002 11:18:28 -0000	1.3
  @@ -1,11 +1,14 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  +
   <test>
   	<specification>
  +		
   		<abstract> A Search is made for properties within resources that have the property:
   		X with the value Y 
   		OR property A with the value B.
   		Value Y of the property X does not exist on any resource. </abstract>
  +		
   		<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
   		<description>
   		1) A resource is Put to the server. This is xml but not over the searched for content length. Equal length to resource 4.
  @@ -20,21 +23,27 @@
   		than the specified content length. The specified value of the display name property doesnt exist for any resource.
   		8) Delete all created resources.
   		</description>
  +		
   		<expectedResult>A 207 Multi-Status response should be returned as a result of the Search.
   		The requested properties of Files 2 and 3 should be the only ones returned. These are the only files
   		that are over the specified content length. The other part of the OR statement, displayname, will not be discovered,
   		there is no file with this displayname. No error should occur simply because the displayname value cannot be discovered.
   		Inside the body, a 200 OK response code should be returned for each resource where the property has been discovered.
   		</expectedResult>
  +		
   	</specification>
  -	<step>
  -		<request>
  -			<command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +	
  +	
  +	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -53,23 +62,29 @@
   <ValidXML16>This is a test Valid XML document</ValidXML16>
   <ValidXML17>This is a test</ValidXML17>
   <ValidXML18>This</ValidXML18>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.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><![CDATA[<html>
      <head>
      </head>
      <body>
  @@ -90,23 +105,29 @@
      <FONT SIZE="+3">This is a Test html Document</FONT></br>
      <FONT SIZE="+3">This is a T</FONT></br>
      </body>
  -</html>]]></body>
  +</html>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -125,23 +146,30 @@
   <ValidXML16>This is a test Valid XML document</ValidXML16>
   <ValidXML17>This is atest</ValidXML17>
   <ValidXML18>This i</ValidXML18>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test4.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test4.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><![CDATA[<html>
      <head>
      </head>
      <body>
  @@ -162,36 +190,42 @@
      <FONT SIZE="+3">This is a Test html Document</FONT></br>
      <FONT SIZE="+3">This is a </font></br>
      </body>
  -</html>]]></body>
  +</html>]]>
  +
  +	</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml 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"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.xml 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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -203,30 +237,37 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  +        <step>
  + 	      <request>
  +   	         <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test2.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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="test2resourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="test2resourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
  @@ -238,13 +279,21 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  -			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  + 	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  +   			<body varUsage="globalVariableServerName,globalVariableCollection,testresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:searchrequest xmlns:D="DAV:">
   							<D:basicsearch>
   								<D:select>
  @@ -284,11 +333,13 @@
   								</D:orderby>
   							</D:basicsearch>
   						</D:searchrequest>
  -   				]]></body>
  +   				]]> 			
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableCollection,globalVariableServerName,test2resourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 207 Multi-Status</command>
  +   			<body varUsage="globalVariableCollection,globalVariableServerName,test2resourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<D:multistatus xmlns:D="DAV:">
   								<D:response>
   									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test2.html</D:href>
  @@ -313,73 +364,97 @@
   									</D:propstat>
   								</D:response>
   							</D:multistatus>
  -			]]></body>
  -		</response>
  -	</step>
  +			]]>
  +			</body>
  +  		</response>	
  + 	</step>
  + 	
  + 	
  + 	 	
  + 	
  +	
  + 	
   	<cleanup>
  -		<step>
  -			<request>
  -				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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: Wed, 14 Mar 2001 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.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: Wed, 14 Mar 2001 14:47:37 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>
  +    
  +   
  +    		<step>
  +     			<request>
  +      				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.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: Wed, 14 Mar 2001 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test3.xml 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 14:47:37 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"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test4.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: Wed, 14 Mar 2001 14:47:37 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>
  \ No newline at end of file
  
  
  
  1.3       +662 -478  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/51_mixed.xml
  
  Index: 51_mixed.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/51_mixed.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 51_mixed.xml	13 Aug 2002 12:44:55 -0000	1.2
  +++ 51_mixed.xml	14 Aug 2002 11:18:28 -0000	1.3
  @@ -1,9 +1,13 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  +
   <test>
   	<specification>
  +		
   		<abstract>A Search with a mixture of ANDs ORs and NOTs within the WHERE element of the Search is performed.</abstract>
  +		
   		<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
  +		
   		<description>
   		1) MKCol to create a collection that all the resources used in the test case will be Put into.
   		
  @@ -57,6 +61,7 @@
   			
   		6) Delete all created resources.
   		</description>
  +		
   		<expectedResult>A 207 Multi-Status response should be returned as a result of the Search.
   		
   		The requested properties for cb.txt and db.txt should be returned only.
  @@ -66,30 +71,36 @@
   		A 404 Not Found error should be returned for the 'test' property. This does not exist on any resource.
   		
   		</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, 21 Feb 2001 12:55:57 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/a.txt 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><![CDATA[This is a test TXT Document
  +  		<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, 21 Feb 2001 12:55:57 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/a.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -136,23 +147,29 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/aa.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/aa.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documentt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -176,23 +193,28 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ab.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ab.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -239,23 +261,28 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documenttt]]></body>
  +This is a test TXT Documenttt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ac.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ac.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -279,23 +306,29 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ad.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ad.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -342,23 +375,29 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documentt]]></body>
  +This is a test TXT Documentt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ae.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ae.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documenttt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -382,23 +421,29 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/b.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/b.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -445,23 +490,28 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ba.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ba.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documentt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -485,23 +535,27 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/bb.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/bb.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -548,23 +602,27 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documenttt]]></body>
  +This is a test TXT Documenttt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/bc.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/bc.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -588,23 +646,28 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/bd.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/bd.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -651,23 +714,28 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documentt]]></body>
  +This is a test TXT Documentt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/be.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/be.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documenttt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -691,23 +759,31 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/c.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/c.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -754,23 +830,27 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ca.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ca.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documentt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -794,23 +874,29 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/cb.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/cb.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -857,23 +943,28 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documenttt]]></body>
  +This is a test TXT Documenttt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/cc.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/cc.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -897,23 +988,28 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/cd.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/cd.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -960,23 +1056,28 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documentt]]></body>
  +This is a test TXT Documentt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ce.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/ce.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documenttt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -1000,23 +1101,29 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/d.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/d.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -1063,23 +1170,27 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/da.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/da.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documentt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -1103,23 +1214,29 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/db.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/db.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -1166,23 +1283,28 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documenttt]]></body>
  +This is a test TXT Documenttt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/dc.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/dc.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -1206,23 +1328,29 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/dd.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/dd.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -1269,23 +1397,29 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Documentt]]></body>
  +This is a test TXT Documentt]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/de.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/de.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documenttt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -1309,23 +1443,30 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML documen</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/e.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/e.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -1372,36 +1513,44 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/aa.xml 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"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/aa.xml 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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="testaaresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="testaaresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/aa.xml</D:href>
  @@ -1413,30 +1562,37 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/cb.txt 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"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  +      <step>
  + 	      <request>
  +   	         <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/cb.txt 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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="testcbresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="testcbresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/cb.txt</D:href>
  @@ -1448,13 +1604,23 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  -			<body varUsage="globalVariableServerName,globalVariableCollection,testaaresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  +   			<body varUsage="globalVariableServerName,globalVariableCollection,testaaresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <D:searchrequest xmlns:D="DAV:">
   <D:basicsearch>
   <D:select>
  @@ -1519,11 +1685,13 @@
   </D:order>
   </D:orderby>
   </D:basicsearch>
  -</D:searchrequest>]]></body>
  +</D:searchrequest>]]> 			
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableCollection,globalVariableServerName,testcbresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 207 Multi-Status</command>
  +   			<body varUsage="globalVariableCollection,globalVariableServerName,testcbresourcecontentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:multistatus xmlns:D="DAV:">
   							<D:response>
   							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/cb.txt</D:href>
  @@ -1560,25 +1728,41 @@
   								</D:propstat>
   							</D:response>
   						</D:multistatus>
  -			]]></body>
  -		</response>
  -	</step>
  +			]]>
  +			</body>
  +  		</response>	
  + 	</step>
  + 	
  + 	
  +
  + 		
   	<cleanup>
  -		<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 14:47:37 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>
  +    
  +   
  +    		<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 14:47:37 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.3       +321 -222  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/orderByContentLengthWhereGT.xml
  
  Index: orderByContentLengthWhereGT.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/orderByContentLengthWhereGT.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- orderByContentLengthWhereGT.xml	13 Aug 2002 12:44:55 -0000	1.2
  +++ orderByContentLengthWhereGT.xml	14 Aug 2002 11:18:28 -0000	1.3
  @@ -1,11 +1,14 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Juergen Pill (Software AG) -->
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  +
   <test>
   	<specification>
  +		
   		<abstract> Search for specified properties within all resources where the content length is greater than a
   		defined value. Order the result by contenttype. </abstract>
  +		
   		<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
  +		
   		<description>
   		1) MKCol to create a collection for all resources to be Put into.
   		2) 10 files are Put to the server. These are either XML, HTML or TEXT files and have increasing sizes.
  @@ -56,6 +59,7 @@
   		The result is ordered by contenttype.
   		5) The resources are deleted.
   		</description>
  +		
   		<expectedResult>
   		A 207 Multi-Status response code should be received as a result of the Search.
   		
  @@ -68,30 +72,41 @@
   		
   		The property 'test' does not exist on any resource and so a 404 Not Found error should be returned by each resource.
   		</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, 21 Feb 2001 12:55:57 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test1.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><![CDATA[<html>
  +	
  +	
  +	
  +	
  +	
  +	<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, 21 Feb 2001 12:55:57 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test1.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><![CDATA[<html>
   
      <head>
   
  @@ -125,23 +140,28 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test2.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test2.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -188,23 +208,30 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -228,23 +255,26 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML document</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test4.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test4.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documentt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -268,23 +298,27 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML document</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test5.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test5.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><![CDATA[<html>
   
      <head>
   
  @@ -318,23 +352,27 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test6.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test6.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -381,23 +419,30 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test7.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test7.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -444,23 +489,36 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test8.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test8.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><![CDATA[<html>
   
      <head>
   
  @@ -494,23 +552,28 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test9.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test9.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documenttttttt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -534,23 +597,27 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML document</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test10.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test10.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><![CDATA[<html>
   
      <head>
   
  @@ -584,36 +651,43 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test8.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"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test8.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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="test8contentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="test8contentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test8.html</D:href>
  @@ -625,13 +699,25 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableServerName,globalVariableCollection">SEARCH /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  -			<body varUsage="globalVariableCollection,test8contentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 		<step> 
  +  		<request>
  +   			<command varUsage ="globalVariableServerName,globalVariableCollection">SEARCH /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +   			<body varUsage="globalVariableCollection,test8contentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<searchrequest xmlns:D="DAV:">
     							<D:basicsearch>
       								<D:select>
  @@ -664,11 +750,13 @@
       								</D:orderby>
     							</D:basicsearch>
   						</searchrequest>
  -   				]]></body>
  +   				]]> 			
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 207 Multi-Status</command>
  +   			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<D:multistatus xmlns:D="DAV:">
   								<D:response>
   								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test10.html</D:href>
  @@ -703,25 +791,36 @@
   									</D:propstat>
   								</D:response>
   							</D:multistatus>
  -			]]></body>
  -		</response>
  -	</step>
  +			]]>
  +			</body>
  +  		</response>	
  + 	</step>
  + 	
  + 	
  +
   	<cleanup>
  +	
   		<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 14:47:37 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>
  +     			<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 14:47:37 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>
  \ No newline at end of file
  
  
  
  1.3       +326 -222  jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/orderByContentLengthWhereGTDescending.xml
  
  Index: orderByContentLengthWhereGTDescending.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/orderByContentLengthWhereGTDescending.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- orderByContentLengthWhereGTDescending.xml	13 Aug 2002 12:44:55 -0000	1.2
  +++ orderByContentLengthWhereGTDescending.xml	14 Aug 2002 11:18:28 -0000	1.3
  @@ -1,11 +1,14 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!-- edited with XML Spy v4.1 U (http://www.xmlspy.com) by Juergen Pill (Software AG) -->
   <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  +
   <test>
   	<specification>
  +		
   		<abstract> Search for specified properties within all resources where the content length is greater than a
   		defined value. Order the result by contenttype in descending order. </abstract>
  +		
   		<pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
  +		
   		<description>
   		1) MKCol to create a collection for all resources to be Put into.
   		2) 10 files are Put to the server. These are either XML, HTML or TEXT files and have increasing sizes.
  @@ -55,6 +58,7 @@
   		The result is ordered by contenttype in descending order.
   		5) The resources are deleted.
   		</description>
  +		
   		<expectedResult>A 207 Multi-Status response code should be received as a result of the Search.
   		
   		The requested resources for files test9.xml and test10.html should be returned and ordered as follows:
  @@ -65,30 +69,40 @@
   		
   		The property 'test' does not exist on any resource and so a 404 Not Found error should be returned by each resource.
   		</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, 21 Feb 2001 12:55:57 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test1.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><![CDATA[<html>
  +	
  +	
  +	
  +	
  +	<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, 21 Feb 2001 12:55:57 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test1.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><![CDATA[<html>
   
      <head>
   
  @@ -122,23 +136,28 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test2.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test2.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -185,23 +204,30 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test3.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML document</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -225,23 +251,26 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML document</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test4.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test4.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documentt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -265,23 +294,27 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML document</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test5.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test5.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><![CDATA[<html>
   
      <head>
   
  @@ -315,23 +348,27 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test6.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test6.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -378,23 +415,30 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test7.txt 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><![CDATA[This is a test TXT Document
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test7.txt 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><![CDATA[This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
   This is a test TXT Document
  @@ -441,23 +485,36 @@
   This is a test TXT Documen
   This is a test TXT Documen
   This is a test TXT Documen
  -This is a test TXT Document]]></body>
  +This is a test TXT Document]]>
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test8.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test8.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><![CDATA[<html>
   
      <head>
   
  @@ -491,23 +548,28 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test9.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test9.xml 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><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   <ValidXML>
   <ValidXML2>This is a test Valid XML documenttttttt</ValidXML2>
   <ValidXML3>This is a test Valid XML document</ValidXML3>
  @@ -531,23 +593,27 @@
   <ValidXML21>This is a test Valid XML document</ValidXML21>
   <ValidXML22>This is a test Valid XML document</ValidXML22>
   <ValidXML23>This is a test Valid XML document</ValidXML23>
  -</ValidXML>]]></body>
  +</ValidXML>]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test10.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><![CDATA[<html>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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 ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/test10.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><![CDATA[<html>
   
      <head>
   
  @@ -581,36 +647,41 @@
   </html>
       			
       			
  -    			]]></body>
  +    			]]>
  +    			</body>  
   		</request>
  -		<response>
  -			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test8.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"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 201 Created</command>
  +   			<header>Date: Mon, 12 Mar 2001 17:21:35 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">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/test8.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>	
      							<D:getcontentlength/>
   						</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,globalVariableServerName" varDefinition="test8contentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
  +  	      </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,globalVariableServerName" varDefinition="test8contentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
       		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test8.html</D:href>
  @@ -622,13 +693,24 @@
       		 						</D:propstat>
       		 				</D:response>
       		 			</D:multistatus>
  -    		 ]]></body>
  -		</response>
  -	</step>
  -	<step>
  -		<request>
  -			<command varUsage="globalVariableServerName,globalVariableCollection,">SEARCH /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  -			<body varUsage="test8contentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +    		 ]]>
  +    		 
  +    		 
  +    		 </body>
  +  	      </response>
  + 	</step>
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  + 	
  +	<step> 
  +  		<request>
  +   			<command varUsage ="globalVariableServerName,globalVariableCollection,">SEARCH /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +   			<body varUsage="test8contentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<searchrequest xmlns:D="DAV:">
     								<D:basicsearch>
       									<D:select>
  @@ -661,11 +743,13 @@
       									</D:orderby>
     								</D:basicsearch>
   							</searchrequest>
  -   				]]></body>
  +   				]]> 			
  +    			</body>
   		</request>
  -		<response>
  -			<command>HTTP/1.0 207 Multi-Status</command>
  -			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +  		
  +  		<response>
  +   			<command>HTTP/1.0 207 Multi-Status</command>
  +   			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<D:multistatus xmlns:D="DAV:">
   								<D:response>
   								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test9.xml</D:href>
  @@ -700,25 +784,45 @@
   									</D:propstat>
   								</D:response>
   							</D:multistatus>
  -			]]></body>
  -		</response>
  -	</step>
  +			]]>
  +			</body>
  +  		</response>	
  + 	</step>
  +	
  +	
  +
  +	
   	<cleanup>
  -		<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 14:47:37 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>
  +    
  +   
  +    		<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 14:47:37 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>
  +	
  \ No newline at end of file
  
  
  

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