juergen     2003/11/01 07:05:07

  Modified:    testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write
                        ACLdenygrantWriteInheritancePRoppatchLockFile.xml
                        ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml
                        ACLdenyWriteACLInheritanceACLProppatchLockFile.xml
                        ACLdenyWriteACLInheritancePutProppatchLockCol.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Read
                        ACLdenyReadHeadPropfindGetCol.xml
               
testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite
                        ACLdenyWriteUnlockColFile.xml
                        ACLgrantReadPropFindColFile.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/propfind
                        propfindAclAllC.xml propfindAclAllR.xml
  Log:
  1) update the lock response body
  2) update the ALL principal keyword
  
  Revision  Changes    Path
  1.10      +24 -1     
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenygrantWriteInheritancePRoppatchLockFile.xml
  
  Index: ACLdenygrantWriteInheritancePRoppatchLockFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenygrantWriteInheritancePRoppatchLockFile.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ACLdenygrantWriteInheritancePRoppatchLockFile.xml 3 Sep 2003 15:46:17 -0000      
 1.9
  +++ ACLdenygrantWriteInheritancePRoppatchLockFile.xml 1 Nov 2003 15:05:06 -0000      
 1.10
  @@ -93,7 +93,30 @@
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  -                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> <D:prop xmlns:D="DAV:"> <D:lockdiscovery> 
<D:activelock> <D:locktype> <D:write /> </D:locktype> <D:lockscope> <D:exclusive /> 
</D:lockscope> <D:depth>infinity</D:depth> <D:owner 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><A:href
 xmlns:A="DAV:" /></D:owner> <D:timeout>*</D:timeout> <D:locktoken> <D:href>*</D:href> 
</D:locktoken> <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL></D:activelock>
 </D:lockdiscovery> </D:prop>]]></body>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> 
  +                             <D:prop xmlns:D="DAV:">
  +                                 <D:lockdiscovery>
  +                                     <D:activelock>
  +                                         <D:locktype>
  +                                             <D:write />
  +                                         </D:locktype>
  +                                         <D:lockscope>
  +                                             <D:exclusive />
  +                                         </D:lockscope>
  +                                         <D:depth>infinity</D:depth>
  +                                         <D:owner>*</D:owner>
  +                                         <D:timeout>*</D:timeout>
  +                                         <D:locktoken>
  +                                             <D:href>*</D:href>
  +                                         </D:locktoken>
  +                                         <D:principal-URL>
  +                                             
<D:href>%globalVariableUserPath%</D:href>
  +                                         </D:principal-URL>
  +                                     </D:activelock>
  +                                 </D:lockdiscovery>
  +                             </D:prop>
  +                             ]]>
  +                     </body>
                </response>
        </step>
        <step>
  
  
  
  1.10      +48 -2     
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml
  
  Index: ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml        4 Sep 2003 
10:49:29 -0000       1.9
  +++ ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml        1 Nov 2003 
15:05:06 -0000       1.10
  @@ -133,7 +133,30 @@
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  -                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> <D:prop xmlns:D="DAV:"> <D:lockdiscovery> 
<D:activelock> <D:locktype> <D:write /> </D:locktype> <D:lockscope> <D:exclusive /> 
</D:lockscope> <D:depth>infinity</D:depth> <D:owner 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><A:href
 xmlns:A="DAV:" /></D:owner> <D:timeout>*</D:timeout> <D:locktoken> <D:href>*</D:href> 
</D:locktoken> <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL></D:activelock>
 </D:lockdiscovery> </D:prop>]]></body>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> 
  +                             <D:prop xmlns:D="DAV:">
  +                                 <D:lockdiscovery>
  +                                     <D:activelock>
  +                                         <D:locktype>
  +                                             <D:write />
  +                                         </D:locktype>
  +                                         <D:lockscope>
  +                                             <D:exclusive />
  +                                         </D:lockscope>
  +                                         <D:depth>infinity</D:depth>
  +                                         <D:owner>*</D:owner>
  +                                         <D:timeout>*</D:timeout>
  +                                         <D:locktoken>
  +                                             <D:href>*</D:href>
  +                                         </D:locktoken>
  +                                         <D:principal-URL>
  +                                             
