juergen     2002/07/31 05:53:03

  Modified:    
testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Deny
                        readACL_Single_Resource_Large_Tree.xml
                        readACL_Single_Resource.xml
               
testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Grant
                        readACL_Single_Resource_Large_Tree.xml
                        readACL_Single_Resource.xml
               
testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Deny
                        readACL_Identical_Resource_Large_Tree.xml
                        readACL_Identical_Resource.xml
               
testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Grant
                        readACL_Identical_Resource_Large_Tree.xml
                        readACL_Identical_Resource.xml
               
testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties
                        PropPatch-principal-collection-set.xml
                        PropPatch-Owner.xml PropPatch-ACL.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/propfind
                        propfindAclAllR.xml propfindAclAllC.xml
               
testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties
                        PropFind-Principal-collection-set.xml
                        PropFind-Owner.xml PropFind-ACL.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/Report
                        ACLPrincipalPropSetResourcetypeReport.xml
                        ACLPrincipalPropSetDisplaynameReport.xml
                        ACLPrincipalMatchPrincipal-PropertySelfReport.xml
                        ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
               testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write
                        ACLdenyWriteInheritance3Proppatch3LockColColFile.xml
                        ACLdenyWriteInheritance2Proppatch2LockColFile.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.2       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Deny/readACL_Single_Resource_Large_Tree.xml
  
  Index: readACL_Single_Resource_Large_Tree.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Deny/readACL_Single_Resource_Large_Tree.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Single_Resource_Large_Tree.xml    11 Jul 2002 11:16:05 -0000      1.1
  +++ readACL_Single_Resource_Large_Tree.xml    31 Jul 2002 12:53:02 -0000      1.2
  @@ -188,7 +188,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/level1/level2/level3/test.xml</D:href>
  @@ -197,7 +197,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>
  @@ -211,7 +211,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>
  @@ -353,7 +353,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,userNumber"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                                <D:multistatus xmlns:D="DAV:">
                                                        <D:response>
                                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/level1/level2/level3/test.xml</D:href>
  @@ -376,7 +376,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Deny/readACL_Single_Resource.xml
  
  Index: readACL_Single_Resource.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Deny/readACL_Single_Resource.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Single_Resource.xml       11 Jul 2002 10:01:39 -0000      1.1
  +++ readACL_Single_Resource.xml       31 Jul 2002 12:53:02 -0000      1.2
  @@ -133,7 +133,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,userNumber,host,user"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/test.xml</D:href>
  @@ -142,7 +142,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>
  @@ -152,7 +152,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>
  @@ -297,7 +297,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/test.xml</D:href>
  @@ -316,7 +316,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Grant/readACL_Single_Resource_Large_Tree.xml
  
  Index: readACL_Single_Resource_Large_Tree.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Grant/readACL_Single_Resource_Large_Tree.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Single_Resource_Large_Tree.xml    10 Jul 2002 15:23:13 -0000      1.1
  +++ readACL_Single_Resource_Large_Tree.xml    31 Jul 2002 12:53:02 -0000      1.2
  @@ -249,7 +249,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/level1/level2/level3/test.xml</D:href>
  @@ -258,7 +258,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>
  @@ -272,7 +272,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>
  @@ -355,7 +355,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,userNumber"><![CDATA[<?xml 
version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                                <D:multistatus xmlns:D="DAV:">
                                                        <D:response>
                                                        
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/level1/level2/level3/test.xml</D:href>
  @@ -378,7 +378,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Grant/readACL_Single_Resource.xml
  
  Index: readACL_Single_Resource.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/DifferentCollections/Grant/readACL_Single_Resource.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Single_Resource.xml       10 Jul 2002 14:50:12 -0000      1.1
  +++ readACL_Single_Resource.xml       31 Jul 2002 12:53:02 -0000      1.2
  @@ -199,7 +199,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,userNumber,host,user"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/test.xml</D:href>
  @@ -208,7 +208,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>
  @@ -218,7 +218,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>
  @@ -310,7 +310,7 @@
                </request>
                <response>
                        <command>HTTP/1.0 207 Multi-Status</command>
  -                             <body 
