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

[giacomo]

giacomo     01/12/29 03:49:45

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        sitemap.xsl
  Added:       lib      avalon-framework-20011229.jar
  Removed:     lib      avalon-framework-4.1.1.jar
  Log:
  added new Parameters class to avalon-framework.jar to have a
  thread safe EMPTY_PARAMETERS in the sitemap as suggested by Marcus Crafter
  
  Revision  Changes    Path
  1.1                  xml-cocoon2/lib/avalon-framework-20011229.jar
  
        <<Binary file>>
  
  
  1.58      +9 -12     
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.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- sitemap.xsl       28 Dec 2001 19:16:19 -0000      1.57
  +++ sitemap.xsl       29 Dec 2001 11:49:44 -0000      1.58
  @@ -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.57 2001/12/28 19:16:19 bloritsch Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.58 2001/12/29 11:49:44 giacomo 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"/>";
  @@ -135,9 +135,6 @@
           dateCreated = <xsl:value-of select="@creation-date"/>L;
         }
   
  -      /** An empty &lt;code&gt;Parameter&lt;/code&gt; used to pass to the sitemap 
components */
  -      private Parameters emptyParam = new Parameters();
  -
         /** HashMap relating labels to view names */
         private HashMap view_label_map = new HashMap(<xsl:value-of 
select="count(/map:sitemap/map:views/map:view[@from-label])"/>);
   
  @@ -740,7 +737,7 @@
                 List listOfMaps = (List)(new ArrayList());
                 Map map;
                 Parameters param;
  -              eventPipeline.setGenerator ("!error-notifier!", e.getMessage(), 
emptyParam, e);
  +              eventPipeline.setGenerator ("!error-notifier!", e.getMessage(), 
Parameters.EMPTY_PARAMETERS, e);
                 <xsl:apply-templates select="./*"/>
               } catch (Exception ex) {
                 if (getLogger().isErrorEnabled()) getLogger().error("error notifier 
barfs", ex);
  @@ -811,7 +808,7 @@
             <xsl:text>param</xsl:text>
           </xsl:when>
           <xsl:otherwise>
  -          <xsl:text>emptyParam</xsl:text>
  +          <xsl:text>Parameters.EMPTY_PARAMETERS</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
  @@ -900,7 +897,7 @@
             <xsl:text>param</xsl:text>
           </xsl:when>
           <xsl:otherwise>
  -          <xsl:text>emptyParam</xsl:text>
  +          <xsl:text>Parameters.EMPTY_PARAMETERS</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
  @@ -984,7 +981,7 @@
             <xsl:text>param</xsl:text>
           </xsl:when>
           <xsl:otherwise>
  -          <xsl:text>emptyParam</xsl:text>
  +          <xsl:text>Parameters.EMPTY_PARAMETERS</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
  @@ -1100,7 +1097,7 @@
             <xsl:text>param</xsl:text>
           </xsl:when>
           <xsl:otherwise>
  -          <xsl:text>emptyParam</xsl:text>
  +          <xsl:text>Parameters.EMPTY_PARAMETERS</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
  @@ -1246,7 +1243,7 @@
             <xsl:text>param</xsl:text>
           </xsl:when>
           <xsl:otherwise>
  -          <xsl:text>emptyParam</xsl:text>
  +          <xsl:text>Parameters.EMPTY_PARAMETERS</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
  @@ -1699,7 +1696,7 @@
           </xsl:for-each>
           // performing link translation
           if (environment.getObjectModel().containsKey(Constants.LINK_OBJECT)) {
  -            eventPipeline.addTransformer ("!link-translator!", null, emptyParam);
  +            eventPipeline.addTransformer ("!link-translator!", null, 
Parameters.EMPTY_PARAMETERS);
           }
         </xsl:if>
       </xsl:if>
  @@ -1739,7 +1736,7 @@
             <xsl:text>param</xsl:text>
           </xsl:when>
           <xsl:otherwise>
  -          <xsl:text>emptyParam</xsl:text>
  +          <xsl:text>Parameters.EMPTY_PARAMETERS</xsl:text>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
  
  
  

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