cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: rev 54875 - in cocoon/trunk/src: test/anteater webapp/samples/test/reader-mime-type
Date Fri, 15 Oct 2004 20:31:36 GMT
Author: vgritsenko
Date: Fri Oct 15 13:31:35 2004
New Revision: 54875

Added:
   cocoon/trunk/src/webapp/samples/test/reader-mime-type/test.html   (props changed)
      - copied unchanged from rev 54874, cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.html
Removed:
   cocoon/trunk/src/webapp/samples/test/reader-mime-type/test10.html
Modified:
   cocoon/trunk/src/test/anteater/reader-mime-type.xml
   cocoon/trunk/src/webapp/samples/test/reader-mime-type/sitemap.xmap
Log:
reader mime type tests. test50 fails - was not failing just recently


Modified: cocoon/trunk/src/test/anteater/reader-mime-type.xml
==============================================================================
--- cocoon/trunk/src/test/anteater/reader-mime-type.xml	(original)
+++ cocoon/trunk/src/test/anteater/reader-mime-type.xml	Fri Oct 15 13:31:35 2004
@@ -30,43 +30,77 @@
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test10.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
         <httpRequest href="${baseUrl}/test20.html" description="Check content-type">
             <match>
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test20.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
         <httpRequest href="${baseUrl}/test30.html" description="Check content-type">
             <match>
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test30.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
         <httpRequest href="${baseUrl}/test40.html" description="Check content-type">
             <match>
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test40.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
         <httpRequest href="${baseUrl}/test50.html" description="Check content-type">
             <match>
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test50.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
         <httpRequest href="${baseUrl}/test60.html" description="Check content-type">
             <match>
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test60.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
         <httpRequest href="${baseUrl}/test70.html" description="Check content-type">
             <match>
                 <header name="Content-type" value="text/html"/>
             </match>
         </httpRequest>
+        <httpRequest href="${baseUrl}/test70.html" description="Check content-type (cached)">
+            <match>
+                <header name="Content-type" value="text/html"/>
+            </match>
+        </httpRequest>
 
     </target>
-
 </project>

Modified: cocoon/trunk/src/webapp/samples/test/reader-mime-type/sitemap.xmap
==============================================================================
--- cocoon/trunk/src/webapp/samples/test/reader-mime-type/sitemap.xmap	(original)
+++ cocoon/trunk/src/webapp/samples/test/reader-mime-type/sitemap.xmap	Fri Oct 15 13:31:35
2004
@@ -14,44 +14,57 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
-    <map:pipelines>
-        <map:pipeline>
-            <map:match pattern="test10.html">
-              <map:read src="test10.html"/>
-            </map:match>
-            <map:match pattern="test20.html">
-              <map:read src="cocoon:/test10.html"/>
-            </map:match>
-            <map:match pattern="test30">
-              <map:read src="test10.html"/>
-            </map:match>
-        </map:pipeline>
 
-        <map:pipeline>
-            <map:match pattern="test40.html">
-              <map:read src="cocoon:/test10.html"/>
-            </map:match>
-        </map:pipeline>
-
-        <map:pipeline>
-            <map:match pattern="test50.html">
-              <map:read src="cocoon:/test30"/>
-            </map:match>
-        </map:pipeline>
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
-        <map:pipeline>
-            <map:match pattern="test60.html">
-              <map:read src="cocoon:/test10.html" mime-type="text/html"/>
-            </map:match>
-        </map:pipeline>
+  <map:pipelines>
+    <map:pipeline type="caching">
+      <map:match pattern="test10.html">
+        <map:read src="test.html"/>
+      </map:match>
+      <map:match pattern="test20.html">
+        <map:read src="cocoon:/test10.html"/>
+      </map:match>
+      <map:match pattern="test30">
+        <map:read src="test.html"/>
+      </map:match>
+      <map:match pattern="test40.html">
+        <map:read src="cocoon:/test10.html"/>
+      </map:match>
+      <map:match pattern="test50.html">
+        <map:read src="cocoon:/test30"/>
+      </map:match>
+      <map:match pattern="test60.html">
+        <map:read src="cocoon:/test10.html" mime-type="text/html"/>
+      </map:match>
+      <map:match pattern="test70.html">
+        <map:read src="cocoon:/test30" mime-type="text/html"/>
+      </map:match>
+    </map:pipeline>
 
-        <map:pipeline>
-            <map:match pattern="test70.html">
-              <map:read src="cocoon:/test30" mime-type="text/html"/>
-            </map:match>
-        </map:pipeline>
-    </map:pipelines>
+    <map:pipeline type="noncaching">
+      <map:match pattern="test15.html">
+        <map:read src="test.html"/>
+      </map:match>
+      <map:match pattern="test25.html">
+        <map:read src="cocoon:/test15.html"/>
+      </map:match>
+      <map:match pattern="test35">
+        <map:read src="test.html"/>
+      </map:match>
+      <map:match pattern="test45.html">
+        <map:read src="cocoon:/test15.html"/>
+      </map:match>
+      <map:match pattern="test55.html">
+        <map:read src="cocoon:/test35"/>
+      </map:match>                   	
+      <map:match pattern="test65.html">
+        <map:read src="cocoon:/test15.html" mime-type="text/html"/>
+      </map:match>
+      <map:match pattern="test75.html">
+        <map:read src="cocoon:/test35" mime-type="text/html"/>
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
 
 </map:sitemap>

Mime
View raw message