<D:href>%globalVariableUserPath%</D:href>
  +                                         </D:principal-URL>
  +                                     </D:activelock>
  +                                 </D:lockdiscovery>
  +                             </D:prop>
  +                             ]]>
  +                     </body>
                </response>
        </step>
        <step>
  @@ -206,7 +229,30 @@
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  -                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> <D:prop xmlns:D="DAV:"> <D:lockdiscovery> 
<D:activelock> <D:locktype> <D:write /> </D:locktype> <D:lockscope> <D:exclusive /> 
</D:lockscope> <D:depth>infinity</D:depth> <D:owner 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><A:href
 xmlns:A="DAV:" /></D:owner> <D:timeout>*</D:timeout> <D:locktoken> <D:href>*</D:href> 
</D:locktoken> <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL></D:activelock>
 </D:lockdiscovery> </D:prop>]]></body>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> 
  +                             <D:prop xmlns:D="DAV:">
  +                                 <D:lockdiscovery>
  +                                     <D:activelock>
  +                                         <D:locktype>
  +                                             <D:write />
  +                                         </D:locktype>
  +                                         <D:lockscope>
  +                                             <D:exclusive />
  +                                         </D:lockscope>
  +                                         <D:depth>infinity</D:depth>
  +                                         <D:owner>*</D:owner>
  +                                         <D:timeout>*</D:timeout>
  +                                         <D:locktoken>
  +                                             <D:href>*</D:href>
  +                                         </D:locktoken>
  +                                         <D:principal-URL>
  +                                             
<D:href>%globalVariableUserPath%</D:href>
  +                                         </D:principal-URL>
  +                                     </D:activelock>
  +                                 </D:lockdiscovery>
  +                             </D:prop>
  +                             ]]>
  +                     </body>
                </response>
        </step>
        <step>
  
  
  
  1.11      +24 -1     
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritanceACLProppatchLockFile.xml
  
  Index: ACLdenyWriteACLInheritanceACLProppatchLockFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritanceACLProppatchLockFile.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ACLdenyWriteACLInheritanceACLProppatchLockFile.xml        3 Sep 2003 16:16:24 
-0000       1.10
  +++ ACLdenyWriteACLInheritanceACLProppatchLockFile.xml        1 Nov 2003 15:05:06 
-0000       1.11
  @@ -91,7 +91,30 @@
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  -                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> <D:prop xmlns:D="DAV:"> <D:lockdiscovery> 
<D:activelock> <D:locktype> <D:write /> </D:locktype> <D:lockscope> <D:exclusive /> 
</D:lockscope> <D:depth>infinity</D:depth> <D:owner 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><A:href
 xmlns:A="DAV:" /></D:owner> <D:timeout>*</D:timeout> <D:locktoken> <D:href>*</D:href> 
</D:locktoken> <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL></D:activelock>
 </D:lockdiscovery> </D:prop>]]></body>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> 
  +                             <D:prop xmlns:D="DAV:">
  +                                 <D:lockdiscovery>
  +                                     <D:activelock>
  +                                         <D:locktype>
  +                                             <D:write />
  +                                         </D:locktype>
  +                                         <D:lockscope>
  +                                             <D:exclusive />
  +                                         </D:lockscope>
  +                                         <D:depth>infinity</D:depth>
  +                                         <D:owner>*</D:owner>
  +                                         <D:timeout>*</D:timeout>
  +                                         <D:locktoken>
  +                                             <D:href>*</D:href>
  +                                         </D:locktoken>
  +                                         <D:principal-URL>
  +                                             
