cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap AggregateNode.java
Date Sun, 22 Feb 2004 15:08:56 GMT
unico       2004/02/22 07:08:56

  Modified:    src/java/org/apache/cocoon/components/cprocessor
                        sitemap2xconf.xsl
               src/java/org/apache/cocoon/components/cprocessor/sitemap
                        AggregateNode.java
  Log:
  make map:aggregate work
  
  Revision  Changes    Path
  1.9       +2 -2      cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap2xconf.xsl
  
  Index: sitemap2xconf.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap2xconf.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- sitemap2xconf.xsl	28 Jan 2004 17:25:31 -0000	1.8
  +++ sitemap2xconf.xsl	22 Feb 2004 15:08:56 -0000	1.9
  @@ -364,9 +364,9 @@
       </aggregate-node>
     </xsl:template>
     
  -  <xsl:template match="map:part">
  +  <xsl:template match="map:part" mode="copy">
       <part>
  -      <xsl:apply-templates select="@*" />
  +      <xsl:apply-templates select="@*" mode="copy"/>
       </part>
     </xsl:template>
     
  
  
  
  1.5       +3 -2      cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/AggregateNode.java
  
  Index: AggregateNode.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/AggregateNode.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AggregateNode.java	20 Feb 2004 18:57:15 -0000	1.4
  +++ AggregateNode.java	22 Feb 2004 15:08:56 -0000	1.5
  @@ -68,6 +68,7 @@
   import org.apache.cocoon.components.cprocessor.variables.VariableResolverFactory;
   import org.apache.cocoon.components.pipeline.ProcessingPipeline;
   import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.generation.Generator;
   import org.apache.cocoon.sitemap.ContentAggregator;
   import org.apache.cocoon.sitemap.PatternException;
   import org.apache.cocoon.util.StringUtils;
  @@ -138,7 +139,7 @@
               }
   
               checkNamespace(childConfig);
  -            Collection labels = splitLabels(childConfig.getAttribute("label"));
  +            Collection labels = splitLabels(childConfig.getAttribute("label",null));
   
               try {
                   AggregateNode.Part part = new AggregateNode.Part(
  
  
  

Mime
View raw message