LUCENE-2444: move contrib/analyzers to modules/analysis

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

build.xml

@@ -24,6 +24,10 @@
         <fileset dir="lucene" includes="build.xml" />
       </subant>
 
+      <subant target="test" inheritall="false" failonerror="true">
+        <fileset dir="modules" includes="build.xml" />
+      </subant>
+
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="solr" includes="build.xml" />
       </subant>
@@ -34,6 +38,7 @@
     <sequential>
       <subant target="compile" inheritall="false" failonerror="true">
         <!--<fileset dir="lucene" includes="build.xml" /> -->
+        <fileset dir="modules" includes="build.xml" />
         <fileset dir="solr" includes="build.xml" />
       </subant>
     </sequential>
@@ -43,6 +48,7 @@
     <sequential>
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
+        <fileset dir="modules" includes="build.xml" />
         <fileset dir="solr" includes="build.xml" />
       </subant>
     </sequential>

lucene/CHANGES.txt

@@ -4,7 +4,7 @@ Lucene Change Log
 
 Changes in backwards compatibility policy
 
-* LUCENE-2413: Consolidated all Lucene analyzers into contrib/analyzers.
+* LUCENE-2413: Consolidated all Lucene analyzers into modules/analysis.
   - o.a.l.analysis.PorterStemFilter -> o.a.l.analysis.en.PorterStemFilter
   - o.a.l.analysis.ASCIIFoldingFilter -> o.a.l.analysis.miscellaneous.ASCIIFoldingFilter
   - o.a.l.analysis.ISOLatin1AccentFilter -> o.a.l.analysis.miscellaneous.ISOLatin1AccentFilter

lucene/contrib/benchmark/build.xml

@@ -14,7 +14,7 @@
     <contrib-uptodate name="highlighter" property="highlighter.uptodate" classpath.property="highlighter.jar"/>
     <contrib-uptodate name="icu" property="icu.uptodate" classpath.property="icu.jar"/>
     <!-- analyzers common needs a hack for the jar file: -->
-    <contrib-uptodate name="analyzers/common" jarfile="${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar"
+    <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
       property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
     <contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
 
@@ -244,7 +244,7 @@
     </target>
     <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
       <subant target="default">
-        <fileset dir="${common.dir}/contrib/analyzers/common" includes="build.xml"/>
+        <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
       </subant>
     </target>
     <target name="compile-memory" unless="memory.uptodate">

lucene/contrib/contrib-build.xml

@@ -122,4 +122,18 @@
       </uptodate>
     </sequential>
   </macrodef>
+
+  <macrodef name="module-uptodate">
+    <attribute name="name"/>
+    <attribute name="property" default="@{name}.uptodate"/>
+    <attribute name="classpath.property" default="@{name}.jar"/>
+    <!-- set jarfile only, if the target jar file has no generic name, applies to analyzers with its common and smartcn subdir -->
+    <attribute name="jarfile" default="${common.dir}/../modules/@{name}/build/lucene-@{name}-${version}.jar"/>
+    <sequential>
+      <property name="@{classpath.property}" location="@{jarfile}"/>
+      <uptodate property="@{property}" targetfile="@{jarfile}">
+      	<srcfiles dir="${common.dir}/../modules/@{name}/src/java" includes="**/*.java"/>
+      </uptodate>
+    </sequential>
+  </macrodef>
 </project>

modules/analysis/common/build.xml

@@ -17,21 +17,21 @@
     limitations under the License.
  -->
 
-<project name="analyzers" default="default">
+<project name="analyzers-common" default="default">
 
   <description>
-    Additional Analyzers
+   Analyzers
   </description>
 	
-  <property name="build.dir" location="../../../build/contrib/analyzers/common" />
-  <property name="dist.dir" location="../../../dist/contrib/analyzers/common" />
-  <property name="maven.dist.dir" location="../../../dist/maven" />
+  <property name="build.dir" location="../build/common" />
+  <property name="dist.dir" location="../dist/common" />
+  <property name="maven.dist.dir" location="../dist/maven" />
 
-  <import file="../../contrib-build.xml"/>
+  <import file="../../../lucene/contrib/contrib-build.xml"/>
 	
   <path id="test.classpath">
     <path refid="classpath"/>
-    <pathelement location="../../../build/classes/test/"/>
+    <pathelement location="../../../lucene/build/classes/test/"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>