juergen 2002/11/07 04:47:36
Modified:
testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLPrecondition
ACE-ConflictGrantReadDenyAll.xml
Log:
Changed due to semantic changes (kaz)
Revision Changes Path
1.7 +27 -25
jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLPrecondition/ACE-ConflictGrantReadDenyAll.xml
Index: ACE-ConflictGrantReadDenyAll.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/AccessControlMethods/ACLPrecondition/ACE-ConflictGrantReadDenyAll.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ACE-ConflictGrantReadDenyAll.xml 24 Sep 2002 11:34:24 -0000 1.6
+++ ACE-ConflictGrantReadDenyAll.xml 7 Nov 2002 12:47:36 -0000 1.7
@@ -18,14 +18,7 @@
<body
varUsage="globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[
<D:acl xmlns:D="DAV:">
- <D:ace>
- <D:principal>
- <D:href>%globalVariableUserPath%</D:href>
- </D:principal>
- <D:grant>
- <D:privilege><D:read /></D:privilege>
- </D:grant>
- </D:ace>
+
<D:ace>
<D:principal>
@@ -35,6 +28,15 @@
<D:privilege><D:all /></D:privilege>
</D:deny>
</D:ace>
+
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableUserPath%</D:href>
+ </D:principal>
+ <D:grant>
+ <D:privilege><D:read /></D:privilege>
+ </D:grant>
+ </D:ace>
</D:acl>]]></body>
</request>
@@ -52,7 +54,7 @@
<body fileReference="../../../../contentDirectory/html.html"/>
</request>
<response>
- <command>HTTP/1.0 201 Created</command>
+ <command>HTTP/1.0 403 Forbidden</command>
<header>Date: Wed, 14 Mar 2001 15:45:51 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>
@@ -69,7 +71,7 @@
</request>
<response>
<command>HTTP/1.0 403 Forbidden</command>
- <header>Content-Type: text/html</header>
+ <header>Content-Type: text/html;charset=ISO-8859-1</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>
@@ -90,20 +92,20 @@
</response>
</step>
<step>
- <request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/test.html 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: Mon, 19 Mar 2001 16:49:09 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>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/test.html 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 404 Not Found</command>
+ <header>Date: Mon, 19 Mar 2001 16:49:09
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: <mailto:slide-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:slide-dev-help@;jakarta.apache.org>