<D:href>%globalVariableUserPath%</D:href>
  +                                         </D:principal-URL>
  +                                     </D:activelock>
  +                                 </D:lockdiscovery>
  +                             </D:prop>
  +                             ]]>
  +                     </body>
                </response>
        </step>
        <step>
  
  
  
  1.11      +23 -23    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritancePutProppatchLockCol.xml
  
  Index: ACLdenyWriteACLInheritancePutProppatchLockCol.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritancePutProppatchLockCol.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ACLdenyWriteACLInheritancePutProppatchLockCol.xml 4 Sep 2003 10:49:29 -0000      
 1.10
  +++ ACLdenyWriteACLInheritancePutProppatchLockCol.xml 1 Nov 2003 15:05:06 -0000      
 1.11
  @@ -135,30 +135,30 @@
                </request>
                <response>
                        <command>HTTP/1.0 200 OK</command>
  -                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> 
                                <D:prop xmlns:D="DAV:">
  -                                     <D:lockdiscovery>
  -                                             <D:activelock>
  -                                                     <D:locktype>
  -                                                             <D:write/>
  -                                                     </D:locktype>
  -                                                     <D:lockscope>
  -                                                             <D:exclusive/>
  -                                                     </D:lockscope>
  -                                                     <D:depth>infinity</D:depth>
  -                                                     <D:owner 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">
  -                                                             <A:href 
xmlns:A="DAV:"/>
  -                                                     </D:owner>
  -                                                     <D:timeout>*</D:timeout>
  -                                                     <D:locktoken>
  -                                                             <D:href>*</D:href>
  -                                                     </D:locktoken>
  -                                                     <d:principal-URL 
xmlns:d="DAV:">
  -                                                             
<d:href>%globalVariableUserPath%</d:href>
  -                                                     </d:principal-URL>
  -                                             </D:activelock>
  -                                     </D:lockdiscovery>
  -                             </D:prop>]]></body>
  +                                 <D:lockdiscovery>
  +                                     <D:activelock>
  +                                         <D:locktype>
  +                                             <D:write />
  +                                         </D:locktype>
  +                                         <D:lockscope>
  +                                             <D:exclusive />
  +                                         </D:lockscope>
  +                                         <D:depth>infinity</D:depth>
  +                                         <D:owner>*</D:owner>
  +                                         <D:timeout>*</D:timeout>
  +                                         <D:locktoken>
  +                                             <D:href>*</D:href>
  +                                         </D:locktoken>
  +                                         <D:principal-URL>
  +                                             
<D:href>%globalVariableUserPath%</D:href>
  +                                         </D:principal-URL>
  +                                     </D:activelock>
  +                                 </D:lockdiscovery>
  +                             </D:prop>
  +                             ]]>
  +                     </body>
                </response>
        </step>
        <step>
  
  
  
  1.10      +1 -1      
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ACLdenyReadHeadPropfindGetCol.xml 27 Oct 2003 13:30:57 -0000      1.9
  +++ ACLdenyReadHeadPropfindGetCol.xml 1 Nov 2003 15:05:07 -0000       1.10
  @@ -93,7 +93,7 @@
                                <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</command>
                        </response>
                </step>
        </cleanup>
  
  
  
  1.11      +24 -1     
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyWriteUnlockColFile.xml
  
  Index: ACLdenyWriteUnlockColFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyWriteUnlockColFile.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ACLdenyWriteUnlockColFile.xml     17 Feb 2003 17:59:50 -0000      1.10
  +++ ACLdenyWriteUnlockColFile.xml     1 Nov 2003 15:05:07 -0000       1.11
  @@ -53,7 +53,30 @@
           </request>
           <response>
               <command>HTTP/1.0 200 OK</command>
  -            <body 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?> <D:prop xmlns:D="DAV:"> <D:lockdiscovery> 