varUsage="globalVariableServerName,globalVariableCollection,host,user,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
  +                             <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,userNumber"><![CDATA[<?xml
 version="1.0" encoding="UTF-8"?>
                                        <D:multistatus xmlns:D="DAV:">
                                                <D:response>
                                                
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/user%userNumber%/test.xml</D:href>
  @@ -329,7 +329,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Deny/readACL_Identical_Resource_Large_Tree.xml
  
  Index: readACL_Identical_Resource_Large_Tree.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Deny/readACL_Identical_Resource_Large_Tree.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Identical_Resource_Large_Tree.xml 11 Jul 2002 09:46:47 -0000      1.1
  +++ readACL_Identical_Resource_Large_Tree.xml 31 Jul 2002 12:53:02 -0000      1.2
  @@ -159,7 +159,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/level1/level2/level3/test.xml</D:href>
  @@ -168,7 +168,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>
  @@ -182,7 +182,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>
  @@ -326,7 +326,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/level2/level3/test.xml</D:href>
  @@ -349,7 +349,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Deny/readACL_Identical_Resource.xml
  
  Index: readACL_Identical_Resource.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Deny/readACL_Identical_Resource.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Identical_Resource.xml    11 Jul 2002 08:40:17 -0000      1.1
  +++ readACL_Identical_Resource.xml    31 Jul 2002 12:53:02 -0000      1.2
  @@ -88,7 +88,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.xml</D:href>
  @@ -97,7 +97,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>
  @@ -107,7 +107,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>
  @@ -257,7 +257,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.xml</D:href>
  @@ -276,7 +276,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Grant/readACL_Identical_Resource_Large_Tree.xml
  
  Index: readACL_Identical_Resource_Large_Tree.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Grant/readACL_Identical_Resource_Large_Tree.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Identical_Resource_Large_Tree.xml 10 Jul 2002 14:07:08 -0000      1.1
  +++ readACL_Identical_Resource_Large_Tree.xml 31 Jul 2002 12:53:02 -0000      1.2
  @@ -218,7 +218,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/level1/level2/level3/test.xml</D:href>
  @@ -227,7 +227,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>
  @@ -241,7 +241,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>
  @@ -326,7 +326,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/level2/level3/test.xml</D:href>
  @@ -349,7 +349,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       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Grant/readACL_Identical_Resource.xml
  
  Index: readACL_Identical_Resource.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/multi-user/IdenticalResources/Grant/readACL_Identical_Resource.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- readACL_Identical_Resource.xml    10 Jul 2002 12:09:54 -0000      1.1
  +++ readACL_Identical_Resource.xml    31 Jul 2002 12:53:02 -0000      1.2
  @@ -146,7 +146,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.xml</D:href>
  @@ -155,7 +155,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>
  @@ -165,7 +165,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>
  @@ -247,7 +247,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.xml</D:href>
  @@ -266,7 +266,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.3       +4 -4      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties/PropPatch-principal-collection-set.xml
  
  Index: PropPatch-principal-collection-set.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties/PropPatch-principal-collection-set.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropPatch-principal-collection-set.xml    4 Jul 2002 11:51:22 -0000       1.2
  +++ PropPatch-principal-collection-set.xml    31 Jul 2002 12:53:03 -0000      1.3
  @@ -19,11 +19,11 @@
      <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/ HTTP/1.1</command>
      <header>Content-Type: text/xml; charset=utf-8</header>  
      <header>User-Agent: Jakarta HTTP Client/1.0</header>
  -   <body 
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
      <D:propertyupdate xmlns:D="DAV:">
         <D:set>
         <D:prop>
  -         
<D:principal-collection-set>/%globalVariableServerName%/administration/security/users/test</D:principal-collection-set>
  +         
