cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java sitemap.xsl
Date Mon, 26 Nov 2001 14:39:41 GMT
haul        01/11/26 06:39:40

  Modified:    webapp   sitemap.xmap
               src/org/apache/cocoon/sitemap AbstractSitemap.java
               src/org/apache/cocoon/components/language/markup/sitemap/java
                        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
  1.65      +0 -3      xml-cocoon2/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- sitemap.xmap	2001/11/26 11:57:25	1.64
  +++ sitemap.xmap	2001/11/26 14:39:40	1.65
  @@ -265,7 +265,6 @@
     </map:resource>
   
     <map:resource name="dynamic-page1">
  -     <map:dump-parameters/>
        <!-- print all current sitemap parameters to log -->
        <map:act type="session-state">
           <map:parameter name="new-state" value="{../0}"/>
  @@ -277,7 +276,6 @@
              belongs conceptually still to the parent element while all other
              nested tags are, well, nested.
           -->
  -          <map:dump-parameters/>
           <map:redirect-to resource="dynamic-page" target="{../target}/state{../../../0}{../../0}"/>
        </map:act>
     </map:resource>
  @@ -778,7 +776,6 @@
   
      <!-- =========================== Dynamic ================================ -->
      <map:match pattern="xsp/*">
  -    <map:dump-parameters/>
       <map:generate type="serverpages" src="docs/samples/xsp/{1}.xsp"/>
       <map:transform src="stylesheets/dynamic-page2html.xsl">
           <map:parameter name="view-source" value="docs/samples/xsp/{1}.xsp"/>
  
  
  
  1.21      +2 -3      xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
  
  Index: AbstractSitemap.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- AbstractSitemap.java	2001/11/26 09:19:51	1.20
  +++ AbstractSitemap.java	2001/11/26 14:39:40	1.21
  @@ -48,7 +48,7 @@
    * Base class for generated <code>Sitemap</code> classes
    *
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  - * @version CVS $Revision: 1.20 $ $Date: 2001/11/26 09:19:51 $
  + * @version CVS $Revision: 1.21 $ $Date: 2001/11/26 14:39:40 $
    */
   public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap, Disposable,
ThreadSafe {
       private Context context;
  @@ -337,8 +337,7 @@
                       Iterator keys = map.keySet().iterator();
                       while (keys.hasNext()) {
                           String key = (String)keys.next();
  -                        sb.append(path)
  -                            .append("PARAM: '").append(key)
  +                        sb.append("PARAM: '").append(path).append(key)
                               .append("' VALUE: '").append(map.get(key)).append("'\n");
                       }
                       path="../"+path;
  
  
  
  1.49      +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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- sitemap.xsl	2001/11/26 09:19:51	1.48
  +++ sitemap.xsl	2001/11/26 14:39:40	1.49
  @@ -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.48 2001/11/26 09:19:51 haul Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.49 2001/11/26 14:39:40 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:     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