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/05 17:20:15 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite ACLdenyWriteUnlockColFile.xml ACLgrantReadPropFindColFile.xml
juergen 2002/08/05 08:20:15
Modified: testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write
ACLdenygrantWriteInheritancePRoppatchLockFile.xml
ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml
ACLdenyWriteACLInheritanceACLProppatchLockFile.xml
ACLdenyWriteACLInheritancePutProppatchLockCol.xml
testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite
ACLdenyWriteUnlockColFile.xml
ACLgrantReadPropFindColFile.xml
Log:
added the expected response bodies of lock and propfind.
Revision Changes Path
1.2 +21 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenygrantWriteInheritancePRoppatchLockFile.xml
Index: ACLdenygrantWriteInheritancePRoppatchLockFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenygrantWriteInheritancePRoppatchLockFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenygrantWriteInheritancePRoppatchLockFile.xml 24 Jun 2002 11:24:26 -0000 1.1
+++ ACLdenygrantWriteInheritancePRoppatchLockFile.xml 5 Aug 2002 15:20:15 -0000 1.2
@@ -138,7 +138,27 @@
</request>
<response>
<command>HTTP/1.0 200 OK</command>
- <body/>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <D:prop xmlns:D="DAV:">
+ <D:lockdiscovery>
+ <D:activelock>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:depth>infinity</D:depth>
+ <D:owner>%globalVariableUserPath%</D:owner>
+ <D:timeout>*</D:timeout>
+ <D:locktoken>
+ <D:href>*</D:href>
+ </D:locktoken>
+ </D:activelock>
+ </D:lockdiscovery>
+ </D:prop>
+ ]]>
+ </body>
</response>
</step>
1.2 +42 -2 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml
Index: ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml 24 Jun 2002 11:24:26 -0000 1.1
+++ ACLdenyWriteACLInheritance2Proppatch2LockColColColFile.xml 5 Aug 2002 15:20:15 -0000 1.2
@@ -195,7 +195,27 @@
</request>
<response>
<command>HTTP/1.0 200 OK</command>
- <body/>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <D:prop xmlns:D="DAV:">
+ <D:lockdiscovery>
+ <D:activelock>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:depth>infinity</D:depth>
+ <D:owner>%globalVariableUserPath%</D:owner>
+ <D:timeout>*</D:timeout>
+ <D:locktoken>
+ <D:href>*</D:href>
+ </D:locktoken>
+ </D:activelock>
+ </D:lockdiscovery>
+ </D:prop>
+ ]]>
+ </body>
</response>
</step>
@@ -291,7 +311,27 @@
</request>
<response>
<command>HTTP/1.0 200 OK</command>
- <body/>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <D:prop xmlns:D="DAV:">
+ <D:lockdiscovery>
+ <D:activelock>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:depth>infinity</D:depth>
+ <D:owner>%globalVariableUserPath%</D:owner>
+ <D:timeout>*</D:timeout>
+ <D:locktoken>
+ <D:href>*</D:href>
+ </D:locktoken>
+ </D:activelock>
+ </D:lockdiscovery>
+ </D:prop>
+ ]]>
+ </body>
</response>
</step>
1.2 +21 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritanceACLProppatchLockFile.xml
Index: ACLdenyWriteACLInheritanceACLProppatchLockFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritanceACLProppatchLockFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyWriteACLInheritanceACLProppatchLockFile.xml 24 Jun 2002 11:24:26 -0000 1.1
+++ ACLdenyWriteACLInheritanceACLProppatchLockFile.xml 5 Aug 2002 15:20:15 -0000 1.2
@@ -136,7 +136,27 @@
</request>
<response>
<command>HTTP/1.0 200 OK</command>
- <body/>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <D:prop xmlns:D="DAV:">
+ <D:lockdiscovery>
+ <D:activelock>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:depth>infinity</D:depth>
+ <D:owner>%globalVariableUserPath%</D:owner>
+ <D:timeout>*</D:timeout>
+ <D:locktoken>
+ <D:href>*</D:href>
+ </D:locktoken>
+ </D:activelock>
+ </D:lockdiscovery>
+ </D:prop>
+ ]]>
+ </body>
</response>
</step>
1.2 +21 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritancePutProppatchLockCol.xml
Index: ACLdenyWriteACLInheritancePutProppatchLockCol.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/Write/ACLdenyWriteACLInheritancePutProppatchLockCol.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyWriteACLInheritancePutProppatchLockCol.xml 24 Jun 2002 11:24:26 -0000 1.1
+++ ACLdenyWriteACLInheritancePutProppatchLockCol.xml 5 Aug 2002 15:20:15 -0000 1.2
@@ -152,7 +152,27 @@
</request>
<response>
<command>HTTP/1.0 200 OK</command>
- <body/>
+ <body varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <D:prop xmlns:D="DAV:">
+ <D:lockdiscovery>
+ <D:activelock>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:depth>infinity</D:depth>
+ <D:owner>%globalVariableUserPath%</D:owner>
+ <D:timeout>*</D:timeout>
+ <D:locktoken>
+ <D:href>*</D:href>
+ </D:locktoken>
+ </D:activelock>
+ </D:lockdiscovery>
+ </D:prop>
+ ]]>
+ </body>
</response>
</step>
1.2 +21 -1 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyWriteUnlockColFile.xml
Index: ACLdenyWriteUnlockColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLdenyWriteUnlockColFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLdenyWriteUnlockColFile.xml 24 Jun 2002 11:23:36 -0000 1.1
+++ ACLdenyWriteUnlockColFile.xml 5 Aug 2002 15:20:15 -0000 1.2
@@ -68,7 +68,27 @@
</request>
<response>
<command>HTTP/1.0 200 OK</command>
- <body/>
+ <body><![CDATA[<?xml version="1.0"?>
+ <D:prop xmlns:D="DAV:">
+ <D:lockdiscovery>
+ <D:activelock>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:depth>infinity</D:depth>
+ <D:owner>/taminowebdavserver/administration/security/users/localhost/2user1</D:owner>
+ <D:timeout>*</D:timeout>
+ <D:locktoken>
+ <D:href>*</D:href>
+ </D:locktoken>
+ </D:activelock>
+ </D:lockdiscovery>
+ </D:prop>
+ ]]>
+ </body>
</response>
</step>
1.2 +218 -6 jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLgrantReadPropFindColFile.xml
Index: ACLgrantReadPropFindColFile.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/ACL/functional/Principle/EitherReadorWrite/ACLgrantReadPropFindColFile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACLgrantReadPropFindColFile.xml 24 Jun 2002 11:23:36 -0000 1.1
+++ ACLgrantReadPropFindColFile.xml 5 Aug 2002 15:20:15 -0000 1.2
@@ -98,9 +98,94 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- </body>
+ <body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+ <D:multistatus xmlns:D="DAV:">
+ <D:response>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:acl>
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableUserPath%</D:href>
+ </D:principal>
+ <D:deny>
+ <D:privilege>
+ <D:write />
+ </D:privilege>
+ <D:privilege>
+ <D:write-acl />
+ </D:privilege>
+ </D:deny>
+ <D:protected />
+ <D:inherited>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
+ </D:inherited>
+ </D:ace>
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableRootUserPath%</D:href>
+ </D:principal>
+ <D:grant>
+ <D:privilege>
+ <D:all />
+ </D:privilege>
+ </D:grant>
+ <D:protected />
+ <D:inherited>
+ <D:href>/%globalVariableServerName%/</D:href>
+ </D:inherited>
+ </D:ace>
+ </D:acl>
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+ <D:response>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:acl>
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableUserPath%</D:href>
+ </D:principal>
+ <D:deny>
+ <D:privilege>
+ <D:write />
+ </D:privilege>
+ <D:privilege>
+ <D:write-acl />
+ </D:privilege>
+ </D:deny>
+ <D:protected />
+ <D:inherited>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
+ </D:inherited>
+ </D:ace>
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableRootUserPath%</D:href>
+ </D:principal>
+ <D:grant>
+ <D:privilege>
+ <D:all />
+ </D:privilege>
+ </D:grant>
+ <D:protected />
+ <D:inherited>
+ <D:href>/%globalVariableServerName%/</D:href>
+ </D:inherited>
+ </D:ace>
+ </D:acl>
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+ </D:multistatus>
+ ]]>
+
+ </body>
</response>
</step>
@@ -116,9 +201,136 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet 2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body varUsage="globalVariableCollection,userNumber,globalVariableServerName">
- </body>
+ <body varUsage="globalVariableCollection,globalVariableUserPath,globalVariableRootUserPath,globalVariableServerName,user,host"><![CDATA[<?xml version="1.0"?>
+
+ <D:multistatus xmlns:D="DAV:">
+ <D:response>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%/test/test.xml</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:current-user-privilege-set>
+ <D:privilege>
+ <D:read />
+ </D:privilege>
+ <D:privilege>
+ <D:read-acl />
+ </D:privilege>
+ </D:current-user-privilege-set>
+ <D:supportedlock>
+ <D:lockentry>
+ <D:lockscope>
+ <D:exclusive />
+ </D:lockscope>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ </D:lockentry>
+ <D:lockentry>
+ <D:lockscope>
+ <D:shared />
+ </D:lockscope>
+ <D:locktype>
+ <D:write />
+ </D:locktype>
+ </D:lockentry>
+ </D:supportedlock>
+ <D:modCount>*</D:modCount>
+ <D:source />
+ <xsv:isXml xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">true</xsv:isXml>
+ <D:creationdate>*</D:creationdate>
+ <D:lockdiscovery />
+ <D:acl-semantics>
+ <D:ace-combination>
+ <D:all-grant-before-any-deny />
+ </D:ace-combination>
+ <D:required-principal>
+ <D:all />
+ </D:required-principal>
+ </D:acl-semantics>
+ <D:getcontentlength>*</D:getcontentlength>
+ <D:displayname>test.xml</D:displayname>
+ <D:owner>
+ <D:href>%globalVariableUserPath%</D:href>
+ </D:owner>
+ <D:acl>
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableUserPath%</D:href>
+ </D:principal>
+ <D:deny>
+ <D:privilege>
+ <D:write />
+ </D:privilege>
+ <D:privilege>
+ <D:write-acl />
+ </D:privilege>
+ </D:deny>
+ <D:protected />
+ <D:inherited>
+ <D:href>/%globalVariableServerName%/%globalVariableCollection%</D:href>
+ </D:inherited>
+ </D:ace>
+ <D:ace>
+ <D:principal>
+ <D:href>%globalVariableRootUserPath%</D:href>
+ </D:principal>
+ <D:grant>
+ <D:privilege>
+ <D:all />
+ </D:privilege>
+ </D:grant>
+ <D:protected />
+ <D:inherited>
+ <D:href>/%globalVariableServerName%/</D:href>
+ </D:inherited>
+ </D:ace>
+ </D:acl>
+ <D:getcontenttype>text/xml</D:getcontenttype>
+ <D:getcontentlanguage>en</D:getcontentlanguage>
+ <D:resourcetype />
+ <xsv:xdavContentId xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">*</xsv:xdavContentId>
+ <D:getlastmodified>*</D:getlastmodified>
+ <D:principal-collection-set>
+ <D:href>%globalVariableRootUserPath%</D:href>
+ </D:principal-collection-set>
+ <D:supported-privilege-set>
+ <D:supported-privilege>
+ <D:privilege>
+ <D:all />
+ </D:privilege>
+ <D:description>Any operation</D:description>
+ <D:privilege>
+ <D:read />
+ </D:privilege>
+ <D:description>Read any object</D:description>
+ </D:supported-privilege>
+ <D:supported-privilege>
+ <D:privilege>
+ <D:write />
+ </D:privilege>
+ <D:description>Write any object</D:description>
+ <D:privilege>
+ <D:read-acl />
+ </D:privilege>
+ <D:description>Read the ACL</D:description>
+ </D:supported-privilege>
+ <D:supported-privilege>
+ <D:privilege>
+ <D:write-acl />
+ </D:privilege>
+ <D:description>Write the ACL</D:description>
+ </D:supported-privilege>
+ </D:supported-privilege-set>
+ <D:getetag>*</D:getetag>
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+ </D:multistatus>
+ ]]>
+
+
+ </body>
</response>
</step>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>