juergen     2002/07/31 05:53:15

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV
                        selectDefinedProperties.xml
               testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL
                        grantReadForDirectoryAndFilesSearch.xml
                        grantReadACLSearchForACL.xml
                        grantReadACLForDirectoryAndFilesSearch.xml
                        denyReadForHalfDirectorySearch.xml
  Log:
  the user path (returned and computed by e.g. lock method) is now be parameterised 
from the command line.
  
  Revision  Changes    Path
  1.3       +3 -3      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV/selectDefinedProperties.xml
  
  Index: selectDefinedProperties.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV/selectDefinedProperties.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- selectDefinedProperties.xml       31 Jul 2002 07:17:04 -0000      1.2
  +++ selectDefinedProperties.xml       31 Jul 2002 12:53:14 -0000      1.3
  @@ -58,7 +58,7 @@
                <response>
                        <command>HTTP/1.0 200 OK</command>
                        <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 
="globalVariableServerName,host,user"><![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>/%globalVariableServerName%/administration/security/users/%host%/%user%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
  +                     <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>%globalVariableUserPath%</d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href></d:href></d:locktoken></d:activelock></d:lockdiscovery></d:prop>]]>
                        </body>
                </response>
        </step>
  @@ -147,7 +147,7 @@
                
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,host,user"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,testresourcecontentlength"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                        <D:multistatus xmlns:D="DAV:">
                                <D:response>
                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  @@ -169,7 +169,7 @@
                                                                                       
 <exclusive />
                                                                                
</lockscope>
                                                                                
<depth>infinity</depth>
  -                                                                             
<owner>/%globalVariableServerName%/administration/security/users/%host%/%user%</owner>
  +                                                                             
<owner>%globalVariableUserPath%</owner>
                                                                                
<timeout>*</timeout>
                                                                                
<locktoken>
                                                                                       
 <href>*</href>
  
  
  
  1.4       +17 -17    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/grantReadForDirectoryAndFilesSearch.xml
  
  Index: grantReadForDirectoryAndFilesSearch.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/grantReadForDirectoryAndFilesSearch.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- grantReadForDirectoryAndFilesSearch.xml   12 Jul 2002 13:21:20 -0000      1.3
  +++ grantReadForDirectoryAndFilesSearch.xml   31 Jul 2002 12:53:14 -0000      1.4
  @@ -208,7 +208,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  @@ -217,7 +217,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -230,7 +230,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -254,7 +254,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -267,7 +267,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -284,7 +284,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -375,7 +375,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>    
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  @@ -384,7 +384,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -397,7 +397,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -414,7 +414,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -516,7 +516,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  @@ -525,7 +525,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -538,7 +538,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -637,7 +637,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                <D:multistatus xmlns:D="DAV:">
                                        <D:response>
                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  @@ -646,7 +646,7 @@
                                                                <D:acl>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -659,7 +659,7 @@
                                                                        </D:ace>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -676,7 +676,7 @@
                                                                        </D:ace>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  
  
  
  1.2       +17 -17    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/grantReadACLSearchForACL.xml
  
  Index: grantReadACLSearchForACL.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/grantReadACLSearchForACL.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- grantReadACLSearchForACL.xml      15 Jul 2002 06:54:50 -0000      1.1
  +++ grantReadACLSearchForACL.xml      31 Jul 2002 12:53:14 -0000      1.2
  @@ -147,7 +147,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  @@ -156,7 +156,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -166,7 +166,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -190,7 +190,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -200,7 +200,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -214,7 +214,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -264,7 +264,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  @@ -273,7 +273,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/localhost/test</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%/localhost/test</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -283,7 +283,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/localhost/test</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%/localhost/test</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -297,7 +297,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -350,7 +350,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  @@ -359,7 +359,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -369,7 +369,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -420,7 +420,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                <D:multistatus xmlns:D="DAV:">
                                        <D:response>
                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  @@ -429,7 +429,7 @@
                                                                <D:acl>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -439,7 +439,7 @@
                                                                        </D:ace>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -453,7 +453,7 @@
                                                                        </D:ace>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  
  
  
  1.2       +17 -17    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/grantReadACLForDirectoryAndFilesSearch.xml
  
  Index: grantReadACLForDirectoryAndFilesSearch.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/grantReadACLForDirectoryAndFilesSearch.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- grantReadACLForDirectoryAndFilesSearch.xml        15 Jul 2002 06:42:21 -0000     
 1.1
  +++ grantReadACLForDirectoryAndFilesSearch.xml        31 Jul 2002 12:53:14 -0000     
 1.2
  @@ -208,7 +208,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  @@ -217,7 +217,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -227,7 +227,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -251,7 +251,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -261,7 +261,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -275,7 +275,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -366,7 +366,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  @@ -375,7 +375,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/localhost/test</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%/localhost/test</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -385,7 +385,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/localhost/test</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%/localhost/test</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -399,7 +399,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -501,7 +501,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  @@ -510,7 +510,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -520,7 +520,7 @@
                                                                                
</D:ace>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -619,7 +619,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                <D:multistatus xmlns:D="DAV:">
                                        <D:response>
                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  @@ -628,7 +628,7 @@
                                                                <D:acl>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -638,7 +638,7 @@
                                                                        </D:ace>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  @@ -652,7 +652,7 @@
                                                                        </D:ace>
                                                                        <D:ace>
                                                                                
<D:principal>
  -                                                                                    
 <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
 <D:href>%globalVariableUserPath%</D:href>
                                                                                
</D:principal>
                                                                                
<D:grant>
                                                                                       
 <D:privilege>
  
  
  
  1.2       +4 -4      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadForHalfDirectorySearch.xml
  
  Index: denyReadForHalfDirectorySearch.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadForHalfDirectorySearch.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- denyReadForHalfDirectorySearch.xml        12 Jul 2002 09:22:03 -0000      1.1
  +++ denyReadForHalfDirectorySearch.xml        31 Jul 2002 12:53:14 -0000      1.2
  @@ -230,7 +230,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
  @@ -239,7 +239,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  @@ -494,7 +494,7 @@
        
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                     <body 
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                     <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
  @@ -503,7 +503,7 @@
                                                                        <D:acl>
                                                                                <D:ace>
                                                                                       
 <D:principal>
  -                                                                                    
         <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +                                                                                    
         <D:href>%globalVariableUserPath%</D:href>
                                                                                       
 </D:principal>
                                                                                       
 <D:grant>
                                                                                       
         <D:privilege>
  
  
  

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

Reply via email to