[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slide-dev
Subject:    cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report ACLPrincipalM
From:       juergen () apache ! org
Date:       2002-12-16 14:24:32
[Download RAW message or body]

juergen     2002/12/16 06:24:32

  Modified:    testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Delete_Semantics
  WSVcWSChoutUnchout.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace
  WsMveChoutChinUpdte.xml WsChoutUnchoutWsChout.xml
                        WsChoutMveChinUpdte.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method
  WsChoutChout409forkokForbid.xml
                        WsChoutChout409forkokDisged.xml WSChoutChout409.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics
  VcWsNonvrsn.xml VcVcSameHistory.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics
  VcMveWS.xml MveWsChoutChin.xml MveWs.xml
                        MveNonWsChoutChin.xml MveNonWs.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties
  Proppworkspacecheckoutset.xml
                        Propfworkspacecheckoutset.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties
  MkwsProppworkspace.xml MkwsPropfworkspace.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method
  MkWsCpPut.xml MkWs.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockedVCR
                        Mkworkspace.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/Report
                        ACLPrincipalMatchPrincipal-PropertyPropReport.xml
  Log:
  The new http client is more strict, if the content-length header is pre-set. remove \
this header from the test cases.  
  Revision  Changes    Path
  1.6       +2 -8      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Delete_Semantics/WSVcWSChoutUnchout.xml
  
  Index: WSVcWSChoutUnchout.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Delete_Semantics/WSVcWSChoutUnchout.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WSVcWSChoutUnchout.xml	13 Aug 2002 12:16:17 -0000	1.5
  +++ WSVcWSChoutUnchout.xml	16 Dec 2002 14:24:30 -0000	1.6
  @@ -17,7 +17,6 @@
   		</description>
   		<expectedResult> Second checkout command should be succesfull</expectedResult>
   	</specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -26,8 \
+25,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -37,15 +35,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -54,7 +49,6 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.6       +2 -8      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/WsMveChoutChinUpdte.xml
  
  Index: WsMveChoutChinUpdte.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/WsMveChoutChinUpdte.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WsMveChoutChinUpdte.xml	13 Aug 2002 16:15:21 -0000	1.5
  +++ WsMveChoutChinUpdte.xml	16 Dec 2002 14:24:30 -0000	1.6
  @@ -20,7 +20,6 @@
   		</description>
   		<expectedResult> checkout and checkin command in second workspace after \
checkout, move, checkin and Update in the first workspace works fine \
</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -29,8 \
+28,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -40,15 +38,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -57,7 +52,6 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.7       +2 -7      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/WsChoutUnchoutWsChout.xml
  
  Index: WsChoutUnchoutWsChout.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/WsChoutUnchoutWsChout.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WsChoutUnchoutWsChout.xml	13 Aug 2002 12:45:36 -0000	1.6
  +++ WsChoutUnchoutWsChout.xml	16 Dec 2002 14:24:30 -0000	1.7
  @@ -18,7 +18,6 @@
   		</description>
   		<expectedResult> checkout command in second workspace after uncheckout in first \
workspace should work fine </expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -27,8 \
+26,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -38,14 +36,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -54,7 +50,6 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.6       +2 -8      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/WsChoutMveChinUpdte.xml
  
  Index: WsChoutMveChinUpdte.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/additionalUseCases/workspace/WsChoutMveChinUpdte.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WsChoutMveChinUpdte.xml	13 Aug 2002 16:15:21 -0000	1.5
  +++ WsChoutMveChinUpdte.xml	16 Dec 2002 14:24:30 -0000	1.6
  @@ -20,7 +20,6 @@
   		</description>
   		<expectedResult> checkout and checkin command in second workspace after \
checkout, move, checkin and Update in the first workspace works fine \
</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -29,8 \
+28,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -40,14 +38,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -56,7 +52,6 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -240,7 +235,6 @@
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName,WS">UPDATE \
%WS%/WS2/test.xml HTTP/1.1</command>  <header>content-type: text/xml; \
                charset="utf-8"</header>
  -			<header>content-length: 161</header>
   			<body varUsage="globalVariableCollection,globalVariableServerName,VH2"><![CDATA[<?xml \
version="1.0"?>  <D:update xmlns:D="DAV:">
   				    <D:version>
  
  
  
  1.7       +97 -143   \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokForbid.xml
  
  Index: WsChoutChout409forkokForbid.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/func \
tional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokForbid.xml,v  \
retrieving revision 1.6  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WsChoutChout409forkokForbid.xml	14 Aug 2002 10:54:28 -0000	1.6
  +++ WsChoutChout409forkokForbid.xml	16 Dec 2002 14:24:30 -0000	1.7
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check if possible to checkout a resource twice when \
                checkout-fork is forbidden and fork-ok</abstract>
  -		
   		<description>
   		0) Compute the workspace path.
   		1) MKWORKSAPCE command creates a workspace
  @@ -15,10 +12,8 @@
   		3) Checkout command which checks out a resource in workspace
   		4) Checkout command which attempts to checkout a resource in worksapce again
   		</description>
  -		
   		<expectedResult> Second checkout command should return 403 Forbidden \
