juergen     2003/03/28 08:12:50

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV
                        selectDefinedProperties.xml
  Log:
  the lock owner is packed in a href element
  
  Revision  Changes    Path
  1.6       +35 -31    
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV/selectDefinedProperties.xml
  
  Index: selectDefinedProperties.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/DAV/selectDefinedProperties.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- selectDefinedProperties.xml       17 Feb 2003 18:00:17 -0000      1.5
  +++ selectDefinedProperties.xml       28 Mar 2003 16:12:50 -0000      1.6
  @@ -10,51 +10,34 @@
     <step>
       <request>
         <command 
varUsage="userNumber,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" />
       </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>
     <!-- A lock has to be placed upon the resource so that the DAV property 'lock 
discovery' is created. -->
     <step>
       <request>
         <command varUsage="globalVariableCollection,globalVariableServerName">LOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      <header>Connection: Keep-Alive, TE</header>
  -      <header>TE: trailers, deflate, gzip, compress</header>
  -      <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
         <header>Timeout: Second-604800</header>
  -      <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
         <header>Content-type: text/xml</header>
         <body><![CDATA[<?xml version="1.0"?><A:lockinfo 
xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
       </request>
       <response>
         <command>HTTP/1.0 200 OK</command>
  -      <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>
         <body 
varUsage="globalVariableUserPath,globalVariableServerName,user,host"><![CDATA[<?xml 
version="1.0" encoding="utf-8"?> <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><A:href xmlns:A="DAV:" 
/></d:owner><d:timeout>Second-604800</d:timeout><d:locktoken><d:href 
/></d:locktoken><d:principal-URL><d:href>%globalVariableUserPath%</d:href></d:principal-URL></d:activelock></d:lockdiscovery></d:prop>]]></body>
       </response>
     </step>
     <step>
       <request>
         <command 
varUsage="globalVariableCollection,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:getcontentlength/> </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,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:propstat> <D:prop> <D:getcontentlength>*</D:getcontentlength> </D:prop> 
<D:status>HTTP/1.1 200 OK</D:status> </D:propstat> </D:response> 
</D:multistatus>]]></body>
       </response>
     </step>
  @@ -66,22 +49,51 @@
       </request>
       <response>
         <command>HTTP/1.0 207 Multi-Status</command>
  -      <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,testresourcecontentlength"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?> <D:multistatus xmlns:D="DAV:"> <D:response> 
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href> 
<propstat xmlns="DAV:"> <prop> <creationdate>2002-05-07T13:35:49Z</creationdate> 
<!--1--> <displayname>test.xml</displayname> <!--2--> 
<getcontentlanguage>en</getcontentlanguage> <!--3--> 
<getcontentlength>%testresourcecontentlength%</getcontentlength> <!--4--> 
<getcontenttype>text/xml</getcontenttype> <!--5--> <getetag>*</getetag> <!--6--> 
<getlastmodified>Tue, 07 May 2002 13:47:30 GMT</getlastmodified><!--7--> 
<lockdiscovery> <!--8--> <activelock> <locktype> <write /> </locktype> <lockscope> 
<exclusive /> </lockscope> <depth>infinity</depth> <owner>*</owner> 
<timeout>*</timeout> <locktoken> <href>*</href> </locktoken> <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL></activelock>
 </lockdiscovery> <resourcetype /> <!--9--> <source /> <!--10--> <supportedlock> 
<!--11--> <lockentry> <lockscope> <exclusive /> </lockscope> <locktype> <write /> 
</locktype> </lockentry> <lockentry> <lockscope> <shared /> </lockscope> <locktype> 
<write /> </locktype> </lockentry> </supportedlock> </prop> <status>HTTP/1.1 200 
OK</status> </propstat> </D:response> </D:multistatus>]]></body>
  +      <body 
varUsage="globalVariableCollection,globalVariableUserPath,globalVariableServerName,user,host,testresourcecontentlength"><![CDATA[<?xml
 version="1.0" encoding="utf-8"?> 
  +             <D:multistatus xmlns:D="DAV:"> 
  +             <D:response> 
  +                     
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href> 
  +                     <propstat xmlns="DAV:"> 
  +                     <prop> 
  +                             <creationdate>2002-05-07T13:35:49Z</creationdate> 
  +                             <displayname>test.xml</displayname> 
  +                             <getcontentlanguage>en</getcontentlanguage> 
  +                             
<getcontentlength>%testresourcecontentlength%</getcontentlength> 
  +                             <getcontenttype>text/xml</getcontenttype> 
  +                             <getetag>*</getetag> 
  +                             <getlastmodified>Tue, 07 May 2002 13:47:30 
GMT</getlastmodified>
  +                             <lockdiscovery> 
  +                             <activelock> 
  +                                     <locktype> <write /> </locktype> 
  +                                     <lockscope> <exclusive /> </lockscope> 
  +                                     <depth>infinity</depth> 
  +                                     <owner><href></href></owner> 
  +                                     <timeout>*</timeout> 
  +                                     <locktoken> <href>*</href> </locktoken> 
  +                                     <d:principal-URL 
xmlns:d="DAV:"><d:href>%globalVariableUserPath%</d:href></d:principal-URL>
  +                             </activelock> 
  +                             </lockdiscovery> 
  +                             <resourcetype /> 
  +                             <source /> 
  +                             <supportedlock> 
  +                             <lockentry> <lockscope> <exclusive /> </lockscope> 
<locktype> <write /> </locktype> </lockentry> <lockentry> <lockscope> <shared /> 
</lockscope> <locktype> <write /> </locktype> </lockentry> </supportedlock> 
  +                     </prop> 
  +                     <status>HTTP/1.1 200 OK</status> 
  +                     </propstat> 
  +             </D:response> 
  +             </D:multistatus>
  +             ]]>
  +      </body>
       </response>
     </step>
     <!-- The resource is unlocked. -->
     <step>
       <request>
         <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK 
/%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
  -      <header>Connection: Keep-Alive, TE</header>
  -      <header>TE: trailers, deflate, gzip, compress</header>
  -      <header>User-Agent: UCI DAV Explorer/0.70 RPT-HTTPClient/0.3-2E</header>
         <header varUsage="automaticVariable1">Lock-Token: 
%automaticVariable1%</header>
  -      <header>Accept-Encoding: deflate, gzip, x-gzip, compress, x-compress</header>
       </request>
       <response>
         <command>HTTP/1.0 204 No Content</command>
  -      <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>
     <!-- The final step deletes the resource. -->
  @@ -89,17 +101,9 @@
       <step>
         <request>
           <command 
varUsage="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: 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>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to