You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/08/14 17:08:48 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_Control/Non-versionable_resource VcVH.xml VcWs.xml

juergen     2002/08/14 08:08:48

  Modified:    testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite
                        ACLdenyWriteDeleteColFile.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC
                        Checkin.xml Checkout.xml Versioncontrol.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC
                        Checkin.xml Checkout.xml Versioncontrol.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR
                        Checkin.xml Checkout.xml
               testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_Control/Non-versionable_resource
                        VcVH.xml VcWs.xml
  Log:
  now a 405 is returned
  
  Revision  Changes    Path
  1.6       +25 -51    jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyWriteDeleteColFile.xml
  
  Index: ACLdenyWriteDeleteColFile.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyWriteDeleteColFile.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACLdenyWriteDeleteColFile.xml	13 Aug 2002 10:32:38 -0000	1.5
  +++ ACLdenyWriteDeleteColFile.xml	14 Aug 2002 15:08:47 -0000	1.6
  @@ -18,18 +18,17 @@
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
   			<header>Content-Type: text/xml; charset=utf-8</header>
  -			<header>User-Agent: Jakarta HTTP Client/1.0</header>
   			<body varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  -      <D:acl xmlns:D="DAV:">
  -         <D:ace>
  -            <D:principal>
  -               <D:href>%globalVariableUserPath%</D:href>
  -            </D:principal>
  -            <D:deny>
  -               <D:privilege><D:write /></D:privilege>
  -            </D:deny>
  -         </D:ace>
  -      </D:acl>]]></body>
  +                  <D:acl xmlns:D="DAV:">
  +                     <D:ace>
  +                        <D:principal>
  +                           <D:href>%globalVariableUserPath%</D:href>
  +                        </D:principal>
  +                        <D:deny>
  +                           <D:privilege><D:write /></D:privilege>
  +                        </D:deny>
  +                     </D:ace>
  +                  </D:acl>]]></body>
   		</request>
   		<response>
   			<command>HTTP/1.0 200 OK</command>
  @@ -40,16 +39,9 @@
   		<password varUsage="user">2%user%</password>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -			<header>Accept-Language: en-us</header>
  -			<header>Translate: f</header>
  -			<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
  -			<header>Connection: Keep-Alive</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
  -			<header>Content-Language: en</header>
  -			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
   		</response>
   	</step>
   	<step>
  @@ -57,10 +49,6 @@
   		<password varUsage="user">2%user%</password>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/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"/>
   		</request>
   		<response>
  @@ -70,11 +58,6 @@
   	<step>
   		<request>
   			<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test/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 403 Forbidden</command>
  @@ -83,27 +66,27 @@
   	<step>
   		<request>
   			<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -			<header>Accept-Language: en-us</header>
  -			<header>Destroy: NoUndelete</header>
  -			<header>Translate: f</header>
  -			<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
  -			<header>Connection: Keep-Alive</header>
   		</request>
   		<response>
   			<command>HTTP/1.0 207 Multi Status</command>
   			<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  -      <D:multistatus xmlns:D="DAV:">
  -  <D:response>
  -    <D:href>/%globalVariableCollection%/test/test.xml</D:href>
  -    <D:status>HTTP/1.1 403 Forbidden</D:status>
  -  </D:response>
  -  <D:response>
  -    <D:href>/%globalVariableCollection%/test</D:href>
  -    <D:status>HTTP/1.1 403 Forbidden</D:status>
  -  </D:response>
  -</D:multistatus>]]></body>
  +                  <D:multistatus xmlns:D="DAV:">
  +                      <D:response>
  +                        <D:href>/%globalVariableCollection%/test/test.xml</D:href>
  +                        <D:status>HTTP/1.1 403 Forbidden</D:status>
  +                      </D:response>
  +                      <D:response>
  +                        <D:href>/%globalVariableCollection%/test</D:href>
  +                        <D:status>HTTP/1.1 403 Forbidden</D:status>
  +                      </D:response>
  +                </D:multistatus>
  +                ]]>
  +            </body>
   		</response>
   	</step>
  +
  +
  +
   	<cleanup>
   		<step>
   			<user varUsage="user">2%user%</user>
  @@ -111,7 +94,6 @@
   			<request>
   				<command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
   				<header>Content-Type: text/xml; charset=utf-8</header>
  -				<header>User-Agent: Jakarta HTTP Client/1.0</header>
   				<body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         <D:acl xmlns:D="DAV:">
         </D:acl>]]></body>
  @@ -125,17 +107,9 @@
   			<password varUsage="user">2%user%</password>
   			<request>
   				<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  -				<header>Accept-Language: en-us</header>
  -				<header>Destroy: NoUndelete</header>
  -				<header>Translate: f</header>
  -				<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
  -				<header>Connection: Keep-Alive</header>
   			</request>
   			<response>
   				<command>HTTP/1.0 204 No Content</command>
  -				<header>Date: 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>
  
  
  
  1.5       +1 -14     jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Checkin.xml
  
  Index: Checkin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Checkin.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Checkin.xml	13 Aug 2002 12:44:56 -0000	1.4
  +++ Checkin.xml	14 Aug 2002 15:08:47 -0000	1.5
  @@ -12,15 +12,9 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/LockedC 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>
   		</request>
   		<response>
   			<command>HTTP/1.0 201 Created</command>
  -			<header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
  -			<header>Content-Language: en</header>
  -			<header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
   		</response>
   	</step>
   	<step>
  @@ -38,15 +32,10 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableCollection,globalVariableServerName">CHECKIN /%globalVariableServerName%/%globalVariableCollection%/LockedC HTTP/1.1</command>
  -			<header>Content-type: text/xml; charset="utf-8"</header>
   			<header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</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-out />
  -</D:error>]]></body>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  @@ -62,11 +51,9 @@
   		<step>
   			<request>
   				<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/LockedC 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>
  
  
  
  1.5       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Checkout.xml
  
  Index: Checkout.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Checkout.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Checkout.xml	5 Aug 2002 07:56:52 -0000	1.4
  +++ Checkout.xml	14 Aug 2002 15:08:47 -0000	1.5
  @@ -35,7 +35,7 @@
   			<header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</header>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.7       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Versioncontrol.xml
  
  Index: Versioncontrol.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/LockC/Versioncontrol.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Versioncontrol.xml	13 Aug 2002 12:44:56 -0000	1.6
  +++ Versioncontrol.xml	14 Aug 2002 15:08:47 -0000	1.7
  @@ -39,7 +39,7 @@
   			<header varUsage="automaticVariable1">If: (&lt;%varUsage%&gt;)</header>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (200,403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.4       +1 -7      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Checkin.xml
  
  Index: Checkin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Checkin.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Checkin.xml	13 Aug 2002 12:44:57 -0000	1.3
  +++ Checkin.xml	14 Aug 2002 15:08:47 -0000	1.4
  @@ -29,22 +29,16 @@
   			<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-out />
  -</D:error>]]></body>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
   		<step>
   			<request>
   				<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/UnlockedC 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>
  
  
  
  1.4       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Checkout.xml
  
  Index: Checkout.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Checkout.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Checkout.xml	5 Aug 2002 07:56:52 -0000	1.3
  +++ Checkout.xml	14 Aug 2002 15:08:47 -0000	1.4
  @@ -22,7 +22,7 @@
   			<command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT /%globalVariableServerName%/%globalVariableCollection%/UnlockedC HTTP/1.1</command>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.4       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Versioncontrol.xml
  
  Index: Versioncontrol.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedC/Versioncontrol.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Versioncontrol.xml	5 Aug 2002 07:56:52 -0000	1.3
  +++ Versioncontrol.xml	14 Aug 2002 15:08:47 -0000	1.4
  @@ -23,7 +23,7 @@
   			<header>Content-type: text/xml; charset="utf-8"</header>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (200,403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.5       +1 -8      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR/Checkin.xml
  
  Index: Checkin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR/Checkin.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Checkin.xml	13 Aug 2002 12:44:57 -0000	1.4
  +++ Checkin.xml	14 Aug 2002 15:08:47 -0000	1.5
  @@ -16,7 +16,6 @@
   		</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>
  @@ -25,22 +24,16 @@
   			<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-out />
  -</D:error>]]></body>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
   		<step>
   			<request>
   				<command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/UnlockedR.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>
   	</cleanup>
  
  
  
  1.5       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR/Checkout.xml
  
  Index: Checkout.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/compatability/UnlockedR/Checkout.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Checkout.xml	9 Aug 2002 10:25:42 -0000	1.4
  +++ Checkout.xml	14 Aug 2002 15:08:47 -0000	1.5
  @@ -24,7 +24,7 @@
   			<header>Content-type: text/xml; charset="utf-8"</header>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.7       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_Control/Non-versionable_resource/VcVH.xml
  
  Index: VcVH.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_Control/Non-versionable_resource/VcVH.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VcVH.xml	2 Aug 2002 08:43:41 -0000	1.6
  +++ VcVH.xml	14 Aug 2002 15:08:47 -0000	1.7
  @@ -55,7 +55,7 @@
   			<command varUsage="VH">VERSION-CONTROL %VH% HTTP/1.1</command>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  
  1.3       +1 -1      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_Control/Non-versionable_resource/VcWs.xml
  
  Index: VcWs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_Control/Non-versionable_resource/VcWs.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VcWs.xml	2 Aug 2002 08:41:11 -0000	1.2
  +++ VcWs.xml	14 Aug 2002 15:08:47 -0000	1.3
  @@ -23,7 +23,7 @@
   			<command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/workspace HTTP/1.1</command>
   		</request>
   		<response>
  -			<command>HTTP/1.0 (403,409)</command>
  +			<command>HTTP/1.0 405</command>
   		</response>
   	</step>
   	<cleanup>
  
  
  

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