cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/sitemap sitemap.roles
Date Tue, 12 Jun 2001 16:21:43 GMT
bloritsch    01/06/12 09:21:42

  Modified:    .        Tag: cocoon_20_branch changes.xml
               src/org/apache/cocoon Tag: cocoon_20_branch cocoon.roles
               src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: cocoon_20_branch sitemap.xsl
               src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
                        sitemap.roles
  Log:
  fixed spelling for Vadim in changes.xml, and fixed the recursive map:match error.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.5   +2 -2      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.2.2.4
  retrieving revision 1.2.2.5
  diff -u -r1.2.2.4 -r1.2.2.5
  --- changes.xml	2001/06/12 15:44:56	1.2.2.4
  +++ changes.xml	2001/06/12 16:21:20	1.2.2.5
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.2.2.4 2001/06/12 15:44:56 giacomo Exp $
  +  $Id: changes.xml,v 1.2.2.5 2001/06/12 16:21:20 bloritsch Exp $
   -->
   
   <changes title="History of Changes">
  @@ -30,7 +30,7 @@
     </action>
     <action dev="BL" type="fix">
       Fixed component release errors in ContentAggregator (thanks to Vadim
  -    Gratsenko for the patch).  Also fixed potential race conditions in
  +    Gritsenko for the patch).  Also fixed potential race conditions in
       the ComponentManager architecture in Avalon Excalibur.
     </action>
     <action dev="GP" type="add">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.4   +0 -4      xml-cocoon2/src/org/apache/cocoon/cocoon.roles
  
  Index: cocoon.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
  retrieving revision 1.6.2.3
  retrieving revision 1.6.2.4
  diff -u -r1.6.2.3 -r1.6.2.4
  --- cocoon.roles	2001/06/07 21:13:37	1.6.2.3
  +++ cocoon.roles	2001/06/12 16:21:27	1.6.2.4
  @@ -40,10 +40,6 @@
          shorthand="classloader"
          default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
   
  - <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
  -       shorthand="sax-connector"
  -       default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
  -
    <role name="org.apache.cocoon.components.image.ImageEncoderSelector"
          shorthand="image-encoder"/>
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.8  +12 -11    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.7
  retrieving revision 1.11.2.8
  diff -u -r1.11.2.7 -r1.11.2.8
  --- sitemap.xsl	2001/06/12 16:02:31	1.11.2.7
  +++ sitemap.xsl	2001/06/12 16:21:33	1.11.2.8
  @@ -127,7 +127,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.7 2001/06/12 16:02:31 dims Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.11.2.8 2001/06/12 16:21:33 bloritsch 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"/>";
  @@ -192,6 +192,7 @@
                 </xsl:call-template>
               </xsl:variable>
               <!-- produce a definition for this test string -->
  +            // The generated selector for a pattern of "<xsl:value-of select="@test"/>"
               <xsl:value-of select="XSLTFactoryLoader:getClassSource($factory-loader,string($src),string($selector-name),string(@test),$config)"/>
             </xsl:for-each>
           </xsl:if>
  @@ -461,8 +462,8 @@
                     <xsl:with-param name="default"><xsl:value-of select="/map:sitemap/map:components/map:matchers/@default"/></xsl:with-param>
                   </xsl:call-template>
                 </xsl:variable>
  -              // method for handling "<xsl:value-of select="@pattern"/>" 
  -              if(<xsl:value-of select="$matcher-type"/>Match<xsl:value-of select="generate-id(.)"/>(

  +              // method for handling "<xsl:value-of select="@pattern"/>"
  +              if(<xsl:value-of select="$matcher-type"/>Match<xsl:value-of select="generate-id(.)"/>(
                                                       environment, pipeline, eventPipeline,
                                                       internalRequest,listOfMaps))
                   return true;
  @@ -477,9 +478,9 @@
                 <xsl:when test="(./map:handle-errors)">
                   getLogger().warn("Error, try to process the error page", e);
                   try {
  -                  return error_process_<xsl:value-of select="$pipeline-position"/>
(environment, 
  -                                                                                    environment.getObjectModel(),

  -                                                                                    e,

  +                  return error_process_<xsl:value-of select="$pipeline-position"/>
(environment,
  +                                                                                    environment.getObjectModel(),
  +                                                                                    e,
                                                                                       internalRequest);
                   } catch (Exception ex) {
                     getLogger().warn("Sitemap Error Process", ex);
  @@ -609,7 +610,7 @@
   
   
       <!-- this is the actual code produced -->
  -        // handle embedded match for "<xsl:value-of select="@pattern"/>"
  +    // handling "<xsl:value-of select="@pattern"/>"
           if ((map = <xsl:value-of select="$matcher-name"/>) != null) {
             getLogger().debug("Matched <xsl:value-of select="$matcher-type"/> <xsl:value-of
select="$matcher-name2"/>");
             listOfMaps.add (map);
  @@ -696,11 +697,11 @@
   
   
       <!-- this is the actual code produced -->
  -    // method for handling "<xsl:value-of select="@pattern"/>" 
  +    // method for handling "<xsl:value-of select="@pattern"/>"
       private boolean <xsl:value-of select="$matcher-type"/>Match<xsl:value-of select="generate-id(.)"/>(
  -                                    Environment environment, StreamPipeline pipeline, 
  +                                    Environment environment, StreamPipeline pipeline,
                                       EventPipeline eventPipeline,
  -                                    boolean internalRequest, List listOfMaps) 
  +                                    boolean internalRequest, List listOfMaps)
               throws ConnectionResetException, ResourceNotFoundException, Exception {
           Map map;
           Parameters param;
  @@ -708,7 +709,7 @@
           SitemapRedirector redirector = new SitemapRedirector(environment);
           String cocoon_view = environment.getView();
           String cocoon_action = environment.getAction();
  -        
  +
           if ((map = <xsl:value-of select="$matcher-name"/>) != null) {
             getLogger().debug("Matched <xsl:value-of select="$matcher-type"/> <xsl:value-of
select="$matcher-name2"/>");
             listOfMaps.add (map);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +4 -0      xml-cocoon2/src/org/apache/cocoon/sitemap/sitemap.roles
  
  Index: sitemap.roles
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/sitemap.roles,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- sitemap.roles	2001/06/08 17:53:34	1.1.2.4
  +++ sitemap.roles	2001/06/12 16:21:38	1.1.2.5
  @@ -9,6 +9,10 @@
          shorthand="event-pipeline"
          default-class="org.apache.cocoon.components.pipeline.NonCachingEventPipeline"/>
   
  + <role name="org.apache.cocoon.components.saxconnector.SAXConnector"
  +       shorthand="sax-connector"
  +       default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
  +
    <role name="org.apache.cocoon.acting.ActionSelector"
          shorthand="action"
          default-class="org.apache.cocoon.sitemap.SitemapComponentSelector"/>
  
  
  

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