joerg 2004/01/06 05:39:11
Modified: src/blocks/lucene/java/org/apache/cocoon/components/search
SimpleLuceneCocoonIndexerImpl.java
Log:
Composable => Serviceable
Revision Changes Path
1.8 +13 -13
cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java
Index: SimpleLuceneCocoonIndexerImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleLuceneCocoonIndexerImpl.java 6 Jan 2004 12:51:54 -0000
1.7
+++ SimpleLuceneCocoonIndexerImpl.java 6 Jan 2004 13:39:11 -0000
1.8
@@ -51,13 +51,13 @@
package org.apache.cocoon.components.search;
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.components.crawler.CocoonCrawler;
import org.apache.lucene.analysis.Analyzer;
@@ -86,7 +86,7 @@
* @version CVS $Id$
*/
public class SimpleLuceneCocoonIndexerImpl extends AbstractLogEnabled
- implements LuceneCocoonIndexer, Configurable, Composable, Disposable
+ implements LuceneCocoonIndexer, Configurable, Serviceable,
Disposable
{
/**
@@ -122,9 +122,9 @@
public final static int MERGE_FACTOR_DEFAULT = 10;
/**
- * The component manager for looking up components used.
+ * The service manager for looking up components used.
*/
- protected ComponentManager manager = null;
+ protected ServiceManager manager = null;
protected Analyzer analyzer;
// private String analyzerClassnameDefault = ANALYZER_CLASSNAME_DEFAULT;
@@ -170,13 +170,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 used by this component
- * @exception ComponentException is never thrown
+ * @exception ServiceException is never thrown
*/
- public void compose(ComponentManager manager) throws ComponentException {
+ public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
@@ -244,8 +244,8 @@
writer.optimize();
} catch (IOException ioe) {
throw new ProcessingException("IOException in index()", ioe);
- } catch (ComponentException ce) {
- throw new ProcessingException("ComponentException in index()",
ce);
+ } catch (ServiceException se) {
+ throw new ProcessingException("Could not lookup service in
index()", se);
} finally {
if (writer != null) {
try {