</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -27,8 \
+22,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -38,63 +32,47 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -
  -
  -   <body fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PUT \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<body fileReference="../../../../contentDirectory/validXML.xm1">  </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  -
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -   		 <header>Content-Type: text/xml</header>
  -
  -   		 <header>Depth: 1</header>
  -
  -   		 
  -   		 <body><![CDATA[<?xml version="1.0" ?><D:propfind \
                xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>
                
  -  	      </request>
  -  	      <response>
  -   	         <command>HTTP/1.0 207 Multi Status</command>
  -   		 
  -    		    <body varUsage="globalVariableCollection,VHR1,globalVariableServerName" \
varDefinition="VHR1" \
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-type: text/xml; charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-Type: text/xml</header>  +			<header>Depth: 1</header>
  +			<body><![CDATA[<?xml version="1.0" ?><D:propfind \
xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 207 Multi Status</command>
  +			<body varUsage="globalVariableCollection,VHR1,globalVariableServerName" \
varDefinition="VHR1" \
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  @@ -107,95 +85,71 @@
         <status>HTTP/1.1 200 OK</status>
       </propstat>
     </response>
  -</multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step> 
  - 	   
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <body varUsage="VHR1"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +</multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<body varUsage="VHR1"><![CDATA[<?xml version="1.0" \
encoding="utf-8" ?>  <D:version-control xmlns:D="DAV:">
              <D:version>
                 <D:href>%VHR1%</D:href>
              </D:version>
  -        </D:version-control>]]>
  -     </body>
  -  </request>
  -  <response>
  -     <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  - 
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step> 
  - 
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <body varUsage="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +        </D:version-control>]]></body>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<body varUsage="VHR"><![CDATA[<?xml version="1.0" \
encoding="utf-8" ?>  <D:checkout xmlns:D="DAV:" xmlns:R="http://www.com/">
   	   <D:fork-ok/>
  -	</D:checkout>]]>
  -     </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 (403,409)</command>
  +	</D:checkout>]]></body>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 (403,409)</command>
   			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:error xmlns:D="DAV:">
                     <D:must-be-checked-in />
                   </D:error>
  -               ]]>
  -			</body>
  -  </response>
  - </step> 
  -       
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - </cleanup>
  -
  +               ]]></body>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+				<header>Destroy: NoUndelete</header>  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +		<step>
  +			<request>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Destroy: NoUndelete</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +	</cleanup>
   </test>
  
  
  
  1.7       +112 -165  \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokDisged.xml
  
  Index: WsChoutChout409forkokDisged.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/func \
tional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokDisged.xml,v  \
retrieving revision 1.6  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WsChoutChout409forkokDisged.xml	14 Aug 2002 10:54:28 -0000	1.6
  +++ WsChoutChout409forkokDisged.xml	16 Dec 2002 14:24:30 -0000	1.7
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check if possible to checkout a resource twice when \
                checkout-fork is discouraged and fork-ok </abstract>
  -		
   		<description>
   		 0) Compute the workspace path.
   		1) MKWORKSAPCE command creates a workspace
  @@ -15,11 +12,8 @@
   		3) Checkout command which checks out a resource in workspace
   		4) Checkout command which attempts to checkout a resource in worksapce again
   		</description>
  -		
   		<expectedResult> Second checkout command should return 403 Forbidden \
