You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/27 16:11:57 UTC

cvs commit: cocoon-2.2/src/java/org/apache/cocoon/matching WildcardURIMatcher.java

unico       2003/12/27 07:11:57

  Modified:    src/java/org/apache/cocoon/sitemap NotifyingGenerator.java
                        LinkTranslator.java LinkGatherer.java
                        ContentAggregator.java
               src/java/org/apache/cocoon/generation FileGenerator.java
               src/java/org/apache/cocoon/reading ResourceReader.java
               src/java/org/apache/cocoon/transformation
                        TraxTransformer.java
               src/java/org/apache/cocoon/serialization XMLSerializer.java
               src/java/org/apache/cocoon/components/pipeline/impl
                        NonCachingProcessingPipeline.java
               src/java/org/apache/cocoon/matching WildcardURIMatcher.java
  Log:
  Fortress meta infos
  
  Revision  Changes    Path
  1.5       +8 -2      cocoon-2.2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java
  
  Index: NotifyingGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NotifyingGenerator.java	6 Dec 2003 21:22:08 -0000	1.4
  +++ NotifyingGenerator.java	27 Dec 2003 15:11:57 -0000	1.5
  @@ -57,6 +57,7 @@
   import org.apache.cocoon.components.notification.Notifying;
   import org.apache.cocoon.components.notification.Notifier;
   import org.apache.cocoon.generation.AbstractGenerator;
  +import org.apache.cocoon.generation.Generator;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.Constants;
  @@ -70,8 +71,13 @@
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:proyal@managingpartners.com">Peter Royal</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Generator
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=notifying-generator
    */
  -public class NotifyingGenerator extends AbstractGenerator {
  +public class NotifyingGenerator extends AbstractGenerator implements Generator {
   
       /**
        * The <code>Notification</code> to report.
  
  
  
  1.6       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/sitemap/LinkTranslator.java
  
  Index: LinkTranslator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/LinkTranslator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LinkTranslator.java	8 Dec 2003 10:23:46 -0000	1.5
  +++ LinkTranslator.java	27 Dec 2003 15:11:57 -0000	1.6
  @@ -69,6 +69,11 @@
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Transformer
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=link-translator
    */
   public class LinkTranslator extends ExtendedXLinkPipe implements Transformer, CacheableProcessingComponent {
       
  
  
  
  1.8       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/sitemap/LinkGatherer.java
  
  Index: LinkGatherer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/LinkGatherer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LinkGatherer.java	8 Dec 2003 10:23:46 -0000	1.7
  +++ LinkGatherer.java	27 Dec 2003 15:11:57 -0000	1.8
  @@ -70,6 +70,11 @@
   /**
    * @author <a href="mailto:uv@upaya.co.uk">Upayavira</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Transformer
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=link-gatherer
    */
   public class LinkGatherer extends ExtendedXLinkPipe implements Transformer, CacheableProcessingComponent {
       private List links;
  
  
  
  1.8       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
  
  Index: ContentAggregator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContentAggregator.java	6 Dec 2003 21:22:08 -0000	1.7
  +++ ContentAggregator.java	27 Dec 2003 15:11:57 -0000	1.8
  @@ -81,6 +81,11 @@
    * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Generator
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=content-aggregator
    */
   public class ContentAggregator
   extends ContentHandlerWrapper
  
  
  
  1.9       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/generation/FileGenerator.java
  
  Index: FileGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/FileGenerator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FileGenerator.java	6 Dec 2003 21:22:08 -0000	1.8
  +++ FileGenerator.java	27 Dec 2003 15:11:57 -0000	1.9
  @@ -73,6 +73,11 @@
    *         (Apache Software Foundation)
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Generator
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=file-generator
    */
   public class FileGenerator extends ServiceableGenerator
   implements CacheableProcessingComponent {
  
  
  
  1.5       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/reading/ResourceReader.java
  
  Index: ResourceReader.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/reading/ResourceReader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ResourceReader.java	6 Dec 2003 21:22:10 -0000	1.4
  +++ ResourceReader.java	27 Dec 2003 15:11:57 -0000	1.5
  @@ -97,6 +97,11 @@
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Reader
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=resource-reader
    */
   public class ResourceReader extends AbstractReader implements CacheableProcessingComponent {
   
  
  
  
  1.12      +6 -1      cocoon-2.2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
  
  Index: TraxTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TraxTransformer.java	6 Dec 2003 21:22:07 -0000	1.11
  +++ TraxTransformer.java	27 Dec 2003 15:11:57 -0000	1.12
  @@ -164,6 +164,11 @@
    * @author <a href="mailto:marbut@hplb.hpl.hp.com">Mark H. Butler</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Transformer
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=trax-transformer
    */
   public class TraxTransformer extends AbstractTransformer
   implements Transformer, Composable, Configurable, CacheableProcessingComponent, Disposable {
  
  
  
  1.2       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/serialization/XMLSerializer.java
  
  Index: XMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/serialization/XMLSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLSerializer.java	9 Mar 2003 00:09:37 -0000	1.1
  +++ XMLSerializer.java	27 Dec 2003 15:11:57 -0000	1.2
  @@ -64,6 +64,11 @@
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Serializer
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=xml-serializer
    */
   
   public class XMLSerializer extends AbstractTextSerializer {
  
  
  
  1.2       +8 -2      cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/NonCachingProcessingPipeline.java
  
  Index: NonCachingProcessingPipeline.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/NonCachingProcessingPipeline.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NonCachingProcessingPipeline.java	9 Mar 2003 00:09:08 -0000	1.1
  +++ NonCachingProcessingPipeline.java	27 Dec 2003 15:11:57 -0000	1.2
  @@ -51,13 +51,19 @@
   package org.apache.cocoon.components.pipeline.impl;
   
   import org.apache.cocoon.components.pipeline.AbstractProcessingPipeline;
  +import org.apache.cocoon.components.pipeline.ProcessingPipeline;
   
   /**
    * Thi is the implementation of the non caching processing pipeline
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=ProcessingPipeline
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=noncaching-pipeline
    */
   public class NonCachingProcessingPipeline
  -       extends AbstractProcessingPipeline {
  +       extends AbstractProcessingPipeline implements ProcessingPipeline {
   }
  
  
  
  1.2       +6 -1      cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java
  
  Index: WildcardURIMatcher.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WildcardURIMatcher.java	9 Mar 2003 00:09:34 -0000	1.1
  +++ WildcardURIMatcher.java	27 Dec 2003 15:11:57 -0000	1.2
  @@ -60,6 +60,11 @@
    *
    * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
    * @version CVS $Id$
  + * 
  + * @avalon.component
  + * @avalon.service type=Matcher
  + * @x-avalon.lifestyle type=pooled
  + * @x-avalon.info name=wildcard-uri-matcher
    */
   public class WildcardURIMatcher extends AbstractWildcardMatcher
   {