juergen     2003/10/27 05:30:57

  Modified:    
testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples
                        ACL2UserDenyAllGrantRead.xml
                        ACL2UserDenyAllGrantWrite.xml
                        ACL400DenyGrantAll.xml ACL400DenyGrantRead.xml
                        ACL400DenyGrantReadAcl.xml ACL400GrantDenyWrite.xml
                        ACL403DenyAllGrantRead.xml
                        ACL403SelfDenyAllGrantRead.xml ACL404.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read
                        ACLdenyReadHeadPropfindGetCol.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write
                        ACLdenyWritePutProppatchLock.xml
  Log:
  do not directly operate on the global collection, but use a test collection instead.
  
  Revision  Changes    Path
  1.6       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL2UserDenyAllGrantRead.xml
  
  Index: ACL2UserDenyAllGrantRead.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL2UserDenyAllGrantRead.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL2UserDenyAllGrantRead.xml      16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL2UserDenyAllGrantRead.xml      27 Oct 2003 13:30:57 -0000      1.6
  @@ -95,7 +95,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.6       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL2UserDenyAllGrantWrite.xml
  
  Index: ACL2UserDenyAllGrantWrite.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL2UserDenyAllGrantWrite.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL2UserDenyAllGrantWrite.xml     16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL2UserDenyAllGrantWrite.xml     27 Oct 2003 13:30:57 -0000      1.6
  @@ -92,7 +92,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.6       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400DenyGrantAll.xml
  
  Index: ACL400DenyGrantAll.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400DenyGrantAll.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL400DenyGrantAll.xml    16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL400DenyGrantAll.xml    27 Oct 2003 13:30:57 -0000      1.6
  @@ -58,7 +58,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.6       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400DenyGrantRead.xml
  
  Index: ACL400DenyGrantRead.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400DenyGrantRead.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL400DenyGrantRead.xml   16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL400DenyGrantRead.xml   27 Oct 2003 13:30:57 -0000      1.6
  @@ -58,7 +58,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.6       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400DenyGrantReadAcl.xml
  
  Index: ACL400DenyGrantReadAcl.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400DenyGrantReadAcl.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL400DenyGrantReadAcl.xml        16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL400DenyGrantReadAcl.xml        27 Oct 2003 13:30:57 -0000      1.6
  @@ -58,7 +58,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.6       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400GrantDenyWrite.xml
  
  Index: ACL400GrantDenyWrite.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL400GrantDenyWrite.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL400GrantDenyWrite.xml  16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL400GrantDenyWrite.xml  27 Oct 2003 13:30:57 -0000      1.6
  @@ -58,7 +58,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.7       +13 -18    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL403DenyAllGrantRead.xml
  
  Index: ACL403DenyAllGrantRead.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL403DenyAllGrantRead.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ACL403DenyAllGrantRead.xml        4 Jul 2003 11:43:44 -0000       1.6
  +++ ACL403DenyAllGrantRead.xml        27 Oct 2003 13:30:57 -0000      1.7
  @@ -15,23 +15,26 @@
                <password varUsage="user">%user%2</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>
                <user varUsage="user">%user%2</user>
                <password varUsage="user">%user%2</password>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test/test HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <user varUsage="user">%user%2</user>
  +             <password varUsage="user">%user%2</password>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  @@ -52,7 +55,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test/test 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[
  @@ -76,7 +79,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  @@ -92,17 +95,9 @@
                        <password varUsage="user">%user%2</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.6       +13 -10    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL403SelfDenyAllGrantRead.xml
  
  Index: ACL403SelfDenyAllGrantRead.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL403SelfDenyAllGrantRead.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ACL403SelfDenyAllGrantRead.xml    16 Dec 2002 11:57:08 -0000      1.5
  +++ ACL403SelfDenyAllGrantRead.xml    27 Oct 2003 13:30:57 -0000      1.6
  @@ -15,23 +15,26 @@
                <password varUsage="user">%user%2</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>
                <user varUsage="user">%user%2</user>
                <password varUsage="user">%user%2</password>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test/test HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
  +             <user varUsage="user">%user%2</user>
  +             <password varUsage="user">%user%2</password>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  @@ -52,7 +55,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test/test 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[
  @@ -68,7 +71,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.8       +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL404.xml
  
  Index: ACL404.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLExamples/ACL404.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ACL404.xml        16 Dec 2002 11:57:08 -0000      1.7
  +++ ACL404.xml        27 Oct 2003 13:30:57 -0000      1.8
  @@ -46,7 +46,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <request>
  -                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  
  
  
  1.9       +13 -10    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadHeadPropfindGetCol.xml
  
  Index: ACLdenyReadHeadPropfindGetCol.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read/ACLdenyReadHeadPropfindGetCol.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ACLdenyReadHeadPropfindGetCol.xml 22 Aug 2003 08:30:05 -0000      1.8
  +++ ACLdenyReadHeadPropfindGetCol.xml 27 Oct 2003 13:30:57 -0000      1.9
  @@ -12,10 +12,18 @@
                <expectedResult> Head, PropFind and Get should all return 403 
Forbidden   </expectedResult>
        </specification>
        <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
                <user varUsage="user">%user%2</user>
                <password varUsage="user">%user%2</password>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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[
  @@ -36,7 +44,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">HEAD  
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">HEAD  
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        <header>User-Agent: Microsoft Data Access Internet Publishing 
Provider DAV</header>
                        <header>Accept-Language: en-us</header>
                        <header>Connection: Keep-Alive</header>
  @@ -50,7 +58,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        <header>Accept-Language: en-us</header>
                        <header>Content-Type: text/xml</header>
                        <header>Translate: f</header>
  @@ -65,7 +73,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">GET 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        <header>Accept: */*</header>
                        <header>Accept-Language: en-us</header>
                        <header>Accept-Encoding: gzip, deflate</header>
  @@ -82,12 +90,7 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <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[
  -      <D:acl xmlns:D="DAV:">
  -      </D:acl>]]></body>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        </request>
                        <response>
                                <command>HTTP/1.0 200 OK</command>
  
  
  
  1.8       +17 -14    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWritePutProppatchLock.xml
  
  Index: ACLdenyWritePutProppatchLock.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWritePutProppatchLock.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ACLdenyWritePutProppatchLock.xml  4 Sep 2003 10:49:29 -0000       1.7
  +++ ACLdenyWritePutProppatchLock.xml  27 Oct 2003 13:30:57 -0000      1.8
  @@ -12,10 +12,18 @@
                <expectedResult> Put, Proppatch and Lock should all return 403 
Forbidden. </expectedResult>
        </specification>
        <step>
  +             <request>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">MKCOL 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  +             </request>
  +             <response>
  +                     <command>HTTP/1.0 201 Created</command>
  +             </response>
  +     </step>
  +     <step>
                <user varUsage="user">%user%2</user>
                <password varUsage="user">%user%2</password>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">ACL 
/%globalVariableServerName%/%globalVariableCollection%/test 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" ?>
  @@ -36,7 +44,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PUT 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  +                     <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>
  @@ -49,7 +57,7 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
  +                     <command 
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        <header>Content-Type: text/xml</header>
                        <header>User-Agent: Microsoft Data Access Internet Publishing 
Provider DAV</header>
                        <header>Accept-Language: en-us</header>
  @@ -70,14 +78,14 @@
                        <header>Date: Tue, 13 Feb 2001 12:45:26 GMT+01:00</header>
                        <header>Content-Language: en</header>
                        <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; 
Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems 
Inc.)</header>
  -                     <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?><D:multistatus 
xmlns:D="DAV:"><D:response><D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href><D:propstat><D:prop><D:resourcetype
 /></D:prop><D:status>HTTP/1.1 409 Conflict</D:status>
  +                     <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?><D:multistatus 
xmlns:D="DAV:"><D:response><D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href><D:propstat><D:prop><D:resourcetype
 /></D:prop><D:status>HTTP/1.1 409 Conflict</D:status>
   <D:responsedescription>Property &lt;resourcetype xmlns="DAV:" /&gt; is 
protected</D:responsedescription>
   </D:propstat></D:response></D:multistatus>]]></body>
                </response>
        </step>
        <step>
                <request>
  -                     <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +                     <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        <header>Connection: Keep-Alive, TE</header>
                        <header>TE: trailers, deflate, gzip, compress</header>
                        <header>User-Agent: UCI DAV Explorer/0.70 
RPT-HTTPClient/0.3-2E</header>
  @@ -93,11 +101,11 @@
        </step>
        <step>
                <request>
  -                     <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  +                     <command 
varUsage="userNumber,globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        <header>Connection: Keep-Alive, TE</header>
                        <header>TE: trailers, deflate, gzip, compress</header>
                        <header>User-Agent: UCI DAV Explorer/0.70 
RPT-HTTPClient/0.3-2E</header>
  -                     <header varUsage="automaticVariable3">Lock-Token: 
%automaticVariable3%</header>
  +                     <header varUsage="automaticVariable1">Lock-Token: 
%automaticVariable1%</header>
                        <header>Accept-Encoding: deflate, gzip, x-gzip, compress, 
x-compress</header>
                </request>
                <response>
  @@ -110,15 +118,10 @@
                        <user varUsage="user">%user%2</user>
                        <password varUsage="user">%user%2</password>
                        <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>
  +                             <command 
varUsage="globalVariableCollection,globalVariableServerName">DELETE 
/%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
                        </request>
                        <response>
  -                             <command>HTTP/1.0 200 OK</command>
  +                             <command>HTTP/1.0 204 OK</command>
                        </response>
                </step>
        </cleanup>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to