From 38aa464ab138217980497fac734717d79b98e87b Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Fri, 28 May 2010 12:49:22 +0000
Subject: [PATCH] include the demo war file in 'ant dist' and change the README
 to refer to the new location

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@949164 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/README.txt             | 6 +++---
 lucene/contrib/demo/build.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lucene/README.txt b/lucene/README.txt
index d38f07b5b79..6d52f0fd9a3 100644
--- a/lucene/README.txt
+++ b/lucene/README.txt
@@ -17,10 +17,10 @@ FILES
 lucene-core-XX.jar
   The compiled lucene library.
 
-lucene-demos-XX.jar
+contrib/demo/lucene-demo-XX.jar
   The compiled simple example code.
 
-luceneweb.war
+contrib/demo/luceneweb.war
   The compiled simple example Web Application.
 
 contrib/*
@@ -40,5 +40,5 @@ docs/api/index.html
 src/java
   The Lucene source code.
 
-src/demo
+contrib/demo/src
   Some example code.
diff --git a/lucene/contrib/demo/build.xml b/lucene/contrib/demo/build.xml
index 1b1fb7b8871..810662ea1cb 100644
--- a/lucene/contrib/demo/build.xml
+++ b/lucene/contrib/demo/build.xml
@@ -38,7 +38,7 @@
 	 <path refid="base.classpath"/>
   </path>
 
-  <target name="compile-core" depends="compile-analyzers-common, common.compile-core" />
+  <target name="compile-core" depends="compile-analyzers-common, common.compile-core, war-demo" />
 
   <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
     <subant target="default">
@@ -46,7 +46,7 @@
     </subant>
   </target>
 
-  <target name="war-demo" depends="jar-core">
+  <target name="war-demo">
     <sequential>
       <build-manifest title="Lucene Search Engine: demos"/>
   	  <war destfile="${build.dir}/${demo.war.name}.war"