mirror of https://github.com/apache/lucene.git
- import fixes in the test src tree
- the test target appears to depend on classes in the demo src tree so i added the dep to the test target. test target still isn't working but getting there. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@149580 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
864293c622
commit
4fc06ae583
|
@ -13,11 +13,10 @@ docs.src = ./xdocs
|
|||
docs.dest = ./docs
|
||||
|
||||
src.dir = ./src/java
|
||||
demo.dir = ./src/demo
|
||||
demo.src = ./src/demo
|
||||
test.src = ./src/test
|
||||
docs.dir = ./doc
|
||||
lib.dir = ./lib
|
||||
test.dir = ./src/test
|
||||
dist.dir=${final.name}
|
||||
|
||||
# javadoc packages
|
||||
|
@ -30,12 +29,12 @@ build.javadocs = ${build.dir}/docs/api
|
|||
build.src = ${build.dir}/src
|
||||
|
||||
build.demo = ${build.dir}/demo
|
||||
build.src.demo = ${build.demo}/src
|
||||
build.classes.demo = ${build.demo}/classes
|
||||
build.demo.src = ${build.demo}/src
|
||||
build.demo.classes = ${build.demo}/classes
|
||||
|
||||
build.test = ${build.dir}/test
|
||||
build.src.test = ${build.test}/src
|
||||
build.classes.test = ${build.test}/classes
|
||||
build.test.src = ${build.test}/src
|
||||
build.test.classes = ${build.test}/classes
|
||||
|
||||
junit.src = ${basedir}/test/unit
|
||||
junit.classes = ${build.dir}/unit-classes
|
||||
|
|
30
build.xml
30
build.xml
|
@ -9,6 +9,7 @@
|
|||
<path id="classpath">
|
||||
<pathelement location="${build.classes}"/>
|
||||
<pathelement location="${build.demo.classes}"/>
|
||||
<pathelement location="${build.test.classes}"/>
|
||||
<pathelement location="."/>
|
||||
<fileset dir="lib">
|
||||
<include name="*.jar" />
|
||||
|
@ -121,7 +122,7 @@
|
|||
<target name="demo" depends="compile" if="javacc.present">
|
||||
<mkdir dir="${build.demo}"/>
|
||||
|
||||
<copy todir="${build.demo}/src">
|
||||
<copy todir="${build.demo.src}">
|
||||
<fileset dir="${demo.src}">
|
||||
<include name="**/*.java"/>
|
||||
<include name="**/*.jj"/>
|
||||
|
@ -129,17 +130,17 @@
|
|||
</copy>
|
||||
|
||||
<javacc
|
||||
target="${build.src.demo}/org/apache/lucene/HTMLParser/HTMLParser.jj"
|
||||
target="${build.demo.src}/org/apache/lucene/HTMLParser/HTMLParser.jj"
|
||||
javacchome="${javacc.zip.dir}"
|
||||
outputdirectory="${build.src.demo}/org/apache/lucene/HTMLParser"
|
||||
outputdirectory="${build.demo.src}/org/apache/lucene/HTMLParser"
|
||||
/>
|
||||
|
||||
<mkdir dir="${build.classes.demo}"/>
|
||||
<mkdir dir="${build.demo.classes}"/>
|
||||
|
||||
<javac
|
||||
srcdir="${build.src.demo}"
|
||||
srcdir="${build.demo.src}"
|
||||
includes="**/*.java"
|
||||
destdir="${build.classes.demo}"
|
||||
destdir="${build.demo.classes}"
|
||||
debug="${debug}">
|
||||
<classpath refid="classpath"/>
|
||||
</javac>
|
||||
|
@ -150,12 +151,21 @@
|
|||
<!-- ================================================================== -->
|
||||
<!-- -->
|
||||
<!-- ================================================================== -->
|
||||
<target name="test" depends="compile">
|
||||
<target name="test" depends="compile,demo">
|
||||
<mkdir dir="${build.test}"/>
|
||||
|
||||
<copy todir="${build.test.src}">
|
||||
<fileset dir="${test.src}">
|
||||
<include name="**/*.java"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<mkdir dir="${build.test.classes}"/>
|
||||
|
||||
<javac
|
||||
srcdir="${build.src}"
|
||||
includes="${test.dir}/**"
|
||||
destdir="${build.test}"
|
||||
srcdir="${build.test.src}"
|
||||
includes="**/*.java"
|
||||
destdir="${build.test.classes}"
|
||||
debug="${debug}">
|
||||
<classpath refid="classpath"/>
|
||||
</javac>
|
||||
|
|
|
@ -54,10 +54,10 @@ package org.apache.lucene;
|
|||
* <http://www.apache.org/>.
|
||||
*/
|
||||
|
||||
import com.lucene.analysis.SimpleAnalyzer;
|
||||
import com.lucene.analysis.Analyzer;
|
||||
import com.lucene.analysis.TokenStream;
|
||||
import com.lucene.analysis.Token;
|
||||
import org.apache.lucene.analysis.SimpleAnalyzer;
|
||||
import org.apache.lucene.analysis.Analyzer;
|
||||
import org.apache.lucene.analysis.TokenStream;
|
||||
import org.apache.lucene.analysis.Token;
|
||||
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
|
|
|
@ -54,12 +54,12 @@ package org.apache.lucene;
|
|||
* <http://www.apache.org/>.
|
||||
*/
|
||||
|
||||
import com.lucene.util.PriorityQueue;
|
||||
import com.lucene.store.Directory;
|
||||
import com.lucene.store.FSDirectory;
|
||||
import com.lucene.index.IndexReader;
|
||||
import com.lucene.index.Term;
|
||||
import com.lucene.index.TermEnum;
|
||||
import org.apache.lucene.util.PriorityQueue;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.apache.lucene.index.IndexReader;
|
||||
import org.apache.lucene.index.Term;
|
||||
import org.apache.lucene.index.TermEnum;
|
||||
|
||||
class HighFreqTerms {
|
||||
public static int numTerms = 100;
|
||||
|
|
|
@ -54,11 +54,11 @@ package org.apache.lucene;
|
|||
* <http://www.apache.org/>.
|
||||
*/
|
||||
|
||||
import com.lucene.analysis.SimpleAnalyzer;
|
||||
import com.lucene.index.IndexWriter;
|
||||
import com.lucene.index.TermPositions;
|
||||
import com.lucene.document.Document;
|
||||
import demo.FileDocument;
|
||||
import org.apache.lucene.analysis.SimpleAnalyzer;
|
||||
import org.apache.lucene.index.IndexWriter;
|
||||
import org.apache.lucene.index.TermPositions;
|
||||
import org.apache.lucene.document.Document;
|
||||
import org.apache.lucene.FileDocument;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
|
|
|
@ -58,12 +58,12 @@ import java.io.IOException;
|
|||
import java.util.Date;
|
||||
import java.util.GregorianCalendar;
|
||||
|
||||
import com.lucene.store.*;
|
||||
import com.lucene.document.*;
|
||||
import com.lucene.analysis.*;
|
||||
import com.lucene.index.*;
|
||||
import com.lucene.search.*;
|
||||
import com.lucene.queryParser.*;
|
||||
import org.apache.lucene.store.*;
|
||||
import org.apache.lucene.document.*;
|
||||
import org.apache.lucene.analysis.*;
|
||||
import org.apache.lucene.index.*;
|
||||
import org.apache.lucene.search.*;
|
||||
import org.apache.lucene.queryParser.*;
|
||||
|
||||
class SearchTest {
|
||||
public static void main(String[] args) {
|
||||
|
|
|
@ -58,12 +58,12 @@ import java.io.IOException;
|
|||
import java.util.Date;
|
||||
import java.util.GregorianCalendar;
|
||||
|
||||
import com.lucene.store.*;
|
||||
import com.lucene.document.*;
|
||||
import com.lucene.analysis.*;
|
||||
import com.lucene.index.*;
|
||||
import com.lucene.search.*;
|
||||
import com.lucene.queryParser.*;
|
||||
import org.apache.lucene.store.*;
|
||||
import org.apache.lucene.document.*;
|
||||
import org.apache.lucene.analysis.*;
|
||||
import org.apache.lucene.index.*;
|
||||
import org.apache.lucene.search.*;
|
||||
import org.apache.lucene.queryParser.*;
|
||||
|
||||
class SearchTestForDuplicates {
|
||||
|
||||
|
|
|
@ -54,11 +54,11 @@ package org.apache.lucene;
|
|||
* <http://www.apache.org/>.
|
||||
*/
|
||||
|
||||
import com.lucene.store.Directory;
|
||||
import com.lucene.store.InputStream;
|
||||
import com.lucene.store.OutputStream;
|
||||
import com.lucene.store.FSDirectory;
|
||||
import com.lucene.store.RAMDirectory;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.store.InputStream;
|
||||
import org.apache.lucene.store.OutputStream;
|
||||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.apache.lucene.store.RAMDirectory;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Random;
|
||||
|
|
|
@ -54,12 +54,12 @@ package org.apache.lucene;
|
|||
* <http://www.apache.org/>.
|
||||
*/
|
||||
|
||||
import com.lucene.store.*;
|
||||
import com.lucene.document.*;
|
||||
import com.lucene.analysis.*;
|
||||
import com.lucene.index.*;
|
||||
import com.lucene.search.*;
|
||||
import com.lucene.queryParser.*;
|
||||
import org.apache.lucene.store.*;
|
||||
import org.apache.lucene.document.*;
|
||||
import org.apache.lucene.analysis.*;
|
||||
import org.apache.lucene.index.*;
|
||||
import org.apache.lucene.search.*;
|
||||
import org.apache.lucene.queryParser.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Random;
|
||||
|
|
|
@ -59,7 +59,7 @@ import org.apache.lucene.analysis.Analyzer;
|
|||
import org.apache.lucene.store.FSDirectory;
|
||||
import org.apache.lucene.store.Directory;
|
||||
import org.apache.lucene.document.Document;
|
||||
import demo.FileDocument;
|
||||
import org.apache.lucene.FileDocument;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
|
|
|
@ -57,11 +57,11 @@ package org.apache.lucene.queryParser;
|
|||
import java.io.*;
|
||||
import junit.framework.*;
|
||||
|
||||
import com.lucene.*;
|
||||
import com.lucene.queryParser.*;
|
||||
import com.lucene.search.*;
|
||||
import com.lucene.analysis.*;
|
||||
import com.lucene.analysis.Token;
|
||||
import org.apache.lucene.*;
|
||||
import org.apache.lucene.queryParser.*;
|
||||
import org.apache.lucene.search.*;
|
||||
import org.apache.lucene.analysis.*;
|
||||
import org.apache.lucene.analysis.Token;
|
||||
|
||||
public class TestQueryParser extends TestCase {
|
||||
|
||||
|
|
Loading…
Reference in New Issue