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/07 15:26:55 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties ChoutVsnPropfall.xml
juergen 2002/08/07 06:26:55
Modified: testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties
ChoutVsnPropfall.xml
Log:
adopted the expected propfind response body.
Revision Changes Path
1.2 +107 -244 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties/ChoutVsnPropfall.xml
Index: ChoutVsnPropfall.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Working_resource_feature/Working_resource_properties/ChoutVsnPropfall.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChoutVsnPropfall.xml 31 Jul 2002 08:53:28 -0000 1.1
+++ ChoutVsnPropfall.xml 7 Aug 2002 13:26:55 -0000 1.2
@@ -19,18 +19,11 @@
<step>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.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: 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>
</response>
</step>
@@ -38,7 +31,6 @@
<step>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
<command>HTTP/1.0 200 OK</command>
@@ -48,17 +40,12 @@
<step>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND /%globalVariableServerName%/%globalVariableCollection%/test.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:checked-in/></D:prop></D:propfind>]]></body>
</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,VHR1,globalVariableServerName" varDefinition="VHR1" varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
@@ -81,7 +68,6 @@
<step>
<request>
<command varUsage="VHR1">CHECKOUT %VHR1% HTTP/1.1</command>
- <header>Content-type: text/xml; charset="utf-8"</header>
<body />
</request>
<response>
@@ -92,13 +78,11 @@
<step>
<request>
<command varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<body><![CDATA[<D:version-tree xmlns:D="DAV:"><D:prop><D:checkout-set/></D:prop></D:version-tree>]]></body>
</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="WRS,VHR1" varDefinition="WRS" varPath="multistatus/response/propstat/prop/checkout-set/href"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
@@ -120,244 +104,131 @@
<step>
<request>
<command varUsage="WRS">PROPFIND %WRS% 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:allprop /></D:propfind>]]></body>
</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="WRS,globalVariableCollection,VHR1,globalVariableServerName"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
-<D:multistatus xmlns:D="DAV:">
- <D:response>
- <D:href>%WRS%</D:href>
- <D:propstat>
- <D:prop>
+ <body varUsage="WRS,globalVariableCollection,VHR1,globalVariableServerName,globalVariableRootUserPath"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
+ <D:multistatus xmlns:D="DAV:">
+ <D:response>
+ <D:href>%WRS%</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:current-user-privilege-set>
+ <D:privilege>
+ <D:read />
+ </D:privilege>
+ <D:privilege>
+ <D:write />
+ </D:privilege>
+ <D:privilege>
+ <D:read-acl />
+ </D:privilege>
+ <D:privilege>
+ <D:write-acl />
+ </D:privilege>
+ <D:privilege>
+ <D:all />
+ </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: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:predecessor-set>
- <D:href>%VHR1%</D:href>
- </D:predecessor-set>
+ <D:modCount>1</D:modCount>
<D:source />
- <D:creator-displayname />
- <D:isXml>true</D:isXml >
- <D:workspace />
- <D:supported-method-set>
- <D:supported-method name="COPY" />
- <D:supported-method name="CHECKIN" />
- <D:supported-method name="POST" />
- <D:supported-method name="ACL" />
- <D:supported-method name="LOCK" />
- <D:supported-method name="REPORT" />
- <D:supported-method name="PROPPATCH" />
- <D:supported-method name="TRACE" />
- <D:supported-method name="PUT" />
- <D:supported-method name="PROPFIND" />
- <D:supported-method name="HEAD" />
- <D:supported-method name="UNLOCK" />
- <D:supported-method name="CONNECT" />
- <D:supported-method name="OPTIONS" />
- <D:supported-method name="DELETE" />
- <D:supported-method name="SEARCH" />
- <D:supported-method name="GET" />
- <D:supported-method name="MOVE" />
- </D:supported-method-set>
- <D:checkout-fork>
- <D:forbidden />
- </D:checkout-fork>
+ <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:checkin-fork>
- <D:forbidden />
- </D:checkin-fork>
+ <D:owner>
+ <D:href>%globalVariableRootUserPath%</D:href>
+ </D:owner>
<D:displayname>*</D:displayname>
- <D:supported-live-property-set>
- <D:supported-live-property>
- <D:prop>
- <D:displayname />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:owner />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:supported-live-property-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:acl />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:comment />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:getcontenttype />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:getcontentlanguage />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:resourcetype />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:supported-report-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:getlastmodified />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:principal-collection-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:checked-out />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:supported-privilege-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:getetag />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:supportedlock />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:current-user-privilege-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:predecessor-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:source />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:creator-displayname />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:workspace />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:supported-method-set />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:auto-update />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:checkout-fork />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:creationdate />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:lockdiscovery />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:acl-semantics />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:getcontentlength />
- </D:prop>
- </D:supported-live-property>
- <D:supported-live-property>
- <D:prop>
- <D:checkin-fork />
- </D:prop>
- </D:supported-live-property>
- </D:supported-live-property-set>
- <D:comment />
+ <D:acl>
+ <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>*</D:getcontentlanguage>
+ <D:getcontentlanguage>en</D:getcontentlanguage>
<D:resourcetype />
- <D:supported-report-set>
- <D:supported-report>
- <D:report>
- <D:expand-property />
- </D:report>
- </D:supported-report>
- </D:supported-report-set>
<xsv:xdavContentId xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">*</xsv:xdavContentId>
<D:getlastmodified>*</D:getlastmodified>
- <D:checked-out>
- <D:href>%VHR1%</D:href>
- </D:checked-out>
+ <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>
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+ </D:multistatus>
+ ]]>
+ </body>
</response>
</step>
@@ -367,17 +238,9 @@
<step>
<request>
<command varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml 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: Tue, 13 Feb 2001 17:14:41 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>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>