<D:activelock> <D:locktype> <D:write /> </D:locktype> <D:lockscope> <D:exclusive /> 
</D:lockscope> <D:depth>infinity</D:depth> <D:owner><A:href xmlns:A="DAV:" 
/></D:owner> <D:timeout>*</D:timeout> <D:locktoken> <D:href>*</D:href> </D:locktoken> 
<d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%2</d:href></d:principal-URL></D:activelock>
 </D:lockdiscovery> </D:prop>]]></body>
  +            <body 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?> 
  +             <D:prop xmlns:D="DAV:">
  +                 <D:lockdiscovery>
  +                     <D:activelock>
  +                         <D:locktype>
  +                             <D:write />
  +                         </D:locktype>
  +                         <D:lockscope>
  +                             <D:exclusive />
  +                         </D:lockscope>
  +                         <D:depth>infinity</D:depth>
  +                         <D:owner>*</D:owner>
  +                         <D:timeout>*</D:timeout>
  +                         <D:locktoken>
  +                             <D:href>*</D:href>
  +                         </D:locktoken>
  +                         <D:principal-URL>
  +                             <D:href>*</D:href>
  +                         </D:principal-URL>
  +                     </D:activelock>
  +                 </D:lockdiscovery>
  +             </D:prop>
  +               ]]>
  +            </body>
           </response>
       </step>
       <step>
  
  
  
  1.14      +85 -90    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLgrantReadPropFindColFile.xml
  
  Index: ACLgrantReadPropFindColFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLgrantReadPropFindColFile.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ACLgrantReadPropFindColFile.xml   4 Sep 2003 11:04:48 -0000       1.13
  +++ ACLgrantReadPropFindColFile.xml   1 Nov 2003 15:05:07 -0000       1.14
  @@ -85,90 +85,90 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi Status</command>
  -                     <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0"?>
  -                    <D:multistatus xmlns:D="DAV:">
  -                      <D:response>
  -                        <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  -                        <D:propstat>
  -                          <D:prop>
  -                            <D:acl>
  -                              <D:ace>
  -                                <D:principal>
  -                                  <D:href>%globalVariableUserPath%</D:href>
  -                                </D:principal>
  -                                <D:deny>
  -                                  <D:privilege>
  -                                     <D:write />
  -                                  </D:privilege>
  -                                  <D:privilege>
  -                                     <D:write-acl />
  -                                  </D:privilege>
  -                                </D:deny>
  -                                <D:protected />
  -                                <D:inherited>
  -                                  <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%</D:href>
  -                                </D:inherited>
  -                              </D:ace>
  -                              <D:ace>
  -                                <D:principal>
  -                                  <D:href   
varUsage="globalVariableUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
  -                                </D:principal>
  -                                <D:grant>
  -                                  <D:privilege>
  -                                    <D:all />
  -                                  </D:privilege>
  -                                </D:grant>
  -                                <D:protected />
  -                                <D:inherited>
  -                                  <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
  -                                </D:inherited>
  -                              </D:ace>
  -                            </D:acl>
  -                          </D:prop>
  -                          <D:status>HTTP/1.1 200 OK</D:status>
  -                        </D:propstat>
  -                      </D:response>
  -                      <D:response>
  -                        <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</D:href>
  -                        <D:propstat>
  -                          <D:prop>
  -                            <D:acl>
  -                              <D:ace>
  -                                <D:principal>
  -                                  <D:href>%globalVariableUserPath%</D:href>
  -                                </D:principal>
  -                                <D:deny>
  -                                  <D:privilege>
  -                                     <D:write />
  -                                  </D:privilege>
  -                                  <D:privilege>
  -                                     <D:write-acl />
  -                                  </D:privilege>
  -                                </D:deny>
  -                                <D:protected />
  -                                <D:inherited>
  -                                  <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%</D:href>
  -                                </D:inherited>
  -                              </D:ace>
  -                              <D:ace>
  -                                <D:principal>
  -                                  <D:href   
