From 864293c622721bdc2f290929e005f46b32779599 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Tue, 18 Sep 2001 17:21:38 +0000 Subject: [PATCH] - fixes required to make the demo build. i missed some import statements. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@149579 13f79535-47bb-0310-9956-ffa450edef68 --- build.properties | 7 ++++++- build.xml | 12 +++++++----- src/demo/org/apache/lucene/DeleteFiles.java | 8 ++++---- src/demo/org/apache/lucene/FileDocument.java | 6 +++--- src/demo/org/apache/lucene/HTMLDocument.java | 4 ++-- .../org/apache/lucene/HTMLParser/Entities.java | 2 +- src/demo/org/apache/lucene/IndexFiles.java | 4 ++-- src/demo/org/apache/lucene/IndexHTML.java | 10 +++++----- src/demo/org/apache/lucene/SearchFiles.java | 16 ++++++++-------- 9 files changed, 38 insertions(+), 31 deletions(-) diff --git a/build.properties b/build.properties index 02cb0be2e0c..374bd0aa5ab 100644 --- a/build.properties +++ b/build.properties @@ -28,9 +28,14 @@ build.classes = ${build.dir}/classes 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 diff --git a/build.xml b/build.xml index 7b6a677e20b..b5caacea7a8 100644 --- a/build.xml +++ b/build.xml @@ -7,8 +7,8 @@ - + @@ -133,11 +133,13 @@ javacchome="${javacc.zip.dir}" outputdirectory="${build.src.demo}/org/apache/lucene/HTMLParser" /> - + + + diff --git a/src/demo/org/apache/lucene/DeleteFiles.java b/src/demo/org/apache/lucene/DeleteFiles.java index b616f6ca26c..ba7727c0187 100644 --- a/src/demo/org/apache/lucene/DeleteFiles.java +++ b/src/demo/org/apache/lucene/DeleteFiles.java @@ -56,10 +56,10 @@ package org.apache.lucene; 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) { diff --git a/src/demo/org/apache/lucene/FileDocument.java b/src/demo/org/apache/lucene/FileDocument.java index 0fe0fd1b815..f0cce6cde3d 100644 --- a/src/demo/org/apache/lucene/FileDocument.java +++ b/src/demo/org/apache/lucene/FileDocument.java @@ -60,9 +60,9 @@ import java.io.FileInputStream; 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. */ diff --git a/src/demo/org/apache/lucene/HTMLDocument.java b/src/demo/org/apache/lucene/HTMLDocument.java index 27cd200e681..1cabd7d09d9 100644 --- a/src/demo/org/apache/lucene/HTMLDocument.java +++ b/src/demo/org/apache/lucene/HTMLDocument.java @@ -55,8 +55,8 @@ package org.apache.lucene; */ 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. */ diff --git a/src/demo/org/apache/lucene/HTMLParser/Entities.java b/src/demo/org/apache/lucene/HTMLParser/Entities.java index cadd8cab7b0..b2b45fe13ce 100644 --- a/src/demo/org/apache/lucene/HTMLParser/Entities.java +++ b/src/demo/org/apache/lucene/HTMLParser/Entities.java @@ -1,4 +1,4 @@ -package demo.HTMLParser; +package org.apache.lucene.HTMLParser; /* ==================================================================== * The Apache Software License, Version 1.1 diff --git a/src/demo/org/apache/lucene/IndexFiles.java b/src/demo/org/apache/lucene/IndexFiles.java index ad6f78af9f9..6e6d06f9272 100644 --- a/src/demo/org/apache/lucene/IndexFiles.java +++ b/src/demo/org/apache/lucene/IndexFiles.java @@ -54,8 +54,8 @@ package org.apache.lucene; * . */ -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; diff --git a/src/demo/org/apache/lucene/IndexHTML.java b/src/demo/org/apache/lucene/IndexHTML.java index c622cc8bda7..d9e36731f04 100644 --- a/src/demo/org/apache/lucene/IndexHTML.java +++ b/src/demo/org/apache/lucene/IndexHTML.java @@ -54,11 +54,11 @@ package org.apache.lucene; * . */ -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; diff --git a/src/demo/org/apache/lucene/SearchFiles.java b/src/demo/org/apache/lucene/SearchFiles.java index 4aa3bf45919..c83c333c480 100644 --- a/src/demo/org/apache/lucene/SearchFiles.java +++ b/src/demo/org/apache/lucene/SearchFiles.java @@ -58,14 +58,14 @@ import java.io.IOException; 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) {