You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2001/07/02 11:21:03 UTC

cvs commit: xml-cocoon2/webapp sitemap.xmap

cziegeler    01/07/02 02:21:02

  Modified:    src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
                        ContentAggregator.java
               webapp   Tag: cocoon_20_branch sitemap.xmap
  Log:
  ContentAggregator now uses same url notation as all other components. An explicit cocoon:// is required
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.7   +2 -2      xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java
  
  Index: ContentAggregator.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v
  retrieving revision 1.5.2.6
  retrieving revision 1.5.2.7
  diff -u -r1.5.2.6 -r1.5.2.7
  --- ContentAggregator.java	2001/06/28 10:30:51	1.5.2.6
  +++ ContentAggregator.java	2001/07/02 09:20:56	1.5.2.7
  @@ -40,7 +40,7 @@
   /**
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Id: ContentAggregator.java,v 1.5.2.6 2001/06/28 10:30:51 cziegeler Exp $
  + * @version CVS $Id: ContentAggregator.java,v 1.5.2.7 2001/07/02 09:20:56 cziegeler Exp $
    */
   public class ContentAggregator extends ContentHandlerWrapper implements Generator, Cacheable, Composable {
   
  @@ -111,7 +111,7 @@
           boolean stripRootElement;
   
           public Part(String uri, String element, String namespace, String stripRoot, String prefix) {
  -            this.uri = "cocoon://" + uri;
  +            this.uri = uri;
               this.element = element;
               this.namespace = namespace;
               this.prefix = prefix;
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.7  +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.6
  retrieving revision 1.11.2.7
  diff -u -r1.11.2.6 -r1.11.2.7
  --- sitemap.xmap	2001/06/21 19:24:03	1.11.2.6
  +++ sitemap.xmap	2001/07/02 09:21:00	1.11.2.7
  @@ -283,9 +283,9 @@
   
      <map:match pattern="news/aggregate.xml">
       <map:aggregate element="page" ns="http://foo.bar.com/myspace">
  -     <map:part src="slashdot/slashdot.xml" element="slashdot" ns="http://foo.bar.com/slashdot"/>
  -     <map:part src="moreover/moreover.xml" element="moreover" ns="http://foo.bar.com/moreover"/>
  -     <map:part src="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:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org