cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/webapp sitemap.xmap
Date Mon, 02 Jul 2001 09:23:34 GMT
cziegeler    01/07/02 02:23:34

  Modified:    src/org/apache/cocoon/sitemap ContentAggregator.java
               webapp   sitemap.xmap
  Log:
  ContentAggregator now uses same url notation as all other components. An explicit cocoon://
is required
  
  Revision  Changes    Path
  1.11      +4 -4      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContentAggregator.java	2001/06/28 10:29:36	1.10
  +++ ContentAggregator.java	2001/07/02 09:23:28	1.11
  @@ -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.10 2001/06/28 10:29:36 cziegeler Exp $
  + * @version CVS $Id: ContentAggregator.java,v 1.11 2001/07/02 09:23:28 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;
  @@ -173,10 +173,10 @@
                   current = ((Part)this.parts.get(i)).source;
                   if (current.getLastModified() == 0) {
                           return 0;
  -                    } else {
  +                } else {
                       key += HashUtil.hash(current.getSystemId());
  -                    }
                   }
  +            }
               return key;
           } catch (Exception e) {
               getLogger().error("ContentAggregator: could not generateKey", e);
  
  
  
  1.18      +3 -3      xml-cocoon2/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- sitemap.xmap	2001/06/21 19:28:59	1.17
  +++ sitemap.xmap	2001/07/02 09:23:32	1.18
  @@ -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


Mime
View raw message