<D:principal-collection-set>%globalVariableUserPath%/test</D:principal-collection-set>
          </D:prop>
         </D:set>
       </D:propertyupdate>]]>
  @@ -64,14 +64,14 @@
     <response>
      <command>HTTP/1.0 207 Multi Status</command>
      <header>Content-Type: text/xml; charset=utf-8</header>
  -   <body 
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,userNumber,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
   <D:multistatus xmlns:D="DAV:">
     <D:response>
       <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
       <D:propstat>
         <D:prop>
           <D:principal-collection-set>
  -          <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +          <D:href>%globalVariableUserPath%</D:href>
           </D:principal-collection-set>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
  
  
  
  1.3       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties/PropPatch-Owner.xml
  
  Index: PropPatch-Owner.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties/PropPatch-Owner.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropPatch-Owner.xml       4 Jul 2002 11:51:22 -0000       1.2
  +++ PropPatch-Owner.xml       31 Jul 2002 12:53:03 -0000      1.3
  @@ -64,14 +64,14 @@
     <response>
      <command>HTTP/1.0 207 Multi Status</command>
      <header>Content-Type: text/xml; charset=utf-8</header>
  -   <body 
varUsage="globalVariableCollection,user,host,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
      <D:multistatus xmlns:D="DAV:">
     <D:response>
       <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
       <D:propstat>
         <D:prop>
           <D:owner>
  -          
<D:href>%globalVariableServerName%/%globalVariableServerName%/administration/security/users/administration/security/users/%host%/%user%</D:href>
  +          
<D:href>%globalVariableServerName%%globalVariableUserPath%/administration/security/users/%host%/%user%</D:href>
           </D:owner>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
  
  
  
  1.3       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties/PropPatch-ACL.xml
  
  Index: PropPatch-ACL.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/ProtectedProperties/PropPatch-ACL.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropPatch-ACL.xml 4 Jul 2002 11:51:22 -0000       1.2
  +++ PropPatch-ACL.xml 31 Jul 2002 12:53:03 -0000      1.3
  @@ -64,7 +64,7 @@
     <response>
      <command>HTTP/1.0 207 Multi Status</command>
      <header>Content-Type: text/xml; charset=utf-8</header>
  -   <body 
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,userNumber,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
   <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%</href>
  @@ -83,7 +83,7 @@
             </ace>
             <ace>
               <principal>
  -              <href>/%globalVariableServerName%/administration/security/users</href>
  +              <href>%globalVariableUserPath%</href>
               </principal>
               <grant>
                 <privilege>
  
  
  
  1.2       +2 -2      
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- propfindAclAllR.xml       24 Jun 2002 11:24:41 -0000      1.1
  +++ propfindAclAllR.xml       31 Jul 2002 12:53:03 -0000      1.2
  @@ -39,7 +39,7 @@
              <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="globalVariableServerName">
  +              <body 
varUsage="globalVariableUserPath,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;
  @@ -49,7 +49,7 @@
              &lt;acl&gt;
              &lt;ace&gt;
              &lt;principal&gt;
  -           
