LUCENE-1153: added lib/junit and build support

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@615329 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,4 +1,4 @@
-Lucene Change Log
+Lucene Change Log
 $Id$
 
 ======================= Trunk (not yet released) =======================
@@ -40,6 +40,8 @@ Documentation
 
 Build
 
+  1. LUCENE-1153: Added JUnit JAR to new lib directory.  Updated build to rely on local JUnit instead of ANT/lib.
+
 Test Cases
 
 ======================= Release 2.3.0 2008-01-21 =======================

build.xml

@@ -40,14 +40,16 @@
     <path refid="classpath"/>
     <pathelement location="${build.dir}/classes/demo"/>
   </path>
-
+  
   <path id="test.classpath">
     <path refid="demo.classpath"/>
+    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/test"/>
   </path>
 
 
   <path id="junit.classpath">
+    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/test"/>
     <pathelement location="${build.dir}/classes/java"/>
     <pathelement location="${build.dir}/classes/demo"/>

common-build.xml

@@ -45,6 +45,12 @@
   <property name="year" value="2000-${current.year}"/>
   <property name="final.name" value="lucene-${name}-${version}"/>
 
+  <property name="junit.jar" value="junit-3.8.2.jar"/>
+  <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
+  <path id="junit-path">
+    <pathelement location="${junit-location.jar}"/>
+  </path>
+
   <property name="javac.deprecation" value="off"/>
   <property name="javac.debug" value="on"/>
   <property name="javac.source" value="1.4"/>
@@ -110,11 +116,6 @@
     classpath="${jflex.home}/lib/JFlex.jar"
     />
 
-  <available
-    property="junit.present"
-    classname="junit.framework.TestCase"
-    />
-
   <available
     property="maven.ant.tasks.present"
     classname="org.apache.maven.artifact.ant.Pom"
@@ -334,13 +335,6 @@
   <property name="tests.verbose" value="false"/>
 
   <target name="test" depends="compile-test" description="Runs unit tests">
-    <fail unless="junit.present">
-      ##################################################################
-      JUnit not found.
-      Please make sure junit.jar is in ANT_HOME/lib, or made available
-      to Ant using other mechanisms like -lib or CLASSPATH.
-      ##################################################################
-    </fail>
     <mkdir dir="${junit.output.dir}"/>
     <junit printsummary="off" haltonfailure="no"
       errorProperty="tests.failed" failureProperty="tests.failed">

contrib/contrib-build.xml

@@ -41,7 +41,7 @@
   <path id="test.classpath">
     <path refid="classpath"/>
     <pathelement location="../../build/classes/test/"/>
-    <pathelement location="${junit.jar}"/>
+    <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 

lib/junit-3.8.2.jar

@@ -0,0 +1,2 @@
+AnyObjectId[c8f711d050eff209321f799d85ebb3bbe305d481] was removed in git history.
+Apache SVN contains full history.