jvanzyl 01/09/18 10:21:38 Modified: . build.properties build.xml src/demo/org/apache/lucene DeleteFiles.java FileDocument.java HTMLDocument.java IndexFiles.java IndexHTML.java SearchFiles.java src/demo/org/apache/lucene/HTMLParser Entities.java Log: - fixes required to make the demo build. i missed some import statements. Revision Changes Path 1.3 +6 -1 jakarta-lucene/build.properties Index: build.properties =================================================================== RCS file: /home/cvs/jakarta-lucene/build.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.properties 2001/09/18 17:04:21 1.2 +++ build.properties 2001/09/18 17:21:38 1.3 @@ -28,9 +28,14 @@ build.lib = ${build.dir}/lib build.javadocs = ${build.dir}/docs/api build.src = ${build.dir}/src + build.demo = ${build.dir}/demo -build.src.demo = ${build.dir}/demo/src +build.src.demo = ${build.demo}/src +build.classes.demo = ${build.demo}/classes + build.test = ${build.dir}/test +build.src.test = ${build.test}/src +build.classes.test = ${build.test}/classes junit.src = ${basedir}/test/unit junit.classes = ${build.dir}/unit-classes 1.4 +7 -5 jakarta-lucene/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-lucene/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 2001/09/18 17:04:21 1.3 +++ build.xml 2001/09/18 17:21:38 1.4 @@ -7,8 +7,8 @@ <!-- Build classpath --> <path id="classpath"> - <pathelement location="${build.demo}"/> <pathelement location="${build.classes}"/> + <pathelement location="${build.demo.classes}"/> <pathelement location="."/> <fileset dir="lib"> <include name="*.jar" /> @@ -133,11 +133,13 @@ javacchome="${javacc.zip.dir}" outputdirectory="${build.src.demo}/org/apache/lucene/HTMLParser" /> - + + <mkdir dir="${build.classes.demo}"/> + <javac - srcdir="${build.demo}" - includes="demo/**/*.java" - destdir="${build.demo}" + srcdir="${build.src.demo}" + includes="**/*.java" + destdir="${build.classes.demo}" debug="${debug}"> <classpath refid="classpath"/> </javac> 1.2 +4 -4 jakarta-lucene/src/demo/org/apache/lucene/DeleteFiles.java Index: DeleteFiles.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/DeleteFiles.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DeleteFiles.java 2001/09/18 16:30:01 1.1 +++ DeleteFiles.java 2001/09/18 17:21:38 1.2 @@ -56,10 +56,10 @@ import java.io.IOException; -import com.lucene.store.Directory; -import com.lucene.store.FSDirectory; -import com.lucene.index.IndexReader; -import com.lucene.index.Term; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; class DeleteFiles { public static void main(String[] args) { 1.2 +3 -3 jakarta-lucene/src/demo/org/apache/lucene/FileDocument.java Index: FileDocument.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/FileDocument.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FileDocument.java 2001/09/18 16:30:01 1.1 +++ FileDocument.java 2001/09/18 17:21:38 1.2 @@ -60,9 +60,9 @@ import java.io.BufferedReader; import java.io.InputStreamReader; -import com.lucene.document.Document; -import com.lucene.document.Field; -import com.lucene.document.DateField; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.DateField; /** A utility for making Lucene Documents from a File. */ 1.2 +2 -2 jakarta-lucene/src/demo/org/apache/lucene/HTMLDocument.java Index: HTMLDocument.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/HTMLDocument.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HTMLDocument.java 2001/09/18 16:30:02 1.1 +++ HTMLDocument.java 2001/09/18 17:21:38 1.2 @@ -55,8 +55,8 @@ */ import java.io.*; -import com.lucene.document.*; -import demo.HTMLParser.HTMLParser; +import org.apache.lucene.document.*; +import org.apache.lucene.HTMLParser.HTMLParser; /** A utility for making Lucene Documents for HTML documents. */ 1.2 +2 -2 jakarta-lucene/src/demo/org/apache/lucene/IndexFiles.java Index: IndexFiles.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/IndexFiles.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IndexFiles.java 2001/09/18 16:30:02 1.1 +++ IndexFiles.java 2001/09/18 17:21:38 1.2 @@ -54,8 +54,8 @@ * <http://www.apache.org/>. */ -import com.lucene.analysis.StopAnalyzer; -import com.lucene.index.IndexWriter; +import org.apache.lucene.analysis.StopAnalyzer; +import org.apache.lucene.index.IndexWriter; import java.io.File; import java.util.Date; 1.2 +5 -5 jakarta-lucene/src/demo/org/apache/lucene/IndexHTML.java Index: IndexHTML.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/IndexHTML.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IndexHTML.java 2001/09/18 16:30:02 1.1 +++ IndexHTML.java 2001/09/18 17:21:38 1.2 @@ -54,11 +54,11 @@ * <http://www.apache.org/>. */ -import com.lucene.analysis.StopAnalyzer; -import com.lucene.index.*; -import com.lucene.document.Document; -import com.lucene.util.Arrays; -import demo.HTMLParser.HTMLParser; +import org.apache.lucene.analysis.StopAnalyzer; +import org.apache.lucene.index.*; +import org.apache.lucene.document.Document; +import org.apache.lucene.util.Arrays; +import org.apache.lucene.HTMLParser.HTMLParser; import java.io.File; import java.util.Date; 1.2 +8 -8 jakarta-lucene/src/demo/org/apache/lucene/SearchFiles.java Index: SearchFiles.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/SearchFiles.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SearchFiles.java 2001/09/18 16:30:02 1.1 +++ SearchFiles.java 2001/09/18 17:21:38 1.2 @@ -58,14 +58,14 @@ import java.io.BufferedReader; import java.io.InputStreamReader; -import com.lucene.analysis.Analyzer; -import com.lucene.analysis.StopAnalyzer; -import com.lucene.document.Document; -import com.lucene.search.Searcher; -import com.lucene.search.IndexSearcher; -import com.lucene.search.Query; -import com.lucene.search.Hits; -import com.lucene.queryParser.QueryParser; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.StopAnalyzer; +import org.apache.lucene.document.Document; +import org.apache.lucene.search.Searcher; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.Hits; +import org.apache.lucene.queryParser.QueryParser; class SearchFiles { public static void main(String[] args) { 1.2 +1 -1 jakarta-lucene/src/demo/org/apache/lucene/HTMLParser/Entities.java Index: Entities.java =================================================================== RCS file: /home/cvs/jakarta-lucene/src/demo/org/apache/lucene/HTMLParser/Entities.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Entities.java 2001/09/18 16:30:02 1.1 +++ Entities.java 2001/09/18 17:21:38 1.2 @@ -1,4 +1,4 @@ -package demo.HTMLParser; +package org.apache.lucene.HTMLParser; /* ==================================================================== * The Apache Software License, Version 1.1