</expectedResult>  </specification>
  -	
  -
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -28,8 \
+22,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -39,70 +32,55 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -
  -
  -   <body fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PUT \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<body fileReference="../../../../contentDirectory/validXML.xm1">  </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -    <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -   <header>Content-Type: text/xml</header>
  -
  -
  -   <header>Pragma: no-cache</header>
  -   <header>Connection: close</header>
  -   <body><![CDATA[<?xml version="1.0" ?>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-type: text/xml; charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-Type: text/xml</header>  +			<header>Pragma: no-cache</header>
  +			<header>Connection: close</header>
  +			<body><![CDATA[<?xml version="1.0" ?>
         <D:propertyupdate xmlns:D="DAV:">
            <D:set>
      	    <D:prop>
      	       <D:checkout-fork><D:discouraged /></D:checkout-fork>
      	    </D:prop>
      	 </D:set>
  -      </D:propertyupdate>]]>
  -   </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 207 Multi Status</command>
  -   <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +      </D:propertyupdate>]]></body>
  +		</request>
  +		<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.xml</D:href>
  @@ -113,26 +91,19 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                  </body>
  -  </response>
  - </step>
  -
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -   		 <header>Content-Type: text/xml</header>
  -
  -   		 <header>Depth: 1</header>
  -
  -   		 
  -   		 <body><![CDATA[<?xml version="1.0" ?><D:propfind \
                xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>
                
  -  	      </request>
  -  	      <response>
  -   	         <command>HTTP/1.0 207 Multi Status</command>
  -   		 
  -    		    <body varUsage="globalVariableCollection,VHR1,globalVariableServerName" \
varDefinition="VHR1" \
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-Type: text/xml</header>  +			<header>Depth: 1</header>
  +			<body><![CDATA[<?xml version="1.0" ?><D:propfind \
xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 207 Multi Status</command>
  +			<body varUsage="globalVariableCollection,VHR1,globalVariableServerName" \
varDefinition="VHR1" \
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  @@ -145,95 +116,71 @@
         <status>HTTP/1.1 200 OK</status>
       </propstat>
     </response>
  -</multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step> 
  - 	   
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <body varUsage="VHR1"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +</multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<body varUsage="VHR1"><![CDATA[<?xml version="1.0" \
encoding="utf-8" ?>  <D:version-control xmlns:D="DAV:">
              <D:version>
                 <D:href>%VHR1%</D:href>
              </D:version>
  -        </D:version-control>]]>
  -     </body>
  -  </request>
  -  <response>
  -     <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  - 
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step> 
  - 
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <body varUsage="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +        </D:version-control>]]></body>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<body varUsage="VHR"><![CDATA[<?xml version="1.0" \
encoding="utf-8" ?>  <D:checkout xmlns:D="DAV:" xmlns:R="http://www.com/">
   	   <D:fork-ok/>
  -	</D:checkout>]]>
  -     </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 (403,409)</command>
  +	</D:checkout>]]></body>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 (403,409)</command>
   			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:error xmlns:D="DAV:">
                     <D:must-be-checked-in />
                   </D:error>
  -               ]]>
  -			</body>
  -  </response>
  - </step> 
  -       
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - </cleanup>
  -
  +               ]]></body>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+				<header>Destroy: NoUndelete</header>  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +		<step>
  +			<request>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Destroy: NoUndelete</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +	</cleanup>
   </test>
  
  
  
  1.6       +95 -142   \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WSChoutChout409.xml
  
  Index: WSChoutChout409.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WSChoutChout409.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WSChoutChout409.xml	14 Aug 2002 10:54:28 -0000	1.5
  +++ WSChoutChout409.xml	16 Dec 2002 14:24:30 -0000	1.6
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check if possible to checkout a resource twice when \
                checkout-fork is forbidden </abstract>
  -		
   		<description>
   		 0) Compute the workspace path.
   		1) MKWORKSAPCE command creates a workspace
  @@ -15,11 +12,8 @@
   		3) Checkout command which checks out a resource in workspace
   		4) Checkout command which attempts to checkout a resource in worksapce again
   		</description>
  -		
   		<expectedResult> Second checkout command should return 403 forbidden \
</expectedResult>  </specification>
  -	
  -
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -28,8 \
+22,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -39,64 +32,47 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName">PUT \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -
  -
  -   <body fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">PUT \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<body fileReference="../../../../contentDirectory/validXML.xm1">  </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  -
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -   		 <header>Content-Type: text/xml</header>
  -
  -   		 <header>Depth: 1</header>
  -
  -   		 
  -   		 <body><![CDATA[<?xml version="1.0" ?><D:propfind \
                xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>
                
  -  	      </request>
  -  	      <response>
  -   	         <command>HTTP/1.0 207 Multi Status</command>
  -   		 
  -    		    <body varUsage="globalVariableCollection,VHR1,globalVariableServerName" \
varDefinition="VHR1" \
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-type: text/xml; charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-Type: text/xml</header>  +			<header>Depth: 1</header>
  +			<body><![CDATA[<?xml version="1.0" ?><D:propfind \
xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 207 Multi Status</command>
  +			<body varUsage="globalVariableCollection,VHR1,globalVariableServerName" \
varDefinition="VHR1" \
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</href>
  @@ -109,90 +85,67 @@
         <status>HTTP/1.1 200 OK</status>
       </propstat>
     </response>
  -</multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step> 
  - 	   
  -
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -     <body varUsage="VHR1"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +</multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<body varUsage="VHR1"><![CDATA[<?xml version="1.0" \
encoding="utf-8" ?>  <D:version-control xmlns:D="DAV:">
              <D:version>
                 <D:href>%VHR1%</D:href>
              </D:version>
  -        </D:version-control>]]>
  -     </body>
  -  </request>
  -  <response>
  -     <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  - 
  -<step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step> 
  - 
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 (403,409)</command>
  +        </D:version-control>]]></body>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 (403,409)</command>
   			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:error xmlns:D="DAV:">
                     <D:must-be-checked-in />
                   </D:error>
  -               ]]>
  -			</body>
  -  </response>
  - </step> 
  -       
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - </cleanup>
  -
  +               ]]></body>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+				<header>Destroy: NoUndelete</header>  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +		<step>
  +			<request>
  +				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Destroy: NoUndelete</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +	</cleanup>
   </test>
  
  
  
  1.6       +3 -9      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcWsNonvrsn.xml
  
  Index: VcWsNonvrsn.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcWsNonvrsn.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VcWsNonvrsn.xml	14 Aug 2002 10:54:29 -0000	1.5
  +++ VcWsNonvrsn.xml	16 Dec 2002 14:24:30 -0000	1.6
  @@ -10,7 +10,6 @@
   		</description>
   		<expectedResult> Version Control on workspace resource should throw 409 \
