cutting 2002/07/17 15:11:34
Modified: . build.xml
src/java/org/apache/lucene/search Searchable.java
Searcher.java
src/test/org/apache/lucene/search TestRemoteSearchable.java
Added: src/java/org/apache/lucene/search RemoteSearchable.java
Removed: src/java/org/apache/lucene/search RemoteSearchableImpl.java
Log:
Renamed a new class and updated some javadoc.
Revision Changes Path
1.29 +1 -1 jakarta-lucene/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-lucene/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 17 Jul 2002 21:54:38 -0000 1.28
+++ build.xml 17 Jul 2002 22:11:33 -0000 1.29
@@ -112,7 +112,7 @@
<classpath refid="classpath"/>
</javac>
- <rmic classname="org.apache.lucene.search.RemoteSearchableImpl"
+ <rmic classname="org.apache.lucene.search.RemoteSearchable"
base="${build.classes}">
<classpath refid="classpath"/>
</rmic>
1.3 +5 -1 jakarta-lucene/src/java/org/apache/lucene/search/Searchable.java
Index: Searchable.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/Searchable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Searchable.java 17 Jul 2002 21:54:38 -0000 1.2
+++ Searchable.java 17 Jul 2002 22:11:33 -0000 1.3
@@ -59,7 +59,11 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
-/** The interface for search implementations. */
+/** The interface for search implementations.
+ *
+ * <p>Implementations provide search over a single index, over multiple
+ * indices, and over indices on remote servers.
+ */
public interface Searchable extends java.rmi.Remote {
/** Lower-level search API.
*
1.5 +2 -4 jakarta-lucene/src/java/org/apache/lucene/search/Searcher.java
Index: Searcher.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/Searcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Searcher.java 17 Jul 2002 17:38:04 -0000 1.4
+++ Searcher.java 17 Jul 2002 22:11:33 -0000 1.5
@@ -59,10 +59,8 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
-/** The abstract base class for search implementations.
- *
- * <p>Subclasses implement search over a single index, over multiple indices,
- * and over indices on remote servers.
+/** An abstract base class for search implementations.
+ * Implements some common utility methods.
*/
public abstract class Searcher implements Searchable {
1.1
jakarta-lucene/src/java/org/apache/lucene/search/RemoteSearchable.java
Index: RemoteSearchable.java
===================================================================
package org.apache.lucene.search;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Lucene" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Lucene", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import java.rmi.Naming;
import java.rmi.RemoteException;
import java.rmi.RMISecurityManager;
import java.rmi.server.UnicastRemoteObject;
/** A remote searchable implementation. */
public class RemoteSearchable
extends UnicastRemoteObject
implements Searchable {
private Searchable local;
/** Constructs and exports a remote searcher. */
public RemoteSearchable(Searchable local) throws RemoteException {
super();
this.local = local;
}
public void search(Query query, Filter filter, HitCollector results)
throws IOException {
local.search(query, filter, results);
}
public void close() throws IOException {
local.close();
}
public int docFreq(Term term) throws IOException {
return local.docFreq(term);
}
public int maxDoc() throws IOException {
return local.maxDoc();
}
public TopDocs search(Query query, Filter filter, int n) throws IOException {
return local.search(query, filter, n);
}
public Document doc(int i) throws IOException {
return local.doc(i);
}
/** Exports a searcher for the index in args[0] named
* "//localhost/Searchable". */
public static void main(String args[]) throws Exception {
// create and install a security manager
if (System.getSecurityManager() == null) {
System.setSecurityManager(new RMISecurityManager());
}
Searchable local = new IndexSearcher(args[0]);
RemoteSearchable impl = new RemoteSearchable(local);
// bind the implementation to "Searchable"
Naming.rebind("//localhost/Searchable", impl);
}
}
1.2 +1 -3
jakarta-lucene/src/test/org/apache/lucene/search/TestRemoteSearchable.java
Index: TestRemoteSearchable.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/test/org/apache/lucene/search/TestRemoteSearchable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRemoteSearchable.java 17 Jul 2002 21:54:38 -0000 1.1
+++ TestRemoteSearchable.java 17 Jul 2002 22:11:34 -0000 1.2
@@ -60,8 +60,6 @@
import junit.framework.TestCase;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MultiSearcher;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
@@ -87,7 +85,7 @@
// publish it
LocateRegistry.createRegistry(1099);
Searchable local = new IndexSearcher(indexStore);
- RemoteSearchableImpl impl = new RemoteSearchableImpl(local);
+ RemoteSearchable impl = new RemoteSearchable(local);
Naming.rebind("//localhost/Searchable", impl);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
