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

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL denyReadACLSearch.xml denyReadForHalfDirectorySearch.xml denyReadSearch.xml grantReadACLForDirectoryAndFilesSearch.xml grantReadACLSearchForACL.xml grantReadForDirectoryAndFilesSearch.xml

juergen     2002/08/09 05:43:01

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV
                        checkOutSearch.xml versionControlSearch.xml
               testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL
                        denyReadACLSearch.xml
                        denyReadForHalfDirectorySearch.xml
                        denyReadSearch.xml
                        grantReadACLForDirectoryAndFilesSearch.xml
                        grantReadACLSearchForACL.xml
                        grantReadForDirectoryAndFilesSearch.xml
  Log:
  fixed some varUsage definitions
  
  Revision  Changes    Path
  1.4       +6 -6      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/checkOutSearch.xml
  
  Index: checkOutSearch.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/checkOutSearch.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- checkOutSearch.xml	2 Aug 2002 13:09:11 -0000	1.3
  +++ checkOutSearch.xml	9 Aug 2002 12:43:00 -0000	1.4
  @@ -76,7 +76,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
  -    		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +    		 					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
       		 						<D:propstat>
       		 							<D:prop>
       		 								<D:getcontentlength>*</D:getcontentlength>
  @@ -113,7 +113,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourcecheckout" varPath="multistatus/response/propstat/prop/checked-out/href"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:multistatus xmlns:D="DAV:">
   							<D:response>
  -							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +							<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   								<D:propstat>
   									<D:prop>
   										<D:checked-out>
  @@ -152,7 +152,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourcepredecessorset" varPath="multistatus/response/propstat/prop/predecessor-set/href"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:multistatus xmlns:D="DAV:">
   							<D:response>
  -							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +							<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   								<D:propstat>
   									<D:prop>
   										<D:predecessor-set>
  @@ -191,7 +191,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourceversionhistory" varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<D:multistatus xmlns:D="DAV:">
   								<D:response>
  -								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   									<D:propstat>
   										<D:prop>
   											<D:version-history>
  @@ -231,7 +231,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,testresourcecheckout,testresourcepredecessorset,testresourceversionhistory"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:multistatus xmlns:D="DAV:">
   							<D:response>
  -							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +							<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   								<D:propstat>
   									<D:prop>
   										<D:supportedlock>
  @@ -253,7 +253,7 @@
   											</D:lockentry>
   										</D:supportedlock>
   										<D:owner>
  -											<D:href>%globalVariableServerName%/administration/security/users/</D:href>
  +											<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
   										</D:owner>
   										<D:source />
   										<D:current-user-privilege-set />
  
  
  
  1.4       +5 -5      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/versionControlSearch.xml
  
  Index: versionControlSearch.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DELTAV/versionControlSearch.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- versionControlSearch.xml	2 Aug 2002 13:09:12 -0000	1.3
  +++ versionControlSearch.xml	9 Aug 2002 12:43:00 -0000	1.4
  @@ -63,7 +63,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourcecontentlength" varPath="multistatus/response/propstat/prop/getcontentlength"><![CDATA[
       		 			<D:multistatus xmlns:D="DAV:">
       		 				<D:response>
  -    		 					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +    		 					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
       		 						<D:propstat>
       		 							<D:prop>
       		 								<D:getcontentlength>*</D:getcontentlength>
  @@ -100,7 +100,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourcecheckin" varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   					<D:multistatus xmlns:D="DAV:">
   						<D:response>
  -						<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +						<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   							<D:propstat>
   								<D:prop>
   									<D:checked-in>
  @@ -141,7 +141,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName" varDefinition="testresourceversionhistory" varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<D:multistatus xmlns:D="DAV:">
   								<D:response>
  -								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   									<D:propstat>
   										<D:prop>
   											<D:version-history>
  @@ -181,7 +181,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength,testresourcecheckin,testresourceversionhistory"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   						<D:multistatus xmlns:D="DAV:">
   							<D:response>
  -							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
  +							<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
   								<D:propstat>
   									<D:prop>
   										<D:supportedlock>
  @@ -203,7 +203,7 @@
   											</D:lockentry>
   										</D:supportedlock>
   										<D:owner>
  -											<D:href>%globalVariableServerName%/administration/security/users/</D:href>
  +											<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
   										</D:owner>
   										<D:comment />
   										<D:modCount>*</D:modCount>
  
  
  
  1.7       +5 -5      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadACLSearch.xml
  
  Index: denyReadACLSearch.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadACLSearch.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- denyReadACLSearch.xml	9 Aug 2002 10:35:53 -0000	1.6
  +++ denyReadACLSearch.xml	9 Aug 2002 12:43:00 -0000	1.7
  @@ -35,11 +35,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:deny>
                  							<D:privilege><D:read-acl/></D:privilege>
  @@ -100,7 +100,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>	
               <D:multistatus xmlns:D="DAV:">
                 <D:response>
  -                <D:href>/%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml</D:href>
  +                <D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml</D:href>
                   <D:propstat>
                     <D:prop>
                       <D:displayname>acl_dasl.xml</D:displayname>
  @@ -115,7 +115,7 @@
                   </D:propstat>
                 </D:response>
                 <D:response>
  -                <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
  +                <D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%</D:href>
                   <D:propstat>
                     <D:prop>
                       <D:displayname>%globalVariableCollection%</D:displayname>
  @@ -160,7 +160,7 @@
         <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>	
                               <D:multistatus xmlns:D="DAV:">                               
                                 <D:response>
  -                                <D:href>/%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml</D:href>
  +                                <D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml</D:href>
                                   <D:propstat>
                                     <D:prop>
                                       <D:displayname>acl_dasl.xml</D:displayname>
  
  
  
  1.8       +13 -13    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- denyReadForHalfDirectorySearch.xml	9 Aug 2002 10:35:53 -0000	1.7
  +++ denyReadForHalfDirectorySearch.xml	9 Aug 2002 12:43:00 -0000	1.8
  @@ -119,11 +119,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2 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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:deny>
                  							<D:privilege><D:read/></D:privilege>
  @@ -157,7 +157,7 @@
         <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   					<D:multistatus xmlns:D="DAV:">
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>level1</D:displayname>
  @@ -344,7 +344,7 @@
         <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
      					<D:multistatus xmlns:D="DAV:">
      						<D:response>
  -   							<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
  +   							<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
      								<propstat xmlns="DAV:">
      									<prop>
      										<displayname>level1</displayname>
  @@ -388,13 +388,13 @@
         <body varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection,globalVariableRootUserPath"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
      					<D:multistatus xmlns:D="DAV:">
      						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/level1</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -403,7 +403,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -444,7 +444,7 @@
                 <D:response>
                   <D:href>/taminowebdavserver</D:href>
                   <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                <D:responsedescription   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                 </D:response>
               </D:multistatus>	
      		]]></body>
  @@ -478,7 +478,7 @@
                 <D:response>
                   <D:href>/taminowebdavserver</D:href>
                   <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                <D:responsedescription   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                 </D:response>
               </D:multistatus>	
      		]]></body>
  @@ -513,7 +513,7 @@
                 <D:response>
                   <D:href>/taminowebdavserver</D:href>
                   <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                <D:responsedescription   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                 </D:response>
               </D:multistatus>	
      		]]></body>
  @@ -547,7 +547,7 @@
                 <D:response>
                   <D:href>/taminowebdavserver</D:href>
                   <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                <D:responsedescription   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3 by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                 </D:response>
               </D:multistatus>	
      		]]></body>
  @@ -582,7 +582,7 @@
                 <D:response>
                   <D:href>/taminowebdavserver</D:href>
                   <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                <D:responsedescription  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                 </D:response>
               </D:multistatus>	
      		]]></body>
  @@ -616,7 +616,7 @@
                 <D:response>
                   <D:href>/taminowebdavserver</D:href>
                   <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                <D:responsedescription  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/test/level1/level2/level3/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                 </D:response>
               </D:multistatus>	
      		]]></body>
  
  
  
  1.5       +3 -3      jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadSearch.xml
  
  Index: denyReadSearch.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL/denyReadSearch.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- denyReadSearch.xml	9 Aug 2002 10:35:53 -0000	1.4
  +++ denyReadSearch.xml	9 Aug 2002 12:43:00 -0000	1.5
  @@ -35,11 +35,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:deny>
                  							<D:privilege><D:read/></D:privilege>
  @@ -100,7 +100,7 @@
                     <D:response>
                       <D:href>/taminowebdavserver</D:href>
                       <D:status>HTTP/1.1 403 Forbidden</D:status>
  -                    <D:responsedescription>Access denied on /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
  +                    <D:responsedescription  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">Access denied on /%globalVariableServerName%/%globalVariableCollection%/acl_dasl.xml by user %globalVariableUserPath% for action /%globalVariableServerName%/administration/security/actions/read</D:responsedescription>
                     </D:response>
                   </D:multistatus>	
          		]]></body>
  
  
  
  1.5       +27 -27    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- grantReadACLForDirectoryAndFilesSearch.xml	9 Aug 2002 10:35:53 -0000	1.4
  +++ grantReadACLForDirectoryAndFilesSearch.xml	9 Aug 2002 12:43:00 -0000	1.5
  @@ -64,11 +64,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
         <header>Content-Type: text/xml; charset=utf-8</header>
         <header>User-Agent: Jakarta HTTP Client/1.0</header>
  -      <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:grant>
                  							<D:privilege><D:read-acl/></D:privilege>
  @@ -87,11 +87,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:grant>
                  							<D:privilege><D:read-acl/></D:privilege>
  @@ -125,7 +125,7 @@
         <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   					<D:multistatus xmlns:D="DAV:">
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>test</D:displayname>
  @@ -140,7 +140,7 @@
           						</D:propstat>
       						</D:response>
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>acl_dasl.xml</D:displayname>
  @@ -178,7 +178,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -194,7 +194,7 @@
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -203,7 +203,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -212,7 +212,7 @@
           						</D:propstat>
       						</D:response>
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -237,12 +237,12 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           								</D:inherited>
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -251,7 +251,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -285,7 +285,7 @@
         <body varUsage="globalVariableServerName,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>acl_dasl.xml</D:displayname>
  @@ -324,7 +324,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -349,12 +349,12 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           								</D:inherited>
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -363,7 +363,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -402,7 +402,7 @@
         <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
      					<D:multistatus xmlns:D="DAV:">
      						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>test</D:displayname>
  @@ -446,7 +446,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -462,7 +462,7 @@
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -471,7 +471,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>	
  @@ -510,7 +510,7 @@
         <body varUsage="globalVariableServerName,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>
  +        				<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           					<D:propstat>
               						<D:prop>
                   						<D:displayname>acl_dasl.xml</D:displayname>
  @@ -554,7 +554,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        				<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           					<D:propstat>
               						<D:prop>
                   						<D:acl>
  @@ -579,12 +579,12 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>	
  -                            								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           							</D:inherited>
                       							</D:ace>
                      							<D:ace>
                           							<D:principal>
  -                            								<D:href>%globalVariableRootUserPath%</D:href>
  +                            								<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           							</D:principal>
                           							<D:grant>
                               								<D:privilege>
  @@ -593,7 +593,7 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>
  -                            								<D:href>/%globalVariableServerName%/</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           							</D:inherited>
                       							</D:ace>
                   						</D:acl>
  
  
  
  1.5       +22 -22    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- grantReadACLSearchForACL.xml	9 Aug 2002 10:35:53 -0000	1.4
  +++ grantReadACLSearchForACL.xml	9 Aug 2002 12:43:00 -0000	1.5
  @@ -60,11 +60,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
         <header>Content-Type: text/xml; charset=utf-8</header>
         <header>User-Agent: Jakarta HTTP Client/1.0</header>
  -      <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:grant>
                  							<D:privilege><D:read-acl/></D:privilege>
  @@ -83,11 +83,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:grant>
                  							<D:privilege><D:read-acl/></D:privilege>
  @@ -120,7 +120,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -136,7 +136,7 @@
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -145,7 +145,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -154,7 +154,7 @@
           						</D:propstat>
       						</D:response>
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -179,12 +179,12 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           								</D:inherited>
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -193,7 +193,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -226,7 +226,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -251,12 +251,12 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           								</D:inherited>
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -265,7 +265,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -303,7 +303,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -319,7 +319,7 @@
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -328,7 +328,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>	
  @@ -366,7 +366,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        				<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           					<D:propstat>
               						<D:prop>
                   						<D:acl>
  @@ -391,12 +391,12 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>	
  -                            								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           							</D:inherited>
                       							</D:ace>
                      							<D:ace>
                           							<D:principal>
  -                            								<D:href>%globalVariableRootUserPath%</D:href>
  +                            								<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           							</D:principal>
                           							<D:grant>
                               								<D:privilege>
  @@ -405,7 +405,7 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>
  -                            								<D:href>/%globalVariableServerName%/</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           							</D:inherited>
                       							</D:ace>
                   						</D:acl>
  
  
  
  1.7       +27 -27    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- grantReadForDirectoryAndFilesSearch.xml	9 Aug 2002 10:35:53 -0000	1.6
  +++ grantReadForDirectoryAndFilesSearch.xml	9 Aug 2002 12:43:00 -0000	1.7
  @@ -64,11 +64,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
         <header>Content-Type: text/xml; charset=utf-8</header>
         <header>User-Agent: Jakarta HTTP Client/1.0</header>
  -      <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:grant>
                  							<D:privilege><D:read/></D:privilege>
  @@ -87,11 +87,11 @@
         <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.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"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
  +      <body  varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
         					<D:acl xmlns:D="DAV:">
            					<D:ace>
               						<D:principal>
  -               							<D:href>/administration/security/users/%host%/%user%</D:href>
  +               							<D:href>%globalVariableUserPath%</D:href>
               						</D:principal>
               						<D:grant>
                  							<D:privilege><D:read/></D:privilege>
  @@ -125,7 +125,7 @@
         <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   					<D:multistatus xmlns:D="DAV:">
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>test</D:displayname>
  @@ -140,7 +140,7 @@
           						</D:propstat>
       						</D:response>
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>acl_dasl.xml</D:displayname>
  @@ -178,7 +178,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -197,7 +197,7 @@
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -206,7 +206,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -215,7 +215,7 @@
           						</D:propstat>
       						</D:response>
       						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -246,12 +246,12 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           								</D:inherited>
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -260,7 +260,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -294,7 +294,7 @@
         <body varUsage="globalVariableServerName,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>acl_dasl.xml</D:displayname>
  @@ -333,7 +333,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -364,12 +364,12 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           								</D:inherited>
                       								</D:ace>
                       								<D:ace>
                           							<D:principal>
  -                            								<D:href>%globalVariableRootUserPath%</D:href>
  +                            								<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           							</D:principal>
                           							<D:grant>
                               								<D:privilege>
  @@ -378,7 +378,7 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>
  -                            								<D:href>/%globalVariableServerName%/</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           							</D:inherited>
                       							</D:ace>
                   						</D:acl>
  @@ -417,7 +417,7 @@
         <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
      					<D:multistatus xmlns:D="DAV:">
      						<D:response>
  -        					<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:displayname>test</D:displayname>
  @@ -461,7 +461,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        					<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
           						<D:propstat>
               							<D:prop>
                   							<D:acl>
  @@ -480,7 +480,7 @@
                       								</D:ace>
                       								<D:ace>
                           								<D:principal>
  -                            									<D:href>%globalVariableRootUserPath%</D:href>
  +                            									<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           								</D:principal>
                           								<D:grant>
                               									<D:privilege>
  @@ -489,7 +489,7 @@
                           								</D:grant>
                           								<D:protected />
                           								<D:inherited>
  -                            									<D:href>/%globalVariableServerName%/</D:href>
  +                            									<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           								</D:inherited>
                       								</D:ace>
                   							</D:acl>
  @@ -528,7 +528,7 @@
         <body varUsage="globalVariableServerName,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>
  +        				<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           					<D:propstat>
               						<D:prop>
                   						<D:displayname>acl_dasl.xml</D:displayname>
  @@ -572,7 +572,7 @@
         <body varUsage="globalVariableRootUserPath,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>
  +        				<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml</D:href>
           					<D:propstat>
               						<D:prop>
                   						<D:acl>
  @@ -603,12 +603,12 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>
  -                            								<D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
                           							</D:inherited>
                       							</D:ace>
                       							<D:ace>
                           							<D:principal>
  -                            								<D:href>%globalVariableRootUserPath%</D:href>
  +                            								<D:href   varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">%globalVariableRootUserPath%</D:href>
                           							</D:principal>
                           							<D:grant>
                               								<D:privilege>
  @@ -617,7 +617,7 @@
                           							</D:grant>
                           							<D:protected />
                           							<D:inherited>
  -                            								<D:href>/%globalVariableServerName%/</D:href>
  +                            								<D:href varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host">/%globalVariableServerName%/</D:href>
                           							</D:inherited>
                       							</D:ace>
                   						</D:acl>
  
  
  

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