&lt;href&gt;/%globalVariableServerName%/administration/security/users&lt;/href&gt;
  +           &lt;href&gt;%globalVariableUserPath%&lt;/href&gt;
              &lt;/principal&gt;
              &lt;grant&gt;
              &lt;privilege&gt;&lt;all/&gt;&lt;/privilege&gt;
  
  
  
  1.3       +2 -2      
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- propfindAclAllC.xml       4 Jul 2002 14:17:10 -0000       1.2
  +++ propfindAclAllC.xml       31 Jul 2002 12:53:03 -0000      1.3
  @@ -39,7 +39,7 @@
              <response>
                 <command>HTTP/1.0 207 Multi-Status</command>
                 <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header> 
  -              <body 
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +              <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host,userNumber,globalVariableServerName"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
              <D:multistatus xmlns:D="DAV:">
         <D:response>
               <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
  @@ -58,7 +58,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       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/PropFind-Principal-collection-set.xml
  
  Index: PropFind-Principal-collection-set.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/PropFind-Principal-collection-set.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropFind-Principal-collection-set.xml     24 Jun 2002 11:23:04 -0000      1.1
  +++ PropFind-Principal-collection-set.xml     31 Jul 2002 12:53:03 -0000      1.2
  @@ -29,14 +29,14 @@
     <response>
      <command>HTTP/1.0 207 Multi Status</command>
      <header>Content-Type: text/xml; charset=utf-8</header>
  -   <body 
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,userNumber,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
   <D:multistatus xmlns:D="DAV:">
     <D:response>
       <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
       <D:propstat>
         <D:prop>
           <D:principal-collection-set>
  -          <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +          <D:href>%globalVariableUserPath%</D:href>
           </D:principal-collection-set>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
  
  
  
  1.3       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/PropFind-Owner.xml
  
  Index: PropFind-Owner.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/PropFind-Owner.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropFind-Owner.xml        4 Jul 2002 11:52:11 -0000       1.2
  +++ PropFind-Owner.xml        31 Jul 2002 12:53:03 -0000      1.3
  @@ -29,14 +29,14 @@
     <response>
      <command>HTTP/1.0 207 Multi Status</command>
      <header>Content-Type: text/xml; charset=utf-8</header>
  -   <body 
varUsage="globalVariableCollection,user,host,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
      <D:multistatus xmlns:D="DAV:">
     <D:response>
       <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
       <D:propstat>
         <D:prop>
           <D:owner>
  -          
<D:href>%globalVariableServerName%/%globalVariableServerName%/administration/security/users/administration/security/users/%host%/%user%</D:href>
  +          <D:href>%globalVariableUserPath%</D:href>
           </D:owner>
         </D:prop>
         <D:status>HTTP/1.1 200 OK</D:status>
  
  
  
  1.2       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/PropFind-ACL.xml
  
  Index: PropFind-ACL.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlProperties/PropFind-ACL.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropFind-ACL.xml  24 Jun 2002 11:23:04 -0000      1.1
  +++ PropFind-ACL.xml  31 Jul 2002 12:53:03 -0000      1.2
  @@ -29,7 +29,7 @@
     <response>
      <command>HTTP/1.0 207 Multi Status</command>
      <header>Content-Type: text/xml; charset=utf-8</header>
  -   <body 
