Author: sylvain Date: Fri Jan 28 09:00:10 2005 New Revision: 148902 URL: http://svn.apache.org/viewcvs?view=rev&rev=148902 Log: add testcase for bug#33178 Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/hello.xml (contents, props changed) cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/sitemap.xmap (contents, props changed) cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/explain-test.xml (contents, props changed) cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/sitemap.xmap (contents, props changed) cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/welcome.xml (contents, props changed)
Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/hello.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/hello.xml?view=auto&rev=148902 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/hello.xml Fri Jan 28 09:00:10 2005 @@ -0,0 +1 @@ +<h1>Hello!</h1> Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/sitemap.xmap?view=auto&rev=148902 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/elsewhere/sitemap.xmap Fri Jan 28 09:00:10 2005 @@ -0,0 +1,10 @@ +<?xml version="1.0"?> + +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";> + <map:pipelines> + <map:pipeline> + <!-- this sitemap is mounted with pass-through, but contains + no matcher so that we go back to the parent sitemap --> + </map:pipeline> + </map:pipelines> +</map:sitemap> Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/explain-test.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/explain-test.xml?view=auto&rev=148902 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/explain-test.xml Fri Jan 28 09:00:10 2005 @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<!-- + Copyright 1999-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- CVS $Id$ --> + +<page> + <title>Sitemap pass-through test pages</title> + <content> + <para> + Shows that mounted pass-through breaks when a "cocoon:" is used + after going back to the parent sitemap (<link + href="http://issues.apache.org/bugzilla/show_bug.cgi?id=33178";>bug + #33178</link>). + </para> + <para> + Test links: + <ul> + <li><link href="welcome">Correct page</link></li> + <li><link href="welcome-cocoon">Broken page</link></li> + </ul> + </para> + </content> +</page> Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/sitemap.xmap Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/sitemap.xmap?view=auto&rev=148902 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/sitemap.xmap Fri Jan 28 09:00:10 2005 @@ -0,0 +1,25 @@ +<?xml version="1.0"?> + +<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";> + <map:pipelines> + <map:pipeline> + <map:mount check-reload="true" uri-prefix="" + src="elsewhere/sitemap.xmap" pass-through="true"/> + + <map:match pattern="welcome"> + <map:generate src="welcome.xml"/> + <map:serialize type="xhtml"/> + </map:match> + + <map:match pattern="welcome-cocoon"> + <map:generate src="cocoon:/welcome.ccn"/> + <map:serialize/> + </map:match> + + <map:match pattern="welcome.ccn"> + <map:generate src="welcome.xml"/> + <map:serialize type="xhtml"/> + </map:match> + </map:pipeline> + </map:pipelines> +</map:sitemap> Added: cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/welcome.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/welcome.xml?view=auto&rev=148902 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/src/webapp/samples/test/pass-through/welcome.xml Fri Jan 28 09:00:10 2005 @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<h1>Welcome!</h1>