Conflict</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -19,8 \
+18,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -30,15 +28,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -61,8 +56,7 @@
                   <D:error xmlns:D="DAV:">
                     <D:must-be-version />
                   </D:error>
  -               ]]>
  -			</body>
  +               ]]></body>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.9       +3 -9      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVcSameHistory.xml
  
  Index: VcVcSameHistory.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/func \
tional/Workspace_Feature/Additional_Version_Control_Semantics/VcVcSameHistory.xml,v  \
retrieving revision 1.8  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- VcVcSameHistory.xml	14 Aug 2002 10:54:29 -0000	1.8
  +++ VcVcSameHistory.xml	16 Dec 2002 14:24:30 -0000	1.9
  @@ -13,7 +13,6 @@
   		</description>
   		<expectedResult> Version Control on workspace resource should throw 409 \
Conflict</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -22,8 \
+21,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -33,15 +31,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -122,8 +117,7 @@
                   <D:error xmlns:D="DAV:">
                     <D:one-version-controlled-resource-per-history-per-workspace />
                   </D:error>
  -               ]]>
  -			</body>
  +               ]]></body>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.4       +54 -83    \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/VcMveWS.xml
  
  Index: VcMveWS.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/VcMveWS.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- VcMveWS.xml	13 Aug 2002 12:34:13 -0000	1.3
  +++ VcMveWS.xml	16 Dec 2002 14:24:31 -0000	1.4
  @@ -1,21 +1,17 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check if possible to move a workspace </abstract>
  -		
   		<description>
   		0) Compute the workspace path.
   		1) MKWORKSPACE command carried out to create a workspace
   		2) MKWORKSPACE command carried out to create another workspace
   		3) MOVE command carried out on resource
   		</description>
  -		
   		<expectedResult> MOVE command should return a 409 Conflict</expectedResult>
   	</specification>
  -<step>
  +	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  \
<header>Content-Type: text/xml</header>  @@ -23,8 +19,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -34,81 +29,57 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  - 
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  -
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
                %WS%/WS/ HTTP/1.1</command>
  -   <header>Content-type: text/xml; charset="utf-8"</header>
  -   <header>content-length: 0</header>
  -   <header varUsage="globalVariableCollection,globalVariableServerName,WS">Destination: \
                %WS%/WS2/WS</header> 
  -   <header>host: localhost</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 (403,409)</command>
  -   <body />
  -   </response>
  - </step>
  -
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS2 HTTP/1.1</command>
  -
  -   <header>Destroy: NoUndelete</header>
  -
  -
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -
  -
  -  </response>
  - </step>
  -
  - </cleanup>
  -
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS2 HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
%WS%/WS/ HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<header \
varUsage="globalVariableCollection,globalVariableServerName,WS">Destination: \
%WS%/WS2/WS</header>  +			<header>host: localhost</header>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 (403,409)</command>
  +			<body/>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Destroy: NoUndelete</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS2 HTTP/1.1</command>  +				<header>Destroy: NoUndelete</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +			</response>
  +		</step>
  +	</cleanup>
   </test>
  
  
  
  1.4       +195 -227  \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWsChoutChin.xml
  
  Index: MveWsChoutChin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWsChoutChin.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MveWsChoutChin.xml	13 Aug 2002 16:15:21 -0000	1.3
  +++ MveWsChoutChin.xml	16 Dec 2002 14:24:31 -0000	1.4
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check the workspace property exist when the file is moved to \
                another workspace collection </abstract>
  -		
   		<description>
   		0) Compute the workspace path.
   		1) MKWORKSPACE command carried out
  @@ -20,10 +17,9 @@
   		10) Checkout command checks out a resource
   		11) Checkin command checks in a resource
   		</description>
  -		
   		<expectedResult> Propfind should find the workspace property after the \
