cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/source CocoonSourceFactory.java SitemapSource.java
Date Thu, 20 Dec 2001 16:13:19 GMT
sylvain     01/12/20 08:13:19

  Modified:    src/org/apache/cocoon/components/source
                        CocoonSourceFactory.java SitemapSource.java
  Log:
  Replaced Sitemap by Processor : only this class level is really needed and using Sitemap
forbids its use with a TreeProcessor.
  
  Revision  Changes    Path
  1.8       +9 -9      xml-cocoon2/src/org/apache/cocoon/components/source/CocoonSourceFactory.java
  
  Index: CocoonSourceFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/CocoonSourceFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CocoonSourceFactory.java	2001/10/11 07:28:19	1.7
  +++ CocoonSourceFactory.java	2001/12/20 16:13:18	1.8
  @@ -13,7 +13,7 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.Source;
  -import org.apache.cocoon.sitemap.Sitemap;
  +import org.apache.cocoon.Processor;
   
   import java.io.IOException;
   import java.net.MalformedURLException;
  @@ -25,23 +25,23 @@
    * as it needs the current <code>Sitemap</code> as input.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2001/10/11 07:28:19 $
  + * @version CVS $Revision: 1.8 $ $Date: 2001/12/20 16:13:18 $
    */
   
   public final class CocoonSourceFactory
   extends AbstractLoggable
   implements SourceFactory {
   
  -    /** The sitemap */
  -    private Sitemap    sitemap;
  +    /** The processor */
  +    private Processor    processor;
   
       /** The component manager */
       private ComponentManager  manager;
   
  -    public CocoonSourceFactory(Sitemap sitemap,
  -                               ComponentManager sitemapComponentManager) {
  -        this.sitemap = sitemap;
  -        this.manager = sitemapComponentManager;
  +    public CocoonSourceFactory(Processor processor,
  +                               ComponentManager manager) {
  +        this.processor = processor;
  +        this.manager = manager;
       }
   
       /**
  @@ -53,7 +53,7 @@
               throw new ProcessingException("CocoonSourceFactory: environment is required.");
           return new SitemapSource(environment,
                                    this.manager,
  -                                 this.sitemap,
  +                                 this.processor,
                                    location,
                                    this.getLogger());
       }
  
  
  
  1.26      +2 -3      xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java
  
  Index: SitemapSource.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/source/SitemapSource.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- SitemapSource.java	2001/10/25 19:32:59	1.25
  +++ SitemapSource.java	2001/12/20 16:13:18	1.26
  @@ -23,7 +23,6 @@
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
   import org.apache.cocoon.serialization.Serializer;
  -import org.apache.cocoon.sitemap.Sitemap;
   import org.apache.cocoon.sitemap.SitemapComponentSelector;
   import org.apache.cocoon.util.HashUtil;
   import org.apache.cocoon.xml.AbstractXMLConsumer;
  @@ -46,7 +45,7 @@
    * Description of a source which is defined by a pipeline.
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.25 $ $Date: 2001/10/25 19:32:59 $
  + * @version CVS $Revision: 1.26 $ $Date: 2001/12/20 16:13:18 $
    */
   
   public final class SitemapSource
  @@ -94,7 +93,7 @@
        */
       public SitemapSource(Environment      env,
                            ComponentManager manager,
  -                         Sitemap          sitemap,
  +                         Processor        sitemap,
                            String           uri,
                            Logger           logger)
       throws IOException, ProcessingException {
  
  
  

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