Return-Path: 
 <cvs-return-22254-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 55101 invoked from network); 8 Mar 2005 09:39:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 8 Mar 2005 09:39:15 -0000
Received: (qmail 90676 invoked by uid 500); 8 Mar 2005 09:39:13 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 90622 invoked by uid 500); 8 Mar 2005 09:39:13 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 90605 invoked by uid 99); 8 Mar 2005 09:39:13 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 08 Mar 2005 01:39:12 -0800
Received: (qmail 54974 invoked by uid 65534); 8 Mar 2005 09:39:11 -0000
Message-ID: <20050308093911.54973.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Tue, 08 Mar 2005 09:39:11 -0000
Subject: svn commit: r156514 - in cocoon/branches/BRANCH_2_1_X/src:
 test/anteater/reader-mime-type.xml
 webapp/samples/test/reader-mime-type/sitemap.xmap
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Tue Mar  8 01:39:09 2005
New Revision: 156514

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156514
Log:
Apply additional patch to fix anteater tests

Modified:
    cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/s=
itemap.xmap

Modified: cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.x=
ml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/an=
teater/reader-mime-type.xml?view=3Ddiff&r1=3D156513&r2=3D156514
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml (or=
iginal)
+++ cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml Tue=
 Mar  8 01:39:09 2005
@@ -38,15 +38,17 @@
                 <echo message=3D"Ignore following message text:  message d=
oesn't match because header 'content-type' is not present"/>
                 <header name=3D"Content-type" pattern=3D".*"/>
             </match>
+            <match assign=3D"test10-passed-1"/>
         </httpRequest>
-        <fail if=3D"test10-failed-1"/>
+        <fail if=3D"test10-failed-1" message=3D"Content-type header expect=
ed to be absent"/>
         <httpRequest href=3D"${baseUrl}/test10.xml" description=3D"Check c=
ontent-type (cached)">
             <match assign=3D"test10-failed-2">
                 <echo message=3D"Ignore following message text:  message d=
oesn't match because header 'content-type' is not present"/>
                 <header name=3D"Content-type" pattern=3D".*"/>
             </match>
+            <match assign=3D"test10-passed-2"/>
         </httpRequest>
-        <fail if=3D"test10-failed-2"/>
+        <fail if=3D"test10-failed-2" message=3D"Content-type header expect=
ed to be absent"/>
=20
         <!-- Check content-type derived from map:read/@src -->
         <httpRequest href=3D"${baseUrl}/test20.x20" description=3D"Check c=
ontent-type">
@@ -93,15 +95,15 @@
             </match>
             <match assign=3D"test50-passed-1"/>
         </httpRequest>
-        <fail if=3D"test50-failed-1"/>
+        <fail if=3D"test50-failed-1" message=3D"Content-type header expect=
ed to be absent"/>
         <httpRequest href=3D"${baseUrl}/test50.xml" description=3D"Check c=
ontent-type (cached)">
             <match assign=3D"test50-failed-2">
                 <echo message=3D"Ignore following message text:  message d=
oesn't match because header 'content-type' is not present"/>
                 <header name=3D"Content-type" pattern=3D".*"/>
             </match>
-            <match/>
+            <match assign=3D"test50-passed-2"/>
         </httpRequest>
-        <fail if=3D"test50-failed-2"/>
+        <fail if=3D"test50-failed-2" message=3D"Content-type header expect=
ed to be absent"/>
=20
         <!-- Check content-type derived from map:read/@src -->
         <httpRequest href=3D"${baseUrl}/test60.x60" description=3D"Check c=
ontent-type">

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-=
type/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/=
samples/test/reader-mime-type/sitemap.xmap?view=3Ddiff&r1=3D156513&r2=3D156=
514
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/s=
itemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/s=
itemap.xmap Tue Mar  8 01:39:09 2005
@@ -26,7 +26,7 @@
   <map:pipelines>
     <map:pipeline type=3D"caching">
       <map:match pattern=3D"test10.*">
-        <map:read src=3D"test.xzy"/>
+        <map:read src=3D"test.foo"/>
       </map:match>
       <map:match pattern=3D"test20.*">
         <map:read src=3D"test.xml"/>