varUsage="globalVariableUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
  -                                </D:principal>
  -                                <D:grant>
  -                                  <D:privilege>
  -                                    <D:all />
  -                                  </D:privilege>
  -                                </D:grant>
  -                                <D:protected />
  -                                <D:inherited>
  -                                  <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
  -                                </D:inherited>
  -                              </D:ace>
  -                            </D:acl>
  -                          </D:prop>
  -                          <D:status>HTTP/1.1 200 OK</D:status>
  -                        </D:propstat>
  -                      </D:response>
  +                     <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <D:multistatus xmlns:D="DAV:">
  +                             <D:response xmlns:D="DAV:">
  +                                 
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                                 <D:propstat>
  +                                     <D:prop>
  +                                         <D:acl>
  +                                             <D:ace>
  +                                                 <D:principal>
  +                                                     
<D:href>%globalVariableUserPath%</D:href>
  +                                                 </D:principal>
  +                                                 <D:deny>
  +                                                     <D:privilege>
  +                                                         <D:write />
  +                                                     </D:privilege>
  +                                                     <D:privilege>
  +                                                         <D:write-acl />
  +                                                     </D:privilege>
  +                                                 </D:deny>
  +                                                 <D:protected />
  +                                                 <D:inherited>
  +                                                     
<D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
  +                                                 </D:inherited>
  +                                             </D:ace>
  +                                             <D:ace>
  +                                                 <D:principal>
  +                                                     <D:all />
  +                                                 </D:principal>
  +                                                 <D:grant>
  +                                                     <D:privilege>
  +                                                         <D:all />
  +                                                     </D:privilege>
  +                                                 </D:grant>
  +                                                 <D:protected />
  +                                                 <D:inherited>
  +                                                     
<D:href>/%globalVariableServerName%/</D:href>
  +                                                 </D:inherited>
  +                                             </D:ace>
  +                                         </D:acl>
  +                                     </D:prop>
  +                                     <D:status>HTTP/1.1 200 OK</D:status>
  +                                 </D:propstat>
  +                             </D:response>
  +                             <D:response xmlns:D="DAV:">
  +                                 
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</D:href>
  +                                 <D:propstat>
  +                                     <D:prop>
  +                                         <D:acl>
  +                                             <D:ace>
  +                                                 <D:principal>
  +                                                     
<D:href>%globalVariableUserPath%</D:href>
  +                                                 </D:principal>
  +                                                 <D:deny>
  +                                                     <D:privilege>
  +                                                         <D:write />
  +                                                     </D:privilege>
  +                                                     <D:privilege>
  +                                                         <D:write-acl />
  +                                                     </D:privilege>
  +                                                 </D:deny>
  +                                                 <D:protected />
  +                                                 <D:inherited>
  +                                                     
<D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
  +                                                 </D:inherited>
  +                                             </D:ace>
  +                                             <D:ace>
  +                                                 <D:principal>
  +                                                     <D:all />
  +                                                 </D:principal>
  +                                                 <D:grant>
  +                                                     <D:privilege>
  +                                                         <D:all />
  +                                                     </D:privilege>
  +                                                 </D:grant>
  +                                                 <D:protected />
  +                                                 <D:inherited>
  +                                                     
<D:href>/%globalVariableServerName%/</D:href>
  +                                                 </D:inherited>
  +                                             </D:ace>
  +                                         </D:acl>
  +                                     </D:prop>
  +                                     <D:status>HTTP/1.1 200 OK</D:status>
  +                                 </D:propstat>
  +                             </D:response>
                       </D:multistatus>
                   ]]></body>
                </response>
  @@ -176,17 +176,12 @@
        <step>
                <request>
                        <command 
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
  -                     <header>Accept-Language: en-us</header>
                        <header>Content-Type: text/xml</header>
  -                     <header>Translate: f</header>
                        <header>Depth: 1</header>
  -                     <header>User-Agent: Microsoft Data Access Internet Publishing 
