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/11/26 13:49:51 UTC

cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV twoStorescontentTypeThenContentLength.xml

juergen     2002/11/26 04:49:51

  Modified:    testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV
                        twoStorescontentTypeThenContentLength.xml
  Log:
  no message
  
  Revision  Changes    Path
  1.2       +13 -10    jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/twoStorescontentTypeThenContentLength.xml
  
  Index: twoStorescontentTypeThenContentLength.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/orderby/DAV/twoStorescontentTypeThenContentLength.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- twoStorescontentTypeThenContentLength.xml	11 Oct 2002 09:22:42 -0000	1.1
  +++ twoStorescontentTypeThenContentLength.xml	26 Nov 2002 12:49:51 -0000	1.2
  @@ -1807,7 +1807,7 @@
   	<step>
   		<request>
   			<command varUsage="globalVariableServerName,globalVariableCollection,">SEARCH /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
  -			<body varUsage="test8contentlength"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
  +			<body varUsage="test8contentlength,globalVariableServerName,"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
   							<searchrequest xmlns:D="DAV:">
     							<D:basicsearch>
       								<D:select>
  @@ -1818,15 +1818,19 @@
       								</D:select>
       								<D:from>
         									<D:scope>
  -        									<D:href>/taminowebdavserver/</D:href>
  +        									<D:href>/%globalVariableServerName%/</D:href>
         									</D:scope>
      							   </D:from>
  -    							<D:where>
  -    								<D:not>
  -   									 <D:is-collection/>
  -    								</D:not>
  -     							</D:where>
  -   						      <D:orderby>
  +   							     <D:where>
  +      								<D:not>
  +       								 <D:or>
  +         									 <S:is-principal xmlns:S="http://jakarta.apache.org/slide/"/>
  +         									 <D:is-collection/>
  +       								 </D:or>
  +     								 </D:not>
  +  								  </D:where>
  +
  +       						      <D:orderby>
         								<D:order>
           								<D:prop>
             									<D:getcontenttype/>
  @@ -2087,7 +2091,7 @@
   										]]></body>
   		</response>
   	</step>
  -<cleanup>
  +	<cleanup>
   		<step>
   			<request>
   				<command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test HTTP/1.1</command>
  @@ -2120,6 +2124,5 @@
   				<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>