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 wa...@apache.org on 2002/08/06 12:24:38 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL grantReadForDirectoryAndFilesSearch.xml
wam 2002/08/06 03:24:37
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/select/ACL
grantReadForDirectoryAndFilesSearch.xml
Log:
bugfix: adjusted expected results (globalVariableRootUserPath)
Revision Changes Path
1.5 +237 -319 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grantReadForDirectoryAndFilesSearch.xml 31 Jul 2002 12:53:14 -0000 1.4
+++ grantReadForDirectoryAndFilesSearch.xml 6 Aug 2002 10:24:36 -0000 1.5
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
+<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
-
- <specification>
- <abstract> Read access is granted to user %user% on a collection and a resource.
+ <specification>
+ <abstract> Read access is granted to user %user% on a collection and a resource.
User %user% then Searches both the collection and the resource.
</abstract>
-
- <description>
+ <description>
1) MKCol to create a test collection.
2) PUT resource to test collection.
3) ACL command to grant read privileges to user %user% on the collection.
@@ -27,65 +24,47 @@
13) return ACL privileges back to normal.
14) Delete created resource.
</description>
-
- <expectedResult> The Search should return a 409 Forbidden error. </expectedResult>
- </specification>
-
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
-
-
- <step>
- <request>
- <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
-
- <header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
-
-
-
- <step>
- <user varUsage="user">2%user%</user>
- <password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <expectedResult> The Search should return a 409 Forbidden error. </expectedResult>
+ </specification>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> MKCOL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Wed, 21 Feb 2001 12:55:57 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="host,user"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -95,22 +74,20 @@
<D:privilege><D:read/></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
- <step>
- <user varUsage="user">2%user%</user>
- <password varUsage="user">2%user%</password>
- <request>
- <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" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <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" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -120,38 +97,32 @@
<D:privilege><D:read/></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
- </step>
-
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:displayname />
<D:test/>
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -183,32 +154,28 @@
<D:status>HTTP/1.1 404 Not Found</D:status>
</D:propstat>
</D:response>
- </D:multistatus>]]>
- </body>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ </D:multistatus>]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -230,7 +197,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>%globalVariableUserPath%</D:href>
+ <D:href>%globalVariableRootUserPath%</D:href>
</D:principal>
<D:grant>
<D:privilege>
@@ -284,7 +251,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>%globalVariableUserPath%</D:href>
+ <D:href>%globalVariableRootUserPath%</D:href>
</D:principal>
<D:grant>
<D:privilege>
@@ -302,38 +269,29 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:displayname />
<D:test/>
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -351,31 +309,28 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Content-Type: text/xml</header>
- <header>Translate: f</header>
- <header>Depth: 1</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- <body><![CDATA[<?xml version="1.0" ?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test/acl_dasl.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Content-Type: text/xml</header>
+ <header>Translate: f</header>
+ <header>Depth: 1</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body><![CDATA[<?xml version="1.0" ?>
<D:propfind xmlns:D="DAV:">
<D:prop>
<D:acl />
</D:prop>
- </D:propfind>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ </D:propfind>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -414,7 +369,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>%globalVariableUserPath%</D:href>
+ <D:href>%globalVariableRootUserPath%</D:href>
</D:principal>
<D:grant>
<D:privilege>
@@ -432,20 +387,13 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -462,13 +410,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -486,15 +432,13 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -510,13 +454,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -538,7 +480,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>%globalVariableUserPath%</D:href>
+ <D:href>%globalVariableRootUserPath%</D:href>
</D:principal>
<D:grant>
<D:privilege>
@@ -556,16 +498,13 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -582,13 +521,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -606,16 +543,13 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
@@ -631,13 +565,11 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableUserPath,globalVariableServerName,user,host,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <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>
@@ -676,7 +608,7 @@
</D:ace>
<D:ace>
<D:principal>
- <D:href>%globalVariableUserPath%</D:href>
+ <D:href>%globalVariableRootUserPath%</D:href>
</D:principal>
<D:grant>
<D:privilege>
@@ -694,24 +626,18 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </body>
- </response>
- </step>
-
-
-
-
-
- <cleanup>
- <step>
- <user varUsage="user">2%user%</user>
- <password varUsage="user">2%user%</password>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Content-Type: text/xml; charset=utf-8</header>
- <header>User-Agent: Jakarta HTTP Client/1.0</header>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">ACL /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Content-Type: text/xml; charset=utf-8</header>
+ <header>User-Agent: Jakarta HTTP Client/1.0</header>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -721,23 +647,20 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
-
- </step>
-
- <step>
- <user varUsage="user">2%user%</user>
- <password varUsage="user">2%user%</password>
- <request>
- <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="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <user varUsage="user">2%user%</user>
+ <password varUsage="user">2%user%</password>
+ <request>
+ <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="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:acl xmlns:D="DAV:">
<D:ace>
<D:principal>
@@ -747,32 +670,27 @@
<D:privilege><D:all /></D:privilege>
</D:grant>
</D:ace>
- </D:acl>]]>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- </response>
-
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- </cleanup>
-
-</test>
\ No newline at end of file
+ </D:acl>]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
+</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>