- 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

@@ -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

build.xml

@@ -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" />
@@ -134,10 +134,12 @@
       outputdirectory="${build.src.demo}/org/apache/lucene/HTMLParser"
     />
     
+    <mkdir dir="${build.classes.demo}"/>
+    
     <javac 
-      srcdir="${build.demo}"
+      srcdir="${build.src.demo}"
-      includes="demo/**/*.java"
+      includes="**/*.java"
-      destdir="${build.demo}"
+      destdir="${build.classes.demo}"
       debug="${debug}">
       <classpath refid="classpath"/>
     </javac>

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 org.apache.lucene.store.Directory;
-import com.lucene.store.FSDirectory;
+import org.apache.lucene.store.FSDirectory;
-import com.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexReader;
-import com.lucene.index.Term;
+import org.apache.lucene.index.Term;
 
 class DeleteFiles {
   public static void main(String[] args) {

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 org.apache.lucene.document.Document;
-import com.lucene.document.Field;
+import org.apache.lucene.document.Field;
-import com.lucene.document.DateField;
+import org.apache.lucene.document.DateField;
 
 /** A utility for making Lucene Documents from a File. */
 

src/demo/org/apache/lucene/HTMLDocument.java

@@ -55,8 +55,8 @@ package org.apache.lucene;
  */
 
 import java.io.*;
-import com.lucene.document.*;
+import org.apache.lucene.document.*;
-import demo.HTMLParser.HTMLParser;
+import org.apache.lucene.HTMLParser.HTMLParser;
 
 /** A utility for making Lucene Documents for HTML documents. */
 

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

src/demo/org/apache/lucene/IndexFiles.java

@@ -54,8 +54,8 @@ package org.apache.lucene;
  * <http://www.apache.org/>.
  */
 
-import com.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.analysis.StopAnalyzer;
-import com.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriter;
 
 import java.io.File;
 import java.util.Date;

src/demo/org/apache/lucene/IndexHTML.java

@@ -54,11 +54,11 @@ package org.apache.lucene;
  * <http://www.apache.org/>.
  */
 
-import com.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.analysis.StopAnalyzer;
-import com.lucene.index.*;
+import org.apache.lucene.index.*;
-import com.lucene.document.Document;
+import org.apache.lucene.document.Document;
-import com.lucene.util.Arrays;
+import org.apache.lucene.util.Arrays;
-import demo.HTMLParser.HTMLParser;
+import org.apache.lucene.HTMLParser.HTMLParser;
 
 import java.io.File;
 import java.util.Date;

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 org.apache.lucene.analysis.Analyzer;
-import com.lucene.analysis.StopAnalyzer;
+import org.apache.lucene.analysis.StopAnalyzer;
-import com.lucene.document.Document;
+import org.apache.lucene.document.Document;
-import com.lucene.search.Searcher;
+import org.apache.lucene.search.Searcher;
-import com.lucene.search.IndexSearcher;
+import org.apache.lucene.search.IndexSearcher;
-import com.lucene.search.Query;
+import org.apache.lucene.search.Query;
-import com.lucene.search.Hits;
+import org.apache.lucene.search.Hits;
-import com.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryParser.QueryParser;
 
 class SearchFiles {
   public static void main(String[] args) {