MOVE</expectedResult>  </specification>
  -<step>
  +	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  \
<header>Content-Type: text/xml</header>  @@ -31,8 +27,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -42,70 +37,62 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  -  <step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
                %WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS2 HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
%WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
      </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -      	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">REPORT \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <body><![CDATA[<D:version-tree \
                xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:version-tree>]]></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="VH" varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +			<header>Content-Language: en</header>
  +			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>  \
+		</response>  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">REPORT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<body><![CDATA[<D:version-tree \
xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:version-tree>]]></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="VH" \
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <multistatus xmlns="DAV:">
     <response>
       <href>*</href>
  @@ -118,27 +105,24 @@
         <status>HTTP/1.1 200 OK</status>
       </propstat>
     </response>
  -</multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step>
  - 	   
  - 
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS/test.xml</D:href>
  @@ -151,26 +135,24 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  -
  -    	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:checked-in \
                /></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,VH,globalVariableServerName,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:checked-in /></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,VH,globalVariableServerName,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS/test.xml</D:href>
  @@ -183,40 +165,36 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   <header>Content-type: text/xml; charset="utf-8"</header>
  -   <header>content-length: 0</header>
  -   <header varUsage="globalVariableCollection,globalVariableServerName,WS">Destination: \
                %WS%/WS2/test.xml</header> 
  -   <header>host: localhost</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <body />
  -   </response>
  - </step>
  -
  - 	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
                %WS%/WS2/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<header \
varUsage="globalVariableCollection,globalVariableServerName,WS">Destination: \
%WS%/WS2/test.xml</header>  +			<header>host: localhost</header>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 204 No Content</command>
  +			<body/>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
%WS%/WS2/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS2/test.xml</D:href>
  @@ -229,26 +207,24 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  -
  -    	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND \
                %WS%/WS2/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:checked-in \
                /></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,VH,globalVariableServerName,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND \
%WS%/WS2/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:checked-in /></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,VH,globalVariableServerName,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS2/test.xml</D:href>
  @@ -261,67 +237,59 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step>
  - 	   
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
                %WS%/WS2/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -   <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKIN \
                %WS%/WS2/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 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,WS">DELETE \
                %WS%/WS2 HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  -
  - </cleanup>
  -
  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT \
%WS%/WS2/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKIN \
%WS%/WS2/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 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,WS">DELETE \
%WS%/WS2 HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 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       +118 -140  \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWs.xml
  
  Index: MveWs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MveWs.xml	13 Aug 2002 12:34:13 -0000	1.2
  +++ MveWs.xml	16 Dec 2002 14:24:31 -0000	1.3
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check the workspace property exist when the file is moved to \
                another workspace collection </abstract>
  -		
   		<description>
   		0) Compute the workspace path.
   		1) MKWORKSPACE command carried out
  @@ -15,10 +12,9 @@
   		5) MOVE command carried out on resource
   		6) PROPFIND checks the workspace property
   		</description>
  -		
   		<expectedResult> Propfind should find the workspace property after the \
MOVE</expectedResult>  </specification>
  -<step>
  +	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  \
<header>Content-Type: text/xml</header>  @@ -26,8 +22,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -37,64 +32,57 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS2 HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
                %WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS2 HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
%WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
      </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  - 
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +			<header>Content-Language: en</header>
  +			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>  \
+		</response>  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS/test.xml</D:href>
  @@ -107,40 +95,36 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   <header>Content-type: text/xml; charset="utf-8"</header>
  -   <header>content-length: 0</header>
  -   <header varUsage="globalVariableCollection,globalVariableServerName,WS">Destination: \
                %WS%/WS2/test.xml</header> 
  -   <header>host: localhost</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <body />
  -   </response>
  - </step>
  -
  - 	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
                %WS%/WS2/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<header \
varUsage="globalVariableCollection,globalVariableServerName,WS">Destination: \
%WS%/WS2/test.xml</header>  +			<header>host: localhost</header>
  +		</request>
  +		<response>
  +			<command>HTTP/1.0 204 No Content</command>
  +			<body/>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
