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 2003/09/04 17:22:16 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML PropFind10.xml Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml PropFind3Get3Head3.xml Search10.xml Search10LargeTree.xml Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml Search3Get3Head3.xml

juergen     2003/09/04 08:22:16

  Modified:    testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML
                        PropFind10.xml
                        Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml
                        PropFind3Get3Head3.xml Search10.xml
                        Search10LargeTree.xml
                        Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml
                        Search3Get3Head3.xml
  Log:
  (fga) Removed displayname
  
  Revision  Changes    Path
  1.4       +14 -2     jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/PropFind10.xml
  
  Index: PropFind10.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/PropFind10.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropFind10.xml	13 Aug 2002 12:45:11 -0000	1.3
  +++ PropFind10.xml	4 Sep 2003 15:22:15 -0000	1.4
  @@ -67,11 +67,23 @@
   						<header>Depth: 1</header>
   						<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
   						<header>Connection: Keep-Alive</header>
  -						<body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
  +						<body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><getcontenttype/></prop></propfind>]]></body>
   					</request>
   					<response>
   						<command>HTTP/1.0 207 Multi-Status</command>
  -						<body varUsage="userNumber,globalVariableCollection,globalVariableServerName">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&lt;multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" &gt;&lt;response&gt;&lt;href&gt;/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/resource1.xml&lt;/href&gt;&lt;propstat&gt;&lt;prop&gt;&lt;displayname&gt;resource1.xml&lt;/displayname&gt;&lt;/prop&gt;&lt;status&gt;HTTP/1.1 200 OK&lt;/status&gt;&lt;/propstat&gt;&lt;/response&gt;&lt;/multistatus&gt;</body>
  +						<body varUsage="userNumber,globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +							<multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/">
  +								<response>
  +									<href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/resource1.xml</href>
  +									<propstat>
  +										<prop>
  +											<getcontenttype>resource1.xml</getcontenttype>
  +										</prop>
  +										<status>HTTP/1.1 200 OK</status>
  +									</propstat>
  +								</response>
  +							</multistatus>
  +						]]></body>
   					</response>
   				</step>
   			</repeater>
  
  
  
  1.11      +15 -3     jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml
  
  Index: Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml	22 Aug 2003 15:06:56 -0000	1.10
  +++ Propfind1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml	4 Sep 2003 15:22:15 -0000	1.11
  @@ -204,11 +204,23 @@
   					<header>Depth: 1</header>
   					<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
   					<header>Connection: Keep-Alive</header>
  -					<body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
  +					<body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><getcontenttype/></prop></propfind>]]></body>
   				</request>
   				<response>
   					<command>HTTP/1.0 207 Multi-Status</command>
  -					<body varUsage="globalVariableCollection,globalVariableServerName">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&lt;multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" &gt;&lt;response&gt;&lt;href&gt;/%globalVariableServerName%/%globalVariableCollection%/test/user3/readfile.xml&lt;/href&gt;&lt;propstat&gt;&lt;prop&gt;&lt;displayname&gt;readfile.xml&lt;/displayname&gt;&lt;/prop&gt;&lt;status&gt;HTTP/1.1 200 OK&lt;/status&gt;&lt;/propstat&gt;&lt;/response&gt;&lt;/multistatus&gt;</body>
  +					<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +						<multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/">
  +							<response>
  +								<href>/%globalVariableServerName%/%globalVariableCollection%/test/user3/readfile.xml</href>
  +								<propstat>
  +									<prop>
  +										<getcontenttype>text/xml</getcontenttype>
  +									</prop>
  +									<status>HTTP/1.1 200 OK</status>
  +								</propstat>
  +							</response>
  +						</multistatus>
  +					]]></body>
   				</response>
   			</step>
   		</repeater>
  @@ -248,7 +260,7 @@
   				</request>
   				<response>
   					<command>HTTP/1.0 200 OK</command>
  -						<body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,iteration,i"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +					<body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,iteration,i"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
   						   <d:prop xmlns:d="DAV:">
   						   <d:lockdiscovery>
   						      <d:activelock>
  
  
  
  1.5       +14 -2     jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/PropFind3Get3Head3.xml
  
  Index: PropFind3Get3Head3.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/PropFind3Get3Head3.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PropFind3Get3Head3.xml	13 Aug 2002 12:45:12 -0000	1.4
  +++ PropFind3Get3Head3.xml	4 Sep 2003 15:22:15 -0000	1.5
  @@ -163,11 +163,23 @@
   						<header>Depth: 1</header>
   						<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
   						<header>Connection: Keep-Alive</header>
  -						<body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><displayname/></prop></propfind>]]></body>
  +						<body><![CDATA[<?xml version="1.0" ?><propfind xmlns="DAV:"><prop><getcontenttype/></prop></propfind>]]></body>
   					</request>
   					<response>
   						<command>HTTP/1.0 207 Multi-Status</command>
  -						<body varUsage="globalVariableCollection,userNumber,globalVariableServerName">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&lt;multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/" &gt;&lt;response&gt;&lt;href&gt;/%globalVariableServerName%/%globalVariableCollection%/test/usersa/%userNumber%/resource1.xml&lt;/href&gt;&lt;propstat&gt;&lt;prop&gt;&lt;displayname&gt;resource1.xml&lt;/displayname&gt;&lt;/prop&gt;&lt;status&gt;HTTP/1.1 200 OK&lt;/status&gt;&lt;/propstat&gt;&lt;/response&gt;&lt;/multistatus&gt;</body>
  +						<body varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +							<multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/">
  +								<response>
  +									<href>/%globalVariableServerName%/%globalVariableCollection%/test/usersa/%userNumber%/resource1.xml</href>
  +									<propstat>
  +										<prop>
  +											<getcontenttype>text/xml</getcontenttype>
  +										</prop>
  +										<status>HTTP/1.1 200 OK</status>
  +									</propstat>
  +								</response>
  +							</multistatus>
  +						]]></body>
   					</response>
   				</step>
   			</repeater>
  
  
  
  1.3       +32 -36    jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search10.xml
  
  Index: Search10.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search10.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Search10.xml	13 Aug 2002 12:45:12 -0000	1.2
  +++ Search10.xml	4 Sep 2003 15:22:15 -0000	1.3
  @@ -72,47 +72,43 @@
   					<request>
   						<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
   						<body varUsage="globalVariableCollection,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -   					<searchrequest xmlns:D="DAV:">
  -   						<D:basicsearch>
  -   							<D:select>
  -   								<D:prop>
  -   									<D:displayname/>
  -   									<D:getcontenttype/>
  -   									<D:test/>
  -   									
  -   								</D:prop>
  -   							</D:select>
  -   							<D:from>
  -   								<D:scope>
  -   									<D:href>%globalVariableCollection%/test/user%userNumber%/resource1.xml</D:href>
  -   								</D:scope>
  -   							</D:from>
  -   						</D:basicsearch>
  -   					</searchrequest>
  +							<searchrequest xmlns:D="DAV:">
  +								<D:basicsearch>
  +									<D:select>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +									</D:select>
  +									<D:from>
  +										<D:scope>
  +											<D:href>%globalVariableCollection%/test/user%userNumber%/resource1.xml</D:href>
  +										</D:scope>
  +									</D:from>
  +								</D:basicsearch>
  +							</searchrequest>
      				]]></body>
   					</request>
   					<response>
   						<command>HTTP/1.0 207 Multi-Status</command>
   						<body varUsage="globalVariableCollection,globalVariableServerName,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -						<D:multistatus xmlns:D="DAV:">
  -    							<D:response>
  -        							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/resource1.xml</D:href>
  -        							<D:propstat>
  -            								<D:prop>
  -                								<D:displayname>resource1.xml</D:displayname>
  -                								<D:getcontenttype>text/xml</D:getcontenttype>
  -            								</D:prop>
  -            								<D:status>HTTP/1.1 200 OK</D:status>
  -        							</D:propstat>
  -        							<D:propstat>
  -            								<D:prop>
  -                								<D:test />
  -            								</D:prop>
  -            								<D:status>HTTP/1.1 404 Not Found</D:status>
  -        							</D:propstat>
  -    							</D:response>
  -						</D:multistatus>
  -   			
  +							<D:multistatus xmlns:D="DAV:">
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/resource1.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +							</D:multistatus>
   			]]></body>
   					</response>
   				</step>
  
  
  
  1.4       +200 -251  jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search10LargeTree.xml
  
  Index: Search10LargeTree.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search10LargeTree.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Search10LargeTree.xml	22 Aug 2003 10:46:08 -0000	1.3
  +++ Search10LargeTree.xml	4 Sep 2003 15:22:15 -0000	1.4
  @@ -159,262 +159,211 @@
   				<step>
   					<request>
   						<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
  -						<body  nosorting="true" varUsage="globalVariableCollection,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -   					<searchrequest xmlns:D="DAV:">
  -   						<D:basicsearch>
  -   							<D:select>
  -   								<D:prop>
  -   									<D:displayname/>
  -   									<D:getcontenttype/>
  -   									<D:test/>
  -   									
  -   								</D:prop>
  -   							</D:select>
  -   							<D:from>
  -   								<D:scope>
  -   									<D:href>%globalVariableCollection%/test/user%userNumber%</D:href>
  -   								</D:scope>
  -   							</D:from>
  -   							   <D:orderby>
  -								<D:order>
  -        								<D:prop>
  -          									<D:displayname/>
  -        								</D:prop>
  -      								</D:order>
  -    							</D:orderby>
  -  						</D:basicsearch>
  -   					</searchrequest>
  +						<body nosorting="true" varUsage="globalVariableCollection,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +							<searchrequest xmlns:D="DAV:">
  +								<D:basicsearch>
  +									<D:select>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +									</D:select>
  +									<D:from>
  +										<D:scope>
  +											<D:href>%globalVariableCollection%/test/user%userNumber%</D:href>
  +										</D:scope>
  +									</D:from>
  +									<D:orderby>
  +										<D:order>
  +											<D:prop>
  +												<D:getcontenttype/>
  +											</D:prop>
  +										</D:order>
  +									</D:orderby>
  +								</D:basicsearch>
  +							</searchrequest>
      				]]></body>
   					</request>
   					<response>
   						<command>HTTP/1.0 207 Multi-Status</command>
   						<body varUsage="globalVariableCollection,globalVariableServerName,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -					<D:multistatus xmlns:D="DAV:">
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>collection_1</D:displayname>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:getcontenttype />
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>collection_2</D:displayname>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:getcontenttype />
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_1</D:href>
  -        						<D:propstat>
  -            							<D:prop>	
  -                							<D:displayname>collection_secondlevel_1_1</D:displayname>
  -            							</D:prop>
  -            						<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:getcontenttype />
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>		
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_2</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>collection_secondlevel_1_2</D:displayname>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:getcontenttype />
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_1</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>collection_secondlevel_2_1</D:displayname>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>		
  -                							<D:getcontenttype />
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_2</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>collection_secondlevel_2_2</D:displayname>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:getcontenttype />
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/level1_1.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>level1_1.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/level1_2.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>level1_2.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_1/level2_1_1.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>level2_1_1.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />			
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_2/level2_1_2.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>level2_1_2.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>	
  -            							<D:prop>	
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -       							</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_1/level2_2_1.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>level2_2_1.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_2/level2_2_2.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>	
  -                							<D:displayname>level2_2_2.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/toplevel.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>toplevel.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>	
  -                							<D:test />		
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -    						<D:response>
  -        						<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>user%userNumber%</D:displayname>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:getcontenttype />	
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -					</D:multistatus>
  +							<D:multistatus xmlns:D="DAV:">
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_1</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_2</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_1</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_2</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/level1_1.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/level1_2.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_1/level2_1_1.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_1/collection_secondlevel_1_2/level2_1_2.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_1/level2_2_1.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/collection_2/collection_secondlevel_2_2/level2_2_2.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/toplevel.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +							</D:multistatus>
   			]]></body>
   					</response>
   				</step>
  
  
  
  1.7       +33 -36    jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml
  
  Index: Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml	22 Aug 2003 15:14:05 -0000	1.6
  +++ Search1Get1Head1PropPatch1Put1Copy1Move1Del1MKcol1LockUnlock1.xml	4 Sep 2003 15:22:15 -0000	1.7
  @@ -200,46 +200,43 @@
   				<request>
   					<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
   					<body varUsage="globalVariableCollection,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -   					<searchrequest xmlns:D="DAV:">
  -   						<D:basicsearch>
  -   							<D:select>
  -   								<D:prop>
  -   									<D:displayname/>
  -   									<D:getcontenttype/>
  -   									<D:test/>
  -   									
  -   								</D:prop>
  -   							</D:select>
  -   							<D:from>
  -   								<D:scope>
  -   									<D:href>%globalVariableCollection%/test/user3/readfile.xml</D:href>
  -   								</D:scope>
  -   							</D:from>
  -   						</D:basicsearch>
  -   					</searchrequest>
  +						<searchrequest xmlns:D="DAV:">
  +							<D:basicsearch>
  +								<D:select>
  +									<D:prop>
  +										<D:getcontenttype/>
  +										<D:test/>
  +									</D:prop>
  +								</D:select>
  +								<D:from>
  +									<D:scope>
  +										<D:href>%globalVariableCollection%/test/user3/readfile.xml</D:href>
  +									</D:scope>
  +								</D:from>
  +							</D:basicsearch>
  +						</searchrequest>
      				]]></body>
   				</request>
   				<response>
   					<command>HTTP/1.0 207 Multi-Status</command>
   					<body varUsage="globalVariableCollection,globalVariableServerName,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -					<D:multistatus xmlns:D="DAV:">
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user3/readfile.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>readfile.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -					</D:multistatus>
  +						<D:multistatus xmlns:D="DAV:">
  +							<D:response>
  +								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user3/readfile.xml</D:href>
  +								<D:propstat>
  +									<D:prop>
  +										<D:getcontenttype>text/xml</D:getcontenttype>
  +									</D:prop>
  +									<D:status>HTTP/1.1 200 OK</D:status>
  +								</D:propstat>
  +								<D:propstat>
  +									<D:prop>
  +										<D:test/>
  +									</D:prop>
  +									<D:status>HTTP/1.1 404 Not Found</D:status>
  +								</D:propstat>
  +							</D:response>
  +						</D:multistatus>
   			]]></body>
   				</response>
   			</step>
  @@ -280,7 +277,7 @@
   				</request>
   				<response>
   					<command>HTTP/1.0 200 OK</command>
  -						<body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,iteration,i"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +					<body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,iteration,i"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
   						   <d:prop xmlns:d="DAV:">
   						   <d:lockdiscovery>
   						      <d:activelock>
  
  
  
  1.5       +32 -35    jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search3Get3Head3.xml
  
  Index: Search3Get3Head3.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/multi-user/concurrent/DifferentCollections/validXML/Search3Get3Head3.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Search3Get3Head3.xml	13 Aug 2002 12:45:12 -0000	1.4
  +++ Search3Get3Head3.xml	4 Sep 2003 15:22:15 -0000	1.5
  @@ -159,46 +159,43 @@
   					<request>
   						<command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
   						<body varUsage="globalVariableCollection,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -   					<searchrequest xmlns:D="DAV:">
  -   						<D:basicsearch>
  -   							<D:select>
  -   								<D:prop>
  -   									<D:displayname/>
  -   									<D:getcontenttype/>
  -   									<D:test/>
  -   									
  -   								</D:prop>
  -   							</D:select>
  -   							<D:from>
  -   								<D:scope>
  -   									<D:href>%globalVariableCollection%/test/usersa/%userNumber%/resource1.xml</D:href>
  -   								</D:scope>
  -   							</D:from>
  -   						</D:basicsearch>
  -   					</searchrequest>
  +							<searchrequest xmlns:D="DAV:">
  +								<D:basicsearch>
  +									<D:select>
  +										<D:prop>
  +											<D:getcontenttype/>
  +											<D:test/>
  +										</D:prop>
  +									</D:select>
  +									<D:from>
  +										<D:scope>
  +											<D:href>%globalVariableCollection%/test/usersa/%userNumber%/resource1.xml</D:href>
  +										</D:scope>
  +									</D:from>
  +								</D:basicsearch>
  +							</searchrequest>
      				]]></body>
   					</request>
   					<response>
   						<command>HTTP/1.0 207 Multi-Status</command>
   						<body varUsage="globalVariableCollection,globalVariableServerName,userNumber"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  -					<D:multistatus xmlns:D="DAV:">
  -    						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/usersa/%userNumber%/resource1.xml</D:href>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:displayname>resource1.xml</D:displayname>
  -                							<D:getcontenttype>text/xml</D:getcontenttype>
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 200 OK</D:status>
  -        						</D:propstat>
  -        						<D:propstat>
  -            							<D:prop>
  -                							<D:test />
  -            							</D:prop>
  -            							<D:status>HTTP/1.1 404 Not Found</D:status>
  -        						</D:propstat>
  -    						</D:response>
  -					</D:multistatus>
  +							<D:multistatus xmlns:D="DAV:">
  +								<D:response>
  +									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/usersa/%userNumber%/resource1.xml</D:href>
  +									<D:propstat>
  +										<D:prop>
  +											<D:getcontenttype>text/xml</D:getcontenttype>
  +										</D:prop>
  +										<D:status>HTTP/1.1 200 OK</D:status>
  +									</D:propstat>
  +									<D:propstat>
  +										<D:prop>
  +											<D:test/>
  +										</D:prop>
  +										<D:status>HTTP/1.1 404 Not Found</D:status>
  +									</D:propstat>
  +								</D:response>
  +							</D:multistatus>
   			]]></body>
   					</response>
   				</step>