Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
Date: 7 Dec 2001 10:18:26 -0000
Message-ID: <20011207101826.8756.qmail@icarus.apache.org>
From: sylvain@apache.org
To: xml-cocoon2-cvs@apache.org
Subject: cvs commit:
 xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java
 sitemap.xsl

sylvain     01/12/07 02:18:26

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: cocoon_20_branch sitemap.xsl
  Log:
  Always compose() pipelines (not only on internal requests)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.41 +5 -4      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.40
  retrieving revision 1.11.2.41
  diff -u -r1.11.2.40 -r1.11.2.41
  --- sitemap.xsl	2001/12/06 13:53:23	1.11.2.40
  +++ sitemap.xsl	2001/12/07 10:18:25	1.11.2.41
  @@ -126,7 +126,7 @@
        *
        * @author &lt;a href="mailto:giacomo@apache.org"&gt;Giacomo Pati&lt;/a&gt;
        * @author &lt;a href="mailto:bloritsch@apache.org"&gt;Berin Loritsch&lt;/a&gt;
  -     * @version CVS $Id: sitemap.xsl,v 1.11.2.40 2001/12/06 13:53:23 sylvain Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.11.2.41 2001/12/07 10:18:25 sylvain 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"/>";
  @@ -615,9 +615,6 @@
         public boolean process(Environment environment, StreamPipeline pipeline, EventPipeline eventPipeline)
         throws Exception {
           if (getLogger().isDebugEnabled()) getLogger().debug("processing internal sitemap request");
  -        // set the correct component manager
  -        pipeline.compose(this.manager);
  -        eventPipeline.compose(this.manager);
           return process (environment, pipeline, eventPipeline, true);
         }
   
  @@ -627,6 +624,10 @@
         private final boolean process(Environment environment, StreamPipeline pipeline,
                                       EventPipeline eventPipeline, boolean internalRequest)
         throws Exception {
  +        // set the correct component manager
  +        pipeline.compose(this.manager);
  +        eventPipeline.compose(this.manager);
  +
           /* the &lt;code&gt;List&lt;/code&gt; objects to hold the replacement values
              delivered from matchers and selectors to replace occurences of
              XPath kind expressions in values of src attribute used with
  
  
  

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