Author: vgritsenko
Date: Fri Oct 15 13:28:43 2004
New Revision: 54874
Added:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.html
- copied, changed from rev 54859,
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test10.html
Removed:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test10.html
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/sitemap.xmap
Log:
reader mime type tests. test50 fails - was not failing just recently
Modified: cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/anteater/reader-mime-type.xml Fri Oct
15 13:28:43 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/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/sitemap.xmap
Fri Oct 15 13:28:43 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>
Copied:
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.html
(from rev 54859,
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test10.html)
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test10.html
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/reader-mime-type/test.html
Fri Oct 15 13:28:43 2004
@@ -14,7 +14,7 @@
limitations under the License.
-->
<html>
-<body>
-This should have the text/html mime type.
-</body>
+ <body>
+ This should have the text/html mime type.
+ </body>
</html>