%WS%/WS2/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS2/test.xml</D:href>
  @@ -153,47 +137,41 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  -
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 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,WS">DELETE \
                %WS%/WS2 HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  -
  - </cleanup>
  -
  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 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,WS">DELETE \
%WS%/WS2 HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 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.5       +187 -217  \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveNonWsChoutChin.xml
  
  Index: MveNonWsChoutChin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveNonWsChoutChin.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MveNonWsChoutChin.xml	14 Aug 2002 08:04:48 -0000	1.4
  +++ MveNonWsChoutChin.xml	16 Dec 2002 14:24:31 -0000	1.5
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check the workspace property doesnt exist when a \
                version-controlled file is moved to a non-workspace collection \
                </abstract>
  -		
   		<description>
   		0) Compute the workspace path.
   		1) MKWORKSPACE command carried out
  @@ -19,10 +16,9 @@
   		9) Checkout command checks out a resource
   		10) Checkin command checks in a resource
   		</description>
  -		
   		<expectedResult> Propfind should not find the workspace property after the \
MOVE</expectedResult>  </specification>
  -<step>
  +	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  \
<header>Content-Type: text/xml</header>  @@ -30,8 +26,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -41,60 +36,54 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  - 
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
                %WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
%WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
      </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  - 
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
                %WS%/WS/test.xml HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -      	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">REPORT \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <body><![CDATA[<D:version-tree \
                xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:version-tree>]]></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="VH" varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +			<header>Content-Language: en</header>
  +			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>  \
+		</response>  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">REPORT \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<body><![CDATA[<D:version-tree \
xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:version-tree>]]></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="VH" \
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <multistatus xmlns="DAV:">
     <response>
       <href>*</href>
  @@ -107,27 +96,24 @@
         <status>HTTP/1.1 200 OK</status>
       </propstat>
     </response>
  -</multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step>
  - 	   
  - 
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS/test.xml</D:href>
  @@ -140,26 +126,24 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  -
  -    	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:checked-in \
                /></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,VH,globalVariableServerName,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:checked-in /></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,VH,globalVariableServerName,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS/test.xml</D:href>
  @@ -172,40 +156,36 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step>
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   <header>Content-type: text/xml; charset="utf-8"</header>
  -   <header>content-length: 0</header>
  -   <header varUsage="globalVariableCollection,globalVariableServerName">Destination: \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml</header> \
                
  -   <header>host: localhost</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <body />
  -   </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: 0</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:workspace/></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"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<header \
varUsage="globalVariableCollection,globalVariableServerName">Destination: \
/%globalVariableServerName%/%globalVariableCollection%/test.xml</header>  \
+			<header>host: localhost</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 204 No Content</command>
  +			<body/>
  +		</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: 0</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:workspace/></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"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -216,26 +196,24 @@
                     <D:status>HTTP/1.1 404 Not Found</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  -
  -    	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,userNumber,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: 0</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:checked-in \
                /></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,VH,globalVariableServerName"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,userNumber,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: 0</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:checked-in /></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,VH,globalVariableServerName"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -248,67 +226,59 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                  </body>
  -  	      </response>
  - 	   </step>
  - 	   
  - <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 200 OK</command>
  -  </response>
  - </step>
  - 
  -   <step>
  -  <request>
  -     <command varUsage="globalVariableCollection,globalVariableServerName">CHECKIN \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml \
                HTTP/1.1</command>   
  -     <header>Content-type: text/xml; charset="utf-8"</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  -
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 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%/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: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  -
  - </cleanup>
  -
  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-type: text/xml; charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 200 OK</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName">CHECKIN \
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>  \
+			<header>Content-type: text/xml; charset="utf-8"</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 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%/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: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  +				<header>Content-Language: en</header>
  +				<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>  \
+			</response>  +		</step>
  +	</cleanup>
   </test>
  
  
  
  1.4       +110 -130  \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveNonWs.xml
  
  Index: MveNonWs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveNonWs.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MveNonWs.xml	13 Aug 2002 12:34:13 -0000	1.3
  +++ MveNonWs.xml	16 Dec 2002 14:24:31 -0000	1.4
  @@ -1,11 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  - <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
  -    
  +<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
   <test>
  -
   	<specification>
   		<abstract> Test to check the workspace property doesnt exist when the file is \
                moved to a non-workspace collection </abstract>
  -		
   		<description>
   		0) Compute the workspace path.
   		1) MKWORKSPACE command carried out
  @@ -14,10 +11,9 @@
   		4) MOVE command carried out on resource
   		5) PROPFIND checks the workspace property
   		</description>
  -		
   		<expectedResult> Propfind should not find the workspace property after the \
MOVE</expectedResult>  </specification>
  -<step>
  +	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  \
<header>Content-Type: text/xml</header>  @@ -25,8 +21,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -36,54 +31,49 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Content-length: 0</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -  </response>
  - </step>
  - 
  -   <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
                %WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
%WS%/WS HTTP/1.1</command>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT \
%WS%/WS/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 fileReference="../../../../contentDirectory/validXML.xm1">
      </body>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 201 Created</command>
  -   <header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  - 
  -  	   <step>
  - 	      <request>
  -   	         <command \
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   		 <header>Accept-Language: en-us</header>
  -   		 <header>Content-Type: text/xml</header>
  -   		 <header>Translate: f</header>
  -   		 <header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 201 Created</command>
  +			<header>Date: Wed, 14 Mar 2001 15:45:51 GMT+01:00</header>
  +			<header>Content-Language: en</header>
  +			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>  \
