cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java sitemap.xsl

[haul]

haul        01/11/26 06:47:16

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: cocoon_20_branch sitemap.xsl
  Log:
  - removed <map:dump-parameters/>
  - added this.dumpParameters(listOfMaps) after every listOfMaps.add() & 
listOfMaps.remove()
      (note that dumpParameters checks for isDebugEnabled() itself)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.39 +12 -6     
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.38
  retrieving revision 1.11.2.39
  diff -u -r1.11.2.38 -r1.11.2.39
  --- sitemap.xsl       2001/11/26 09:50:38     1.11.2.38
  +++ sitemap.xsl       2001/11/26 14:47:16     1.11.2.39
  @@ -126,7 +126,7 @@
        *
        * @author &lt;a href="mailto:[EMAIL PROTECTED]"&gt;Giacomo Pati&lt;/a&gt;
        * @author &lt;a href="mailto:[EMAIL PROTECTED]"&gt;Berin Loritsch&lt;/a&gt;
  -     * @version CVS $Id: sitemap.xsl,v 1.11.2.38 2001/11/26 09:50:38 haul Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.11.2.39 2001/11/26 14:47:16 haul 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"/>";
  @@ -839,8 +839,10 @@
             if (getLogger().isDebugEnabled())
               getLogger().debug("Matched <xsl:value-of 
select="$matcher-type"/><xsl:text> </xsl:text><xsl:value-of 
select="$matcher-name2"/><xsl:text> </xsl:text>pattern:<xsl:value-of 
select="XSLTFactoryLoader:escape($factory-loader, $pattern-value)"/>");
             listOfMaps.add (map);
  +          this.dumpParameters(listOfMaps);
             <xsl:apply-templates/>
             listOfMaps.remove (listOfMaps.size()-1);
  +          this.dumpParameters(listOfMaps);
           }
     </xsl:template> <!-- match="map:match//map:match" -->
   
  @@ -939,8 +941,10 @@
             if (getLogger().isDebugEnabled())
               getLogger().debug("Matched <xsl:value-of select="$matcher-type"/> 
<xsl:value-of select="$matcher-name2"/><xsl:text> </xsl:text>pattern:<xsl:value-of 
select="XSLTFactoryLoader:escape($factory-loader, @pattern)"/>");
             listOfMaps.add (map);
  +          this.dumpParameters(listOfMaps);
             <xsl:apply-templates/>
             listOfMaps.remove (listOfMaps.size()-1);
  +          this.dumpParameters(listOfMaps);
           }
           return false;
       }
  @@ -1116,8 +1120,10 @@
             }
             if (getLogger().isDebugEnabled()) getLogger().debug("Action <xsl:value-of 
select="$action-type"/>");
             listOfMaps.add (map);
  +          this.dumpParameters(listOfMaps);
             <xsl:apply-templates 
select="./*[namespace-uri()='http://apache.org/cocoon/sitemap/1.0' and local-name() != 
'parameter']"/>
             listOfMaps.remove(listOfMaps.size()-1);
  +          this.dumpParameters(listOfMaps);
           }
           if (redirector.hasRedirected()) {
             return true;
  @@ -1184,8 +1190,10 @@
           if ((map = <xsl:value-of select="$action-name"/>.act(redirector, 
environment, objectModel, substitute(listOfMaps,<xsl:value-of 
select="$action-source"/>), <xsl:value-of select="$component-param"/>)) != null) {
             if (getLogger().isDebugEnabled()) getLogger().debug("Action <xsl:value-of 
select="$action-type"/>");
             listOfMaps.add (map);
  +          this.dumpParameters(listOfMaps);
             <xsl:apply-templates 
select="./*[namespace-uri()='http://apache.org/cocoon/sitemap/1.0' and local-name() != 
'parameter']" mode="set"/>
             listOfMaps.remove(listOfMaps.size()-1);
  +          this.dumpParameters(listOfMaps);
           }
         </xsl:when>
         <xsl:otherwise>
  @@ -1259,8 +1267,10 @@
             }
             if (getLogger().isDebugEnabled()) getLogger().debug("Action <xsl:value-of 
select="translate($action-name,'&quot;',' ')"/>");
             listOfMaps.add (map);
  +          this.dumpParameters(listOfMaps);
             <xsl:apply-templates 
select="./*[namespace-uri()='http://apache.org/cocoon/sitemap/1.0' and local-name() != 
'parameter']"/>
             listOfMaps.remove(listOfMaps.size()-1);
  +          this.dumpParameters(listOfMaps);
           }
           if (redirector.hasRedirected()) {
             return true;
  @@ -1392,6 +1402,7 @@
             map = new HashMap(1);
             map.put("target",substitute(listOfMaps,"<xsl:value-of 
select="$target"/>"));
             listOfMaps.add(map);
  +          this.dumpParameters(listOfMaps);
           </xsl:if>
            Class[] argTypes = new Class[] {StreamPipeline.class, EventPipeline.class, 
List.class, Environment.class, String.class, Boolean.TYPE};
            Object[] argValues = new Object[] {pipeline, eventPipeline, listOfMaps, 
environment, cocoon_view, new Boolean(internalRequest)};
  @@ -1613,11 +1624,6 @@
         </xsl:call-template>
         }
       </xsl:for-each>
  -  </xsl:template>
  -
  -  <!-- nice for debugging: print all kown sitemap parameters to log -->
  -  <xsl:template match="map:dump-parameters">
  -    this.dumpParameters(listOfMaps);
     </xsl:template>
   
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]