cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search SimpleLuceneCocoonSearcherImpl.java
Date Tue, 06 Jan 2004 13:40:25 GMT
joerg       2004/01/06 05:40:25

  Modified:    src/blocks/lucene/java/org/apache/cocoon/components/search
                        SimpleLuceneCocoonSearcherImpl.java
  Log:
  Composable => Serviceable
  query parser classname unused - can it be removed?
  
  Revision  Changes    Path
  1.4       +15 -15    cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java
  
  Index: SimpleLuceneCocoonSearcherImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleLuceneCocoonSearcherImpl.java	12 Dec 2003 08:14:41 -0000	1.3
  +++ SimpleLuceneCocoonSearcherImpl.java	6 Jan 2004 13:40:25 -0000	1.4
  @@ -51,13 +51,13 @@
   package org.apache.cocoon.components.search;
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.lucene.analysis.Analyzer;
  @@ -95,7 +95,7 @@
    * @version CVS $Id$
    */
   public class SimpleLuceneCocoonSearcherImpl extends AbstractLogEnabled
  -         implements LuceneCocoonSearcher, Configurable, Composable, Disposable, Recyclable
  +         implements LuceneCocoonSearcher, Configurable, Serviceable, Disposable, Recyclable
   {
   
       /**
  @@ -191,15 +191,15 @@
       protected final static String DIRECTORY_DEFAULT = null;
   
       /**
  -     * The component manager instance
  +     * The service manager instance
        *
        */
  -    protected ComponentManager manager = null;
  +    protected ServiceManager manager = null;
   
       private String analyzerClassnameDefault = ANALYZER_CLASSNAME_DEFAULT;
       private String defaultSearchFieldDefault = DEFAULT_SEARCH_FIELD_DEFAULT;
       private String defaultQueryDefault = DEFAULT_QUERY_DEFAULT;
  -    private String queryparserClassnameDefault = QUERYPARSER_CLASSNAME_DEFAULT;
  +//    private String queryparserClassnameDefault = QUERYPARSER_CLASSNAME_DEFAULT;
       private String directoryDefault = DIRECTORY_DEFAULT;
   
       /**
  @@ -306,7 +306,7 @@
                   defaultQueryDefault = value;
               }
           }
  -
  +/*
           child = conf.getChild(QUERYPARSER_CLASSNAME_CONFIG, false);
           if (child != null) {
               value = child.getValue(QUERYPARSER_CLASSNAME_DEFAULT);
  @@ -314,7 +314,7 @@
                   queryparserClassnameDefault = value;
               }
           }
  -
  +*/
           child = conf.getChild(DIRECTORY_CONFIG, false);
           if (child != null) {
               value = child.getValue(DIRECTORY_DEFAULT);
  @@ -331,13 +331,13 @@
   
   
       /**
  -     * Set the current <code>ComponentManager</code> instance used by this
  -     * <code>Composable</code>.
  +     * Set the current <code>ServiceManager</code> instance used by this
  +     * <code>Serviceable</code>.
        *
  -     * @param  manager                 of this component
  -     * @exception  ComponentException  is never thrown
  +     * @param manager  manager of this component
  +     * @exception  ServiceException  is never thrown
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
       }
   
  
  
  

Mime
View raw message