+		</response>  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Accept-Language: en-us</header>
  +			<header>Content-Type: text/xml</header>
  +			<header>Translate: f</header>
  +			<header>Depth: 0</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:workspace/></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,WS"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>%WS%/WS/test.xml</D:href>
  @@ -96,40 +86,36 @@
                     <D:status>HTTP/1.1 200 OK</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  - 
  - <step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
                %WS%/WS/test.xml HTTP/1.1</command>
  -   <header>Content-type: text/xml; charset="utf-8"</header>
  -   <header>content-length: 0</header>
  -   <header varUsage="globalVariableCollection,globalVariableServerName">Destination: \
                /%globalVariableServerName%/%globalVariableCollection%/test.xml</header> \
                
  -   <header>host: localhost</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <body />
  -   </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: 0</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:workspace/></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"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<step>
  +		<request>
  +			<command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE \
%WS%/WS/test.xml HTTP/1.1</command>  +			<header>Content-type: text/xml; \
charset="utf-8"</header>  +			<header \
varUsage="globalVariableCollection,globalVariableServerName">Destination: \
/%globalVariableServerName%/%globalVariableCollection%/test.xml</header>  \
+			<header>host: localhost</header>  +		</request>
  +		<response>
  +			<command>HTTP/1.0 204 No Content</command>
  +			<body/>
  +		</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: 0</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:workspace/></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"><![CDATA[<?xml \
version="1.0" encoding="utf-8" ?>  <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -140,47 +126,41 @@
                     <D:status>HTTP/1.1 404 Not Found</D:status>
               </D:propstat>
         </D:response>
  -</D:multistatus>]]>
  -                 </body>
  -  	      </response>
  - 	   </step> 
  -
  -  <cleanup>
  -  
  -<step>
  -  <request>
  -   <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
                %WS%/WS HTTP/1.1</command>
  -   <header>Accept-Language: en-us</header>
  -   <header>Destroy: NoUndelete</header>
  -   <header>Translate: f</header>
  -   <header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -   <header>Connection: Keep-Alive</header>
  -  </request>
  -  <response>
  -   <command>HTTP/1.0 204 No Content</command>
  -   <header>Date: Tue, 13 Feb 2001 17:14:41 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%/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: Tue, 13 Feb 2001 17:14:41 GMT+01:00</header>
  -   <header>Content-Language: en</header>
  -   <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -  </response>
  - </step>
  -
  - </cleanup>
  -
  +</D:multistatus>]]></body>
  +		</response>
  +	</step>
  +	<cleanup>
  +		<step>
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE \
%WS%/WS HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 13 Feb 2001 17:14:41 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%/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: Tue, 13 Feb 2001 17:14:41 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.5       +2 -8      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Proppworkspacecheckoutset.xml
  
  Index: Proppworkspacecheckoutset.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Proppworkspacecheckoutset.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Proppworkspacecheckoutset.xml	14 Aug 2002 08:54:21 -0000	1.4
  +++ Proppworkspacecheckoutset.xml	16 Dec 2002 14:24:31 -0000	1.5
  @@ -18,7 +18,6 @@
   		</description>
   		<expectedResult> Propfind should find the workspace-checkout-set \
</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -27,8 \
+26,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -38,16 +36,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  - 
  - 
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.5       +2 -7      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Propfworkspacecheckoutset.xml
  
  Index: Propfworkspacecheckoutset.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Propfworkspacecheckoutset.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Propfworkspacecheckoutset.xml	14 Aug 2002 08:54:21 -0000	1.4
  +++ Propfworkspacecheckoutset.xml	16 Dec 2002 14:24:31 -0000	1.5
  @@ -18,7 +18,6 @@
   		</description>
   		<expectedResult> Propfind should find the workspace-checkout-set \
</expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -27,8 \
+26,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -38,15 +36,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  - 
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.5       +2 -7      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsProppworkspace.xml
  
  Index: MkwsProppworkspace.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsProppworkspace.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MkwsProppworkspace.xml	14 Aug 2002 08:26:17 -0000	1.4
  +++ MkwsProppworkspace.xml	16 Dec 2002 14:24:31 -0000	1.5
  @@ -11,7 +11,6 @@
   		</description>
   		<expectedResult> Proppatch should return a 207 multi status which contains a 409 \