Provider DAV</header>
  -                     <header>Connection: Keep-Alive</header>
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi Status</command>
                        <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0"?>
  -
                                <D:multistatus xmlns:D="DAV:">
                                        <D:response>
                                                <D:href 
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</D:href>
  @@ -211,7 +206,7 @@
                                                                                
</D:locktype>
                                                                        </D:lockentry>
                                                                </D:supportedlock>
  -                                                             
<D:modCount>*</D:modCount>
  +                                                             
<D:modificationdate>*</D:modificationdate>
                                                                <D:source/>
                                                                <xsv:isXml 
xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav";>true</xsv:isXml>
                                                                
<D:creationdate>*</D:creationdate>
  
  
  
  1.13      +1 -1      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/propfind/propfindAclAllC.xml
  
  Index: propfindAclAllC.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/propfind/propfindAclAllC.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- propfindAclAllC.xml       7 Aug 2003 13:37:33 -0000       1.12
  +++ propfindAclAllC.xml       1 Nov 2003 15:05:07 -0000       1.13
  @@ -32,7 +32,7 @@
                           <D:acl>
                                 <D:ace>
                                       <D:principal>
  -                                          
<D:href>%globalVariableRootUserPath%</D:href>
  +                                          <D:all />
                                       </D:principal>
                                       <D:grant>
                                             <D:privilege>
  
  
  
  1.8       +25 -24    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/propfind/propfindAclAllR.xml
  
  Index: propfindAclAllR.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/propfind/propfindAclAllR.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- propfindAclAllR.xml       7 Aug 2003 13:37:33 -0000       1.7
  +++ propfindAclAllR.xml       1 Nov 2003 15:05:07 -0000       1.8
  @@ -24,30 +24,31 @@
                <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="globalVariableRootUserPath,globalVariableServerName,user,host">
  -              &lt;?xml version="1.0" encoding="utf-8" ?&gt;
  -           &lt;multistatus xmlns="DAV:" xmlns:S="http://jakarta.apache.org/slide/"; 
&gt;
  -           &lt;response&gt;
  -           &lt;href&gt;/%globalVariableServerName%/&lt;/href&gt;
  -           &lt;propstat&gt;
  -           &lt;prop&gt;
  -           &lt;acl&gt;
  -           &lt;ace&gt;
  -           &lt;principal&gt;
  -           &lt;href&gt;%globalVariableRootUserPath%&lt;/href&gt;
  -           &lt;/principal&gt;
  -           &lt;grant&gt;
  -           &lt;privilege&gt;&lt;all/&gt;&lt;/privilege&gt;
  -           &lt;/grant&gt;
  -           &lt;/ace&gt;
  -           &lt;/acl&gt;
  -           &lt;/prop&gt;
  -           &lt;status&gt;HTTP/1.1 200 OK&lt;/status&gt;
  -           &lt;/propstat&gt;
  -           &lt;/response&gt;
  -              &lt;/multistatus&gt;
  -           
  -           </body>
  +                     <body 
varUsage="globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
  +                             <D:multistatus xmlns:D="DAV:">
  +                                 <D:response>
  +                                     <D:href>/taminowebdavserver/</D:href>
  +                                     <D:propstat>
  +                                         <D:prop>
  +                                             <D:acl>
  +                                                 <D:ace>
  +                                                     <D:principal>
  +                                                         <D:all />
  +                                                     </D:principal>
  +                                                     <D:grant>
  +                                                         <D:privilege>
  +                                                             <D:all />
  +                                                         </D:privilege>
  +                                                     </D:grant>
  +                                                 </D:ace>
  +                                             </D:acl>
  +                                         </D:prop>
  +                                         <D:status>HTTP/1.1 200 OK</D:status>
  +                                     </D:propstat>
  +                                 </D:response>
  +                             </D:multistatus>
  +                             ]]>
  +                     </body>
                </response>
        </step>
   </test>
  
  
  

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

Reply via email to