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/src/org/apache/cocoon/sitemap ContentAggregator.java
Date Thu, 28 Jun 2001 10:30:53 GMT
cziegeler    01/06/28 03:30:53

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: cocoon_20_branch sitemap.xsl
               src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
                        ContentAggregator.java
  Log:
  Final fix for the cocoon: protocol
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.14 +1 -3      xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
  retrieving revision 1.11.2.13
  retrieving revision 1.11.2.14
  diff -u -r1.11.2.13 -r1.11.2.14
  --- sitemap.xsl	2001/06/27 21:47:13	1.11.2.13
  +++ sitemap.xsl	2001/06/28 10:30:44	1.11.2.14
  @@ -128,7 +128,7 @@
        *
        * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
        * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  -     * @version CVS $Id: sitemap.xsl,v 1.11.2.13 2001/06/27 21:47:13 vgritsenko Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.11.2.14 2001/06/28 10:30:44 cziegeler Exp $
        */
       public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
         static final String LOCATION = "<xsl:value-of select="translate(@file-path, '/',
'.')"/>.<xsl:value-of select="@file-name"/>";
  @@ -1235,8 +1235,6 @@
       </xsl:call-template>
       <xsl:variable name="ca">contentAggregator_<xsl:value-of select="generate-id(.)"/></xsl:variable>
       ContentAggregator <xsl:value-of select="$ca"/> = (ContentAggregator)eventPipeline.getGenerator();
  -    <xsl:value-of select="$ca"/>.setSitemap(this);
  -    <xsl:value-of select="$ca"/>.setEnvironment(environment);
       <xsl:if test="not (@element)">
         <xsl:call-template name="error">
           <xsl:with-param name="message">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.6   +1 -9      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.5
  retrieving revision 1.5.2.6
  diff -u -r1.5.2.5 -r1.5.2.6
  --- ContentAggregator.java	2001/06/28 09:58:20	1.5.2.5
  +++ ContentAggregator.java	2001/06/28 10:30:51	1.5.2.6
  @@ -22,13 +22,11 @@
   import org.apache.cocoon.caching.CacheValidity;
   import org.apache.cocoon.caching.AggregatedCacheValidity;
   import org.apache.cocoon.caching.Cacheable;
  -import org.apache.cocoon.caching.PipelineCacheKey;
   import org.apache.cocoon.caching.TimeStampCacheValidity;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.generation.Generator;
  -import org.apache.cocoon.sitemap.Sitemap;
   import org.apache.cocoon.xml.ContentHandlerWrapper;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLProducer;
  @@ -42,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.5 2001/06/28 09:58:20 cziegeler Exp
$
  + * @version CVS $Id: ContentAggregator.java,v 1.5.2.6 2001/06/28 10:30:51 cziegeler Exp
$
    */
   public class ContentAggregator extends ContentHandlerWrapper implements Generator, Cacheable,
Composable {
   
  @@ -209,12 +207,6 @@
               getLogger().error("ContentAggregator: could not generateKey", e);
               return null;
           }
  -    }
  -
  -    public void setEnvironment(Environment environment) {
  -    }
  -
  -    public void setSitemap(Sitemap sitemap) {
       }
   
       public void setRootElement(String element, String namespace, String prefix) {
  
  
  

----------------------------------------------------------------------
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