cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: cocoon-2.1/src/webapp sitemap.xmap
Date Thu, 13 Mar 2003 05:58:31 GMT
jefft       2003/03/12 21:58:30

  Modified:    src/java/org/apache/cocoon/components/pipeline/impl
                        CachingPointProcessingPipeline.java
                        CachingProcessingPipeline.java
               src/java/org/apache/cocoon/transformation
                        I18nTransformer.java
               src/webapp sitemap.xmap
  Log:
  Spelling: 'cachable' to 'cacheable'.  Authorities:
   - The Google oracle spake thusly: "did you mean cacheable?"
   - o.a.c.caching.Cacheable.
  
  Revision  Changes    Path
  1.2       +10 -10    cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
  
  Index: CachingPointProcessingPipeline.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CachingPointProcessingPipeline.java	9 Mar 2003 00:09:08 -0000	1.1
  +++ CachingPointProcessingPipeline.java	13 Mar 2003 05:58:28 -0000	1.2
  @@ -205,7 +205,7 @@
       }
   
       /**
  -     * Cache longest cachable path plus cache points.
  +     * Cache longest cacheable path plus cache points.
        */
       protected void cacheResults(Environment environment, OutputStream os)  throws Exception
{
   
  @@ -332,8 +332,8 @@
                           }
   
   
  -                // Serializer is not cachable,
  -            // but we  have the longest cachable key. Do default longest key caching
  +                // Serializer is not cacheable,
  +            // but we  have the longest cacheable key. Do default longest key caching
                           if (localXMLSerializer != null) {
                               if (cacheableTransformerCount == 0) {
                                   next = new XMLTeePipe(next, localXMLSerializer);
  @@ -351,7 +351,7 @@
                       next = super.lastConsumer;
   
   
  -            // if the serializer is not cachable, but all the transformers are:
  +            // if the serializer is not cacheable, but all the transformers are:
               // (this is default longest key caching)
                       if (localXMLSerializer != null) {
                           next = new XMLTeePipe(next, localXMLSerializer);
  @@ -359,7 +359,7 @@
                           localXMLSerializer = null;
                       }
   
  -            // else if the serializer is cachable and has cocoon views
  +            // else if the serializer is cacheable and has cocoon views
                       else if ((currentTransformerIndex == this.firstNotCacheableTransformerIndex)
&&
                               this.nextIsCachePoint) {
                           cachePointXMLSerializer = ((XMLSerializer)this.manager.lookup(
XMLSerializer.ROLE ));
  @@ -395,8 +395,8 @@
                                   }
                               }
   
  -                    // Serializer is not cachable,
  -                // but we  have the longest cachable key. Do default longest key caching
  +                    // Serializer is not cacheable,
  +                // but we  have the longest cacheable key. Do default longest key caching
                               if (localXMLSerializer != null && !(prev instanceof
XMLDeserializer)
                                       && cacheableTransformerCount == this.firstNotCacheableTransformerIndex)
{
                                   next = new XMLTeePipe(next, localXMLSerializer);
  @@ -410,14 +410,14 @@
                       }
                       next = super.lastConsumer;
   
  -            //*all* the transformers are cachable, but the serializer is not!! this is
longest key
  +            //*all* the transformers are cacheable, but the serializer is not!! this is
longest key
                       if (localXMLSerializer != null && !(prev instanceof XMLDeserializer))
{
                           next = new XMLTeePipe(next, localXMLSerializer);
                           this.xmlSerializerArray.add(localXMLSerializer);
                           localXMLSerializer = null;
   
               }
  -            //	else the serializer is cachable but has views
  +            //	else the serializer is cacheable but has views
               else if (this.nextIsCachePoint && !(prev instanceof XMLDeserializer)
&&
                               cacheableTransformerCount == this.firstNotCacheableTransformerIndex)
{
                           cachePointXMLSerializer = ((XMLSerializer)this.manager.lookup(
XMLSerializer.ROLE ));
  
  
  
  1.2       +2 -2      cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
  
  Index: CachingProcessingPipeline.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CachingProcessingPipeline.java	9 Mar 2003 00:09:08 -0000	1.1
  +++ CachingProcessingPipeline.java	13 Mar 2003 05:58:28 -0000	1.2
  @@ -78,7 +78,7 @@
       extends AbstractCachingProcessingPipeline {
   
       /**
  -    * Cache longest cachable key
  +    * Cache longest cacheable key
       */
       protected void cacheResults(Environment environment, OutputStream os)  throws Exception
{
           if (this.toCacheKey != null) {
  
  
  
  1.2       +4 -4      cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
  
  Index: I18nTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- I18nTransformer.java	9 Mar 2003 00:09:39 -0000	1.1
  +++ I18nTransformer.java	13 Mar 2003 05:58:29 -0000	1.2
  @@ -844,7 +844,7 @@
       }
   
       /**
  -     * Implemenation of CachableProcessingComponents.
  +     * Implemenation of CacheableProcessingComponents.
        * Generates unique key for the current locale.
        */
       public java.io.Serializable generateKey() {
  @@ -852,9 +852,9 @@
       }
   
       /**
  -     * Implementation of CachableProcessingComponent.
  +     * Implementation of CacheableProcessingComponent.
        * Generates validity object for this transformer or <code>null</code>
  -     * if this instance is not cachable.
  +     * if this instance is not cacheable.
        */
       public SourceValidity generateValidity() {
           return I18N_NOP_VALIDITY;
  
  
  
  1.4       +3 -3      cocoon-2.1/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/webapp/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	13 Mar 2003 04:27:59 -0000	1.3
  +++ sitemap.xmap	13 Mar 2003 05:58:30 -0000	1.4
  @@ -237,7 +237,7 @@
         |   The non caching implementation of cocoon pipelines.
         | 
         | CACHING:
  -      |   Traditional longest cachable key caching.
  +      |   Traditional longest cacheable key caching.
         | 
         | CACHING-POINT:
         |   The caching-point pipeline implements an extended             
  @@ -247,7 +247,7 @@
         | 
         | The autoCachingPoint algorithim (if enabled) will automatically
         | cache common elements of the pipeline currently being processed - as well
  -      | as the entire cachable pipeline according to the "longest cachable key"
  +      | as the entire cacheable pipeline according to the "longest cacheable key"
         | algorithm.
         | 
         | Consider the following simple pipeline, where generator G is labelled with
  @@ -257,7 +257,7 @@
         | |__ T -  S(pdf)
         | 
         | If cocoon-view=html, then the caching-point algorithm will not only cache 
  -      | the longest cachable path, which would be GTS(html) but also the
  +      | the longest cacheable path, which would be GTS(html) but also the
         | *common element* which in this case would be the results from G. If the
         | next request to this pipeline was cocoon-view=pdf, then there would be no
         | need to invoke the generator a second time, as it's value has already been
  
  
  

Mime
View raw message