Conflict </expectedResult>  </specification>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -20,8 \
+19,7 @@  <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -31,15 +29,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.4       +2 -6      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsPropfworkspace.xml
  
  Index: MkwsPropfworkspace.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsPropfworkspace.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MkwsPropfworkspace.xml	14 Aug 2002 08:26:17 -0000	1.3
  +++ MkwsPropfworkspace.xml	16 Dec 2002 14:24:31 -0000	1.4
  @@ -19,8 +19,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -30,15 +29,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  -	
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.2       +15 -21    \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method/MkWsCpPut.xml
  
  Index: MkWsCpPut.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method/MkWsCpPut.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MkWsCpPut.xml	8 Nov 2002 12:56:25 -0000	1.1
  +++ MkWsCpPut.xml	16 Dec 2002 14:24:31 -0000	1.2
  @@ -26,9 +26,6 @@
   			<header>Servlet-Engine: Tomcat Web Server/3.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">OPTIONS \
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>  @@ -53,7 \
+50,6 @@  <step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  @@ -76,7 +72,6 @@
   			<header>Servlet-Engine: Tomcat Web Server/3.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>
  @@ -95,21 +90,20 @@
   			</response>
   		</step>
   		<step>
  -		<request>
  -			<command varUsage="globalVariableCollection,globalVariableServerName">DELETE \
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html \
                HTTP/1.1</command>
  -			<header>Accept-Language: en-us</header>
  -			<header>Destroy: NoUndelete</header>
  -			<header>Translate: f</header>
  -			<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
                DAV</header>
  -			<header>Connection: Keep-Alive</header>
  -		</request>
  -		<response>
  -			<command>HTTP/1.0 204 No Content</command>
  -			<header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
  -			<header>Content-Language: en</header>
  -			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
                Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems \
                Inc.)</header>
  -		</response>
  -	</step>
  -
  +			<request>
  +				<command varUsage="globalVariableCollection,globalVariableServerName">DELETE \
/%globalVariableServerName%/%globalVariableCollection%/help-doc.html \
HTTP/1.1</command>  +				<header>Accept-Language: en-us</header>
  +				<header>Destroy: NoUndelete</header>
  +				<header>Translate: f</header>
  +				<header>User-Agent: Microsoft Data Access Internet Publishing Provider \
DAV</header>  +				<header>Connection: Keep-Alive</header>
  +			</request>
  +			<response>
  +				<command>HTTP/1.0 204 No Content</command>
  +				<header>Date: Tue, 20 Feb 2001 16:49:49 GMT+01:00</header>
  +				<header>Content-Language: en</header>
  +				<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; \
Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>  \
+			</response>  +		</step>
   	</cleanup>
   </test>
  
  
  
  1.4       +2 -6      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method/MkWs.xml
  
  Index: MkWs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/MKWORKSPACE_Method/MkWs.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MkWs.xml	14 Aug 2002 08:48:25 -0000	1.3
  +++ MkWs.xml	16 Dec 2002 14:24:31 -0000	1.4
  @@ -17,8 +17,7 @@
   			    <D:options xmlns:D="DAV:">
                      <D:workspace-collection-set/>
                   </D:options>
  -			    ]]>
  -			</body>
  +			    ]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -28,15 +27,12 @@
                           <D:href>*</D:href>
                       </D:workspace-collection-set>
                   </D:options-response>
  -                ]]>
  -            </body>
  +                ]]></body>
   		</response>
   	</step>
  - 
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE \
                %WS%/WS HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  
  
  
  1.6       +0 -1      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockedVCR/Mkworkspace.xml
  
  Index: Mkworkspace.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockedVCR/Mkworkspace.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Mkworkspace.xml	13 Aug 2002 12:44:56 -0000	1.5
  +++ Mkworkspace.xml	16 Dec 2002 14:24:31 -0000	1.6
  @@ -45,7 +45,6 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE \
/%globalVariableServerName%/%globalVariableCollection%/LockedVCRxml \
                HTTP/1.1</command>
  -			<header>Content-length: 0</header>
   			<header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</header>
   		</request>
   		<response>
  
  
  
  1.7       +0 -1      \
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertyPropReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertyPropReport.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertyPropReport.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ACLPrincipalMatchPrincipal-PropertyPropReport.xml	16 Dec 2002 11:57:03 \
-0000	1.6  +++ ACLPrincipalMatchPrincipal-PropertyPropReport.xml	16 Dec 2002 14:24:32 \
-0000	1.7  @@ -69,7 +69,6 @@
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">REPORT \
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>  \
                <header>content-type: text/xml; charset="utf-8"</header>
  -			<header>content-length: 190</header>
   			<body><![CDATA[
   <D:principal-match xmlns:D="DAV:">
   <D:principal-property>
  
  
  

--
To unsubscribe, e-mail:   <mailto:slide-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@jakarta.apache.org>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic