cziegeler 01/07/04 02:19:43
Modified: src/org/apache/cocoon/components/source Tag:
cocoon_20_branch SitemapSource.java
webapp Tag: cocoon_20_branch sitemap.xmap
Log:
Handling of cocoon: urls for the same sitemap fixed
Revision Changes Path
No revision
No revision
1.1.2.2 +5 -1
xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SitemapSource.java 2001/07/04 07:29:48 1.1.2.1
+++ SitemapSource.java 2001/07/04 09:19:32 1.1.2.2
@@ -40,7 +40,7 @@
* Description of a source which is defined by a pipeline.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/04 07:29:48 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/04 09:19:32 $
*/
public final class SitemapSource
@@ -85,7 +85,11 @@
// does the uri point to this sitemap or to the root sitemap?
if (uri.startsWith("//") == true) {
uri = uri.substring(2);
+ // FIXME (CZ) The root sitemap is not available
+ } else if (uri.startsWith("/") == true) {
+ uri = uri.substring(1);
}
+
// FIXME (CZ) We should change the systemId from cocoon:
// to http://server/context/...
/* Request request=
(Request)env.getObjectModel().get(Constants.REQUEST_OBJECT);
No revision
No revision
1.11.2.8 +3 -3 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -u -r1.11.2.7 -r1.11.2.8
--- sitemap.xmap 2001/07/02 09:21:00 1.11.2.7
+++ sitemap.xmap 2001/07/04 09:19:39 1.11.2.8
@@ -283,9 +283,9 @@
<map:match pattern="news/aggregate.xml">
<map:aggregate element="page" ns="http://foo.bar.com/myspace";>
- <map:part src="cocoon://slashdot/slashdot.xml" element="slashdot"
ns="http://foo.bar.com/slashdot"/>
- <map:part src="cocoon://moreover/moreover.xml" element="moreover"
ns="http://foo.bar.com/moreover"/>
- <map:part src="cocoon://isyndicate/news.xml" element="isyndicate"
ns="http://foo.bar.com/isyndicate"/>
+ <map:part src="cocoon:/slashdot/slashdot.xml" element="slashdot"
ns="http://foo.bar.com/slashdot"/>
+ <map:part src="cocoon:/moreover/moreover.xml" element="moreover"
ns="http://foo.bar.com/moreover"/>
+ <map:part src="cocoon:/isyndicate/news.xml" element="isyndicate"
ns="http://foo.bar.com/isyndicate"/>
</map:aggregate>
<map:transform src="stylesheets/news/news.xsl"/>
<map:serialize/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