varUsage="globalVariableCollection,userNumber,globalVariableServerName"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableCollection,userNumber,globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml
 version="1.0" encoding="utf-8" ?>
   <multistatus xmlns="DAV:">
     <response>
       <href>/%globalVariableServerName%/%globalVariableCollection%</href>
  @@ -48,7 +48,7 @@
             </ace>
             <ace>
               <principal>
  -              <href>/%globalVariableServerName%/administration/security/users</href>
  +              <href>%globalVariableUserPath%</href>
               </principal>
               <grant>
                 <privilege>
  
  
  
  1.4       +3 -3      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalPropSetResourcetypeReport.xml
  
  Index: ACLPrincipalPropSetResourcetypeReport.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalPropSetResourcetypeReport.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ACLPrincipalPropSetResourcetypeReport.xml 23 Jul 2002 07:45:03 -0000      1.3
  +++ ACLPrincipalPropSetResourcetypeReport.xml 31 Jul 2002 12:53:03 -0000      1.4
  @@ -78,10 +78,10 @@
     </request>
     <response>
       <command>HTTP/1.0 207 Multi-Status</command>
  -    <body varUsage="host,user,globalVariableServerName"><![CDATA[<?xml 
version="1.0"?>
  +    <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0"?>
   <D:multistatus xmlns:D="DAV:">
       <D:response>
  -        <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:propstat>
               <D:prop>
                   <D:resourcetype><D:principal/><D:collection/></D:resourcetype>
  @@ -90,7 +90,7 @@
           </D:propstat>
       </D:response>
       <D:response>
  -        
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:propstat>
               <D:prop>
                <D:resourcetype><D:principal/></D:resourcetype>
  
  
  
  1.4       +3 -3      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalPropSetDisplaynameReport.xml
  
  Index: ACLPrincipalPropSetDisplaynameReport.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalPropSetDisplaynameReport.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ACLPrincipalPropSetDisplaynameReport.xml  23 Jul 2002 07:45:03 -0000      1.3
  +++ ACLPrincipalPropSetDisplaynameReport.xml  31 Jul 2002 12:53:03 -0000      1.4
  @@ -78,10 +78,10 @@
     </request>
     <response>
       <command>HTTP/1.0 207 Multi-Status</command>
  -    <body varUsage="host,user,globalVariableServerName"><![CDATA[<?xml 
version="1.0"?>
  +    <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0"?>
   <D:multistatus xmlns:D="DAV:">
       <D:response>
  -        <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:propstat>
               <D:prop>
                   <D:displayname>D:all</D:displayname>
  @@ -90,7 +90,7 @@
           </D:propstat>
       </D:response>
       <D:response>
  -        
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:propstat>
               <D:prop>
                   <D:displayname>%host%/%user%</D:displayname>
  
  
  
  1.3       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertySelfReport.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfReport.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ACLPrincipalMatchPrincipal-PropertySelfReport.xml 23 Jul 2002 07:45:03 -0000     
 1.2
  +++ ACLPrincipalMatchPrincipal-PropertySelfReport.xml 31 Jul 2002 12:53:03 -0000     
 1.3
  @@ -19,7 +19,7 @@
   <user varUsage="user">%user%</user>
   <password varUsage="user">%user%</password>
     <request>
  -    <command varUsage="globalVariableServerName">REPORT 
/%globalVariableServerName%/administration/security/users HTTP/1.0</command>
  +    <command 
varUsage="globalVariableUserPath,globalVariableServerName,user,host">REPORT 
%globalVariableUserPath% HTTP/1.0</command>
       <header>content-type: text/xml; charset="utf-8"</header>
       <header>content-length: 108</header>
       <header>authorization: Basic dGVzdDp0ZXN0</header>
  @@ -33,19 +33,19 @@
     </request>
     <response>
       <command>HTTP/1.0 207 Multi-Status</command>
  -    <body 
varUsage="host,user,globalVariableServerName,globalVariableCollection"><![CDATA[
  +    <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%/administration/security/users/%host%/%user%</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:status>HTTP/1.1 200 OK</D:status>
       </D:response>
       <D:response>
  -        <D:href>/%globalVariableServerName%/administration/security/users</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:status>HTTP/1.1 200 OK</D:status>
       </D:response>
       <D:response>
  -        
<D:href>/%globalVariableServerName%/administration/security/users/%host%</D:href>
  +        <D:href>%globalVariableUserPath%/%host%</D:href>
           <D:status>HTTP/1.1 200 OK</D:status>
       </D:response>
   </D:multistatus>
  
  
  
  1.4       +5 -5      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
  
  Index: ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Report/ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml     23 Jul 2002 07:45:03 
-0000      1.3
  +++ ACLPrincipalMatchPrincipal-PropertySelfPropReport.xml     31 Jul 2002 12:53:03 
-0000      1.4
  @@ -19,7 +19,7 @@
   <user varUsage="user">%user%</user>
   <password varUsage="user">%user%</password>
     <request>
  -    <command varUsage="globalVariableServerName">REPORT 
/%globalVariableServerName%/administration/security/users HTTP/1.0</command>
  +    <command 
varUsage="globalVariableUserPath,globalVariableServerName,user,host">REPORT 
%globalVariableUserPath% HTTP/1.0</command>
       <header>content-type: text/xml; charset="utf-8"</header>
       <header>content-length: 108</header>
       <header>authorization: Basic dGVzdDp0ZXN0</header>
  @@ -36,11 +36,11 @@
     </request>
     <response>
       <command>HTTP/1.0 207 Multi-Status</command>
  -    <body 
varUsage="host,user,globalVariableServerName,globalVariableCollection"><![CDATA[
  +    <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%/administration/security/users</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:propstat>
           <D:prop>
           <D:displayname>D:all</D:displayname>
  @@ -49,7 +49,7 @@
           </D:propstat>
       </D:response>
       <D:response>
  -        
<D:href>/%globalVariableServerName%/administration/security/users/%host%</D:href>
  +        <D:href>%globalVariableUserPath%/%host%</D:href>
           <D:propstat>
           <D:prop>
           <D:displayname>%host%</D:displayname>
  @@ -58,7 +58,7 @@
           </D:propstat>
       </D:response>
       <D:response>
  -        
<D:href>/%globalVariableServerName%/administration/security/users/%host%/%user%</D:href>
  +        <D:href>%globalVariableUserPath%</D:href>
           <D:propstat>
           <D:prop>
           <D:displayname>%host%/%user%</D:displayname>
  
  
  
  1.3       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteInheritance3Proppatch3LockColColFile.xml
  
  Index: ACLdenyWriteInheritance3Proppatch3LockColColFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteInheritance3Proppatch3LockColColFile.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ACLdenyWriteInheritance3Proppatch3LockColColFile.xml      24 Jun 2002 11:29:15 
-0000      1.2
  +++ ACLdenyWriteInheritance3Proppatch3LockColColFile.xml      31 Jul 2002 12:53:03 
-0000      1.3
  @@ -214,11 +214,11 @@
      <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test/test/test.xml 
HTTP/1.1</command>
      <header>Content-Type: text/xml; charset=utf-8</header>  
      <header>User-Agent: Jakarta HTTP Client/1.0</header>
  -   <body varUsage="host,user,globalVariableServerName"><![CDATA[<?xml version="1.0" 
encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
      <D:propertyupdate xmlns:D="DAV:">
         <D:set>
         <D:prop>
  -         
<D:principal-collection-set>/%globalVariableServerName%/administration/security/users/%user%</D:principal-collection-set>
  +         
<D:principal-collection-set>%globalVariableUserPath%/%user%</D:principal-collection-set>
          </D:prop>
         </D:set>
       </D:propertyupdate>]]>
  
  
  
  1.3       +2 -2      
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteInheritance2Proppatch2LockColFile.xml
  
  Index: ACLdenyWriteInheritance2Proppatch2LockColFile.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteInheritance2Proppatch2LockColFile.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ACLdenyWriteInheritance2Proppatch2LockColFile.xml 24 Jun 2002 11:29:15 -0000     
 1.2
  +++ ACLdenyWriteInheritance2Proppatch2LockColFile.xml 31 Jul 2002 12:53:03 -0000     
 1.3
  @@ -138,11 +138,11 @@
      <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH 
/%globalVariableServerName%/%globalVariableCollection%/test/test.xml HTTP/1.1</command>
      <header>Content-Type: text/xml; charset=utf-8</header>  
      <header>User-Agent: Jakarta HTTP Client/1.0</header>
  -   <body varUsage="host,user,globalVariableServerName"><![CDATA[<?xml version="1.0" 
encoding="utf-8" ?>
  +   <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8" ?>
      <D:propertyupdate xmlns:D="DAV:">
         <D:set>
         <D:prop>
  -         
<D:principal-collection-set>/%globalVariableServerName%/administration/security/users/%user%</D:principal-collection-set>
  +         
<D:principal-collection-set>%globalVariableUserPath%/%user%</D:principal-collection-set>
          </D:prop>
         </D:set>
       </D:propertyupdate>]]>
  
  
  

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

Reply via email to