Index: modules/benchmark/build.xml
===================================================================
--- modules/benchmark/build.xml	(revision 1128121)
+++ modules/benchmark/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -34,10 +34,10 @@
     <property name="tests.threadspercpu" value="0"/>
 
     <contrib-uptodate name="highlighter" property="highlighter.uptodate" classpath.property="highlighter.jar"/>
-    <module-uptodate name="analysis/icu" jarfile="${common.dir}/../modules/analysis/build/icu/lucene-analyzers-icu-${version}.jar"
+    <module-uptodate name="analysis/icu" jarfile="${common-lucene.dir}/../modules/analysis/build/icu/lucene-analyzers-icu-${version}.jar"
       property="analyzers-icu.uptodate" classpath.property="analyzers-icu.jar"/>
     <!-- analyzers common needs a hack for the jar file: -->
-    <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+    <module-uptodate name="analysis/common" jarfile="${common-lucene.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"/>
 
@@ -203,7 +203,7 @@
 	<path id="collation.runtime.classpath">
 	  <path refid="run.classpath"/>
     <pathelement path="${analyzers-icu.jar}"/>
-    <fileset dir="${common.dir}/../modules/analysis/icu/lib" includes="icu4j*.jar"/>
+    <fileset dir="${common-lucene.dir}/../modules/analysis/icu/lib" includes="icu4j*.jar"/>
 	</path>
 	
 	<target name="collation" depends="compile,compile-analyzers-icu,top-100k-wiki-word-files">
@@ -250,22 +250,22 @@
 
     <target name="compile-highlighter" unless="highlighter.uptodate">
       <subant target="default">
-         <fileset dir="${common.dir}/contrib/highlighter" includes="build.xml"/>
+         <fileset dir="${common-lucene.dir}/contrib/highlighter" includes="build.xml"/>
       </subant>
     </target>
     <target name="compile-analyzers-icu" unless="analyzers-icu.uptodate">
       <subant target="default">
-         <fileset dir="${common.dir}/../modules/analysis/icu" includes="build.xml"/>
+         <fileset dir="${common-lucene.dir}/../modules/analysis/icu" includes="build.xml"/>
       </subant>
     </target>
     <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
       <subant target="default">
-        <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+        <fileset dir="${common-lucene.dir}/../modules/analysis/common" includes="build.xml"/>
       </subant>
     </target>
     <target name="compile-memory" unless="memory.uptodate">
       <subant target="default">
-         <fileset dir="${common.dir}/contrib/memory" includes="build.xml"/>
+         <fileset dir="${common-lucene.dir}/contrib/memory" includes="build.xml"/>
       </subant>
     </target>
 
Index: lucene/contrib/xml-query-parser/build.xml
===================================================================
--- lucene/contrib/xml-query-parser/build.xml	(revision 1140379)
+++ lucene/contrib/xml-query-parser/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -26,8 +26,8 @@
   <import file="../contrib-build.xml"/>
 
   <contrib-uptodate name="queries-contrib" contrib-src-name="queries" property="queries.uptodate" classpath.property="queries.jar"/>
-  <property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/>
-  <property name="servlet.jar" location="${common.dir}/lib/servlet-api-2.4.jar"/>
+  <property name="lucene.jar" location="${common-lucene.dir}/build/lucene-core-${version}.jar"/>
+  <property name="servlet.jar" location="${common-lucene.dir}/lib/servlet-api-2.4.jar"/>
   <available property="servlet.jar.present" type="file" file="${servlet.jar}"/>
 
 
@@ -43,7 +43,7 @@
     <path refid="base.classpath"/>
   </path>
 
-  <target name="compile-core" depends="build-queries, common.compile-core" />
+  <target name="compile-core" depends="build-queries, common-lucene.compile-core" />
 
   <target name="build-queries" unless="queries.uptodate">
     <echo>XML Parser building dependency ${queries.jar}</echo>
@@ -59,7 +59,7 @@
 
     <echo>XML Parser compiling web demo</echo>
 
-    <ant dir="${common.dir}" target="jar-core" inheritAll="false"/>
+    <ant dir="${common-lucene.dir}" target="jar-core" inheritAll="false"/>
 
     <compile
       srcdir="src/demo/java"
Index: modules/queries/build.xml
===================================================================
--- modules/queries/build.xml	(revision 1140379)
+++ modules/queries/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -35,11 +35,11 @@
     <path refid="base.classpath"/>
   </path>
 
-  <target name="compile-core" depends="compile-common-module, common.compile-core"/>
+  <target name="compile-core" depends="compile-common-module, common-lucene.compile-core"/>
 
   <target name="compile-common-module" unless="common-module.uptodate">
     <subant target="default">
-      <fileset dir="${common.dir}/../modules/common" includes="build.xml"/>
+      <fileset dir="${common-lucene.dir}/../modules/common" includes="build.xml"/>
     </subant>
   </target>
 
Index: modules/analysis/smartcn/build.xml
===================================================================
--- modules/analysis/smartcn/build.xml	(revision 1067738)
+++ modules/analysis/smartcn/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -45,7 +45,7 @@
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 
-  <target name="compile-core" depends="build-analyzers-common, common.compile-core" />
+  <target name="compile-core" depends="build-analyzers-common, common-lucene.compile-core" />
 
   <target name="build-analyzers-common" unless="analyzers-common.uptodate">
     <echo>Smartcn building dependency ${analyzers-common.jar}</echo>
Index: lucene/build.xml
===================================================================
--- lucene/build.xml	(revision 1135822)
+++ lucene/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -58,7 +58,7 @@
   <!-- Prepares the build directory                                       -->
   <!-- ================================================================== -->
 
-  <target name="test-core" depends="common.test"
+  <target name="test-core" depends="common-lucene.test"
           description="Runs unit tests for the core Lucene code"
   />
   <target name="test" depends="test-core, test-contrib, test-backwards"
@@ -140,7 +140,7 @@
   <!--                                                                    -->
   <!-- ================================================================== -->
 
-  <target name="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
+  <target name="compile-core" depends="jflex-notice, javacc-notice, common-lucene.compile-core"/>
 
   <!-- ================================================================== -->
   <!-- D O C U M E N T A T I O N                                          -->
@@ -205,7 +205,7 @@
           <exclude name="build/**/*.jar"/>
           <include name="**/lib/*.jar"/>
         </fileset>
-        <pathelement location="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"/>
+        <pathelement location="${common-lucene.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"/>
       </path>
 
       <invoke-javadoc
@@ -418,7 +418,7 @@
   <property name="keyfile" value="${user.home}/.ssh/id_rsa"/>
   <property name="scp.user" value="${user.name}"/>
   <!--keys.dir is the location of the https://svn.apache.org/repos/asf/lucene/java/dist/ directory-->
-  <property name="keys.dir" value="${common.dir}/../../dist"/>
+  <property name="keys.dir" value="${common-lucene.dir}/../../dist"/>
   <target name="copy-to-stage">
     <sshexec host="people.apache.org"
 	    username="${scp.user}"
Index: lucene/contrib/contrib-build.xml
===================================================================
--- lucene/contrib/contrib-build.xml	(revision 1140000)
+++ lucene/contrib/contrib-build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -31,7 +31,7 @@
   
   <!-- if you extend the classpath refid in one contrib's build.xml (add JARs), use this as basis: -->
   <path id="base.classpath">
-   <pathelement location="${common.dir}/build/classes/java"/>
+   <pathelement location="${common-lucene.dir}/build/classes/java"/>
    <pathelement path="${project.classpath}"/>
   </path>
   
@@ -40,8 +40,8 @@
   
   <path id="test.base.classpath">
     <path refid="classpath"/>
-    <pathelement location="${common.dir}/build/classes/test-framework"/>
-    <pathelement location="${common.dir}/build/classes/test"/>
+    <pathelement location="${common-lucene.dir}/build/classes/test-framework"/>
+    <pathelement location="${common-lucene.dir}/build/classes/test"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>
@@ -55,17 +55,17 @@
   </path>
 
   <target name="build-lucene" unless="core.compiled">
-    <ant dir="${common.dir}" target="compile-test" inheritAll="false"/>
+    <ant dir="${common-lucene.dir}" target="compile-test" inheritAll="false"/>
     <!-- set the property for this ant execution to speed up later tasks depending on this -->
     <property name="core.compiled" value="true"/>
   </target>
   
-  <target name="init" depends="common.init,build-lucene"/>
+  <target name="init" depends="common-lucene.init,build-lucene"/>
   <target name="compile-test" depends="init" if="contrib.has.tests">
-    <antcall target="common.compile-test" inheritRefs="true" />
+    <antcall target="common-lucene.compile-test" inheritRefs="true" />
   </target>
   <target name="test" depends="init" if="contrib.has.tests">
-    <antcall target="common.test" inheritRefs="true" />
+    <antcall target="common-lucene.test" inheritRefs="true" />
   </target>
   <target name="build-artifacts-and-tests" depends="jar, compile-test" />
 	
@@ -119,12 +119,12 @@
     <attribute name="contrib-src-name" default="@{name}"/>
     <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}/build/contrib/@{name}/lucene-@{name}-${version}.jar"/>
+    <attribute name="jarfile" default="${common-lucene.dir}/build/contrib/@{name}/lucene-@{name}-${version}.jar"/>
     <sequential>
       <!--<echo message="Checking '@{jarfile}' against source folder '${common.dir}/contrib/@{name}/src/java'"/>-->
       <property name="@{classpath.property}" location="@{jarfile}"/>
       <uptodate property="@{property}" targetfile="@{jarfile}">
-        <srcfiles dir="${common.dir}/contrib/@{contrib-src-name}/src/java" includes="**/*.java"/>
+        <srcfiles dir="${common-lucene.dir}/contrib/@{contrib-src-name}/src/java" includes="**/*.java"/>
       </uptodate>
     </sequential>
   </macrodef>
@@ -135,11 +135,11 @@
     <attribute name="module-src-name" default="@{name}"/>
     <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/@{module-src-name}/build/lucene-@{name}-${version}.jar"/>
+    <attribute name="jarfile" default="${common-lucene.dir}/../modules/@{module-src-name}/build/lucene-@{name}-${version}.jar"/>
     <sequential>
       <property name="@{classpath.property}" location="@{jarfile}"/>
       <uptodate property="@{property}" targetfile="@{jarfile}">
-      	<srcfiles dir="${common.dir}/../modules/@{module-src-name}/src/java" includes="**/*.java"/>
+      	<srcfiles dir="${common-lucene.dir}/../modules/@{module-src-name}/src/java" includes="**/*.java"/>
       </uptodate>
     </sequential>
   </macrodef>
Index: modules/analysis/icu/build.xml
===================================================================
--- modules/analysis/icu/build.xml	(revision 1130718)
+++ modules/analysis/icu/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -56,7 +56,7 @@
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 
-  <target name="compile-core" depends="build-analyzers-common, common.compile-core" />
+  <target name="compile-core" depends="build-analyzers-common, common-lucene.compile-core" />
 
   <target name="build-analyzers-common" unless="analyzers-common.uptodate">
     <echo>ICU building dependency ${analyzers-common.jar}</echo>
@@ -125,7 +125,7 @@
     </java>
   </target>
 			
-  <target name="compile-tools" depends="common.compile-tools">
+  <target name="compile-tools" depends="common-lucene.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">
Index: lucene/contrib/spatial/build.xml
===================================================================
--- lucene/contrib/spatial/build.xml	(revision 1140379)
+++ lucene/contrib/spatial/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -32,7 +32,7 @@
     <path refid="base.classpath"/>
   </path>
 
-  <target name="compile-core" depends="build-queries, common.compile-core" />
+  <target name="compile-core" depends="build-queries, common-lucene.compile-core" />
 
   <target name="build-queries" unless="queries.uptodate">
     <echo>Misc building dependency ${queries.jar}</echo>
Index: lucene/contrib/misc/build.xml
===================================================================
--- lucene/contrib/misc/build.xml	(revision 1140394)
+++ lucene/contrib/misc/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -28,7 +28,7 @@
   <import file="../contrib-build.xml"/>
 
   <target name="build-native-unix" >
-    <mkdir dir="${common.build.dir}/native"/>
+    <mkdir dir="${common-lucene.build.dir}/native"/>
 
     <taskdef resource="cpptasks.tasks">
       <classpath>
@@ -36,7 +36,7 @@
       </classpath>
     </taskdef>
 
-    <cc outtype="shared" subsystem="console" outfile="${common.build.dir}/native/NativePosixUtil" >
+    <cc outtype="shared" subsystem="console" outfile="${common-lucene.build.dir}/native/NativePosixUtil" >
       <fileset file="${src.dir}/org/apache/lucene/store/NativePosixUtil.cpp" />  
       <includepath>
         <pathelement location="${java.home}/../include"/>
Index: modules/analysis/common/build.xml
===================================================================
--- modules/analysis/common/build.xml	(revision 1129445)
+++ modules/analysis/common/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -36,7 +36,7 @@
     <pathelement location="${build.dir}/classes/java"/>
   </path>	
 
-  <target name="compile-core" depends="jflex-notice, common.compile-core"/>
+  <target name="compile-core" depends="jflex-notice, common-lucene.compile-core"/>
 
   <target name="jflex" depends="jflex-check,clean-jflex,gen-uax29-supp-macros,
                                 jflex-StandardAnalyzer,jflex-UAX29URLEmailTokenizer,jflex-wiki-tokenizer"/>
@@ -106,7 +106,7 @@
     </java>
   </target>
 
-  <target name="compile-tools" depends="common.compile-tools">
+  <target name="compile-tools" depends="common-lucene.compile-tools">
     <compile
       srcdir="src/tools/java"
       destdir="${build.dir}/classes/tools">
Index: lucene/contrib/demo/build.xml
===================================================================
--- lucene/contrib/demo/build.xml	(revision 1072250)
+++ lucene/contrib/demo/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -27,17 +27,17 @@
 
   <import file="../contrib-build.xml"/>
 
-  <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+  <module-uptodate name="analysis/common" jarfile="${common-lucene.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
       property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
   
-  <property name="lucene.jar" value="${common.dir}/build/lucene-core-${version}.jar"/>
+  <property name="lucene.jar" value="${common-lucene.dir}/build/lucene-core-${version}.jar"/>
   <target name="lucene-jar-uptodate" unless="lucene.jar.uptodate">
     <uptodate property="lucene.jar.uptodate" targetfile="${lucene.jar}">
-     	<srcfiles dir="${common.dir}/src/java" includes="**/*.java"/>
+     	<srcfiles dir="${common-lucene.dir}/src/java" includes="**/*.java"/>
     </uptodate>
   </target>
   <target name="jar-lucene" depends="build-lucene" unless="lucene.jar.uptodate">
-    <ant dir="${common.dir}" target="jar-core" inheritAll="false"/>
+    <ant dir="${common-lucene.dir}" target="jar-core" inheritAll="false"/>
   </target>
   <target name="init" depends="contrib-build.init,lucene-jar-uptodate,jar-lucene"/>
   
@@ -46,11 +46,11 @@
    <pathelement path="${lucene.jar}"/>
   </path>
 
-  <target name="compile-core" depends="jar-analyzers-common,common.compile-core" />
+  <target name="compile-core" depends="jar-analyzers-common,common-lucene.compile-core" />
 
   <target name="jar-analyzers-common" unless="analyzers-common.uptodate">
     <subant target="jar-core">
-      <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+      <fileset dir="${common-lucene.dir}/../modules/analysis/common" includes="build.xml"/>
     </subant>
   </target>
 </project>
Index: modules/analysis/stempel/build.xml
===================================================================
--- modules/analysis/stempel/build.xml	(revision 1067738)
+++ modules/analysis/stempel/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -44,7 +44,7 @@
     <pathelement location="${build.dir}/classes/java"/>
   </path>	
 
-  <target name="compile-core" depends="build-analyzers-common, common.compile-core"/>
+  <target name="compile-core" depends="build-analyzers-common, common-lucene.compile-core"/>
 
   <target name="build-analyzers-common" unless="analyzers-common.uptodate">
     <echo>Stempel building dependency ${analyzers-common.jar}</echo>
Index: modules/join/build.xml
===================================================================
--- modules/join/build.xml	(revision 1140851)
+++ modules/join/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -10,7 +10,7 @@
   <property name="build.dir" location="build/" />
   <property name="dist.dir" location="dist/" />
 
-  <module-uptodate name="grouping" jarfile="${common.dir}/../modules/grouping/build/lucene-grouping-${version}.jar"
+  <module-uptodate name="grouping" jarfile="${common-lucene.dir}/../modules/grouping/build/lucene-grouping-${version}.jar"
 		   property="grouping.uptodate" classpath.property="grouping.jar"/>
 
   <path id="classpath">
@@ -29,7 +29,7 @@
 
   <target name="compile-grouping" unless="grouping.uptodate">
     <subant target="default">
-      <fileset dir="${common.dir}/../modules/grouping" includes="build.xml"/>
+      <fileset dir="${common-lucene.dir}/../modules/grouping" includes="build.xml"/>
     </subant>
   </target>
 
Index: lucene/contrib/queryparser/build.xml
===================================================================
--- lucene/contrib/queryparser/build.xml	(revision 1025597)
+++ lucene/contrib/queryparser/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -25,7 +25,7 @@
 
   <import file="../contrib-build.xml"/>
  
-  <target name="compile-core" depends="javacc-notice, common.compile-core"/>
+  <target name="compile-core" depends="javacc-notice, common-lucene.compile-core"/>
 
   <!--
     NOTE: see the README.javacc for details on how to fully regenerate the parser
Index: modules/analysis/phonetic/build.xml
===================================================================
--- modules/analysis/phonetic/build.xml	(revision 1067738)
+++ modules/analysis/phonetic/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -55,7 +55,7 @@
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 
-  <target name="compile-core" depends="build-analyzers-common, common.compile-core" />
+  <target name="compile-core" depends="build-analyzers-common, common-lucene.compile-core" />
 
   <target name="build-analyzers-common" unless="analyzers-common.uptodate">
     <echo>phonetic building dependency ${analyzers-common.jar}</echo>
Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1135801)
+++ lucene/common-build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -17,23 +17,23 @@
     limitations under the License.
  -->
 	
-<project name="common" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="common-lucene" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
   <description>
     This file is designed for importing into a main build file, and not intended
     for standalone use.
   </description>
 
-  <dirname file="${ant.file.common}" property="common.dir"/>
-  <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
-  <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
-  <property name="maven.build.dir" value="${common.dir}/build/maven"/>
+  <dirname file="${ant.file.common-lucene}" property="common-lucene.dir"/>
+  <property name="dev-tools.dir" value="${common-lucene.dir}/../dev-tools"/>
+  <property name="prettify.dir" value="${common-lucene.dir}/src/tools/prettify"/>
+  <property name="maven.build.dir" value="${common-lucene.dir}/build/maven"/>
 
   <!-- Give user a chance to override without editing this file
       (and without typing -D each time it compiles it -->
   <property file="${user.home}/lucene.build.properties"/>
   <property file="${user.home}/build.properties"/>
   <property file="${basedir}/build.properties"/>
-  <property file="${common.dir}/build.properties"/>
+  <property file="${common-lucene.dir}/build.properties"/>
 
   <tstamp>
     <format property="current.year" pattern="yyyy"/>
@@ -51,21 +51,21 @@
   <property name="final.name" value="lucene-${name}-${version}"/>
 
   <property name="junit.jar" value="junit-4.7.jar"/>
-  <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
+  <property name="junit-location.jar" value="${common-lucene.dir}/lib/${junit.jar}"/>
   <path id="junit-path">
     <pathelement location="${junit-location.jar}"/>
   </path>
 
   <path id="ant-path">
-    <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
+    <fileset dir="${common-lucene.dir}/lib" includes="ant-*.jar"/>
   </path>
 
   <path id="tools.runtime.classpath">
-    <pathelement location="${common.dir}/build/classes/tools"/>
+    <pathelement location="${common-lucene.dir}/build/classes/tools"/>
   </path>
 
   <path id="maven-ant-tasks.classpath">
-    <fileset dir="${common.dir}/lib">
+    <fileset dir="${common-lucene.dir}/lib">
       <include name="maven-ant-tasks-*.jar"/>
     </fileset>
   </path>
@@ -106,7 +106,7 @@
   <property name="javadoc.link" value="http://java.sun.com/j2se/1.5/docs/api/"/>
   <property name="javadoc.access" value="protected"/>
   <property name="javadoc.charset" value="utf-8"/>
-  <property name="javadoc.dir" value="${common.dir}/build/docs/api"/>
+  <property name="javadoc.dir" value="${common-lucene.dir}/build/docs/api"/>
   <property name="javadoc.maxmemory" value="512m" />
   <!-- Javadoc classpath -->
   <path id="javadoc.classpath">
@@ -118,25 +118,25 @@
     </fileset>
   </path>
 	
-  <property name="changes.src.dir" value="${common.dir}/src/site/changes"/>
-  <property name="changes.target.dir" value="${common.dir}/build/docs/changes"/>
+  <property name="changes.src.dir" value="${common-lucene.dir}/src/site/changes"/>
+  <property name="changes.target.dir" value="${common-lucene.dir}/build/docs/changes"/>
 
   <property name="project.name" value="site"/> <!-- todo: is this used by anakia or something else? -->
   <property name="build.encoding" value="utf-8"/>
 
   <property name="src.dir" location="src/java"/>
   <property name="tests.src.dir" location="src/test"/>
-  <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/>
+  <property name="tests-framework.src.dir" location="${common-lucene.dir}/src/test-framework"/>
   <property name="build.dir" location="build"/>
   <!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib -->
-  <property name="common.build.dir" location="${common.dir}/build"/>
+  <property name="common-lucene.build.dir" location="${common-lucene.dir}/build"/>
   <property name="dist.dir" location="dist"/>
   <property name="maven.dist.dir" location="dist/maven"/>
   <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
   <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/>
 
-  <property name="javacc.home" location="${common.dir}"/>
-  <property name="jflex.home" location="${common.dir}"/>
+  <property name="javacc.home" location="${common-lucene.dir}"/>
+  <property name="jflex.home" location="${common-lucene.dir}"/>
 
   <path id="jflex.classpath">
     <fileset dir="${jflex.home}/">
@@ -168,7 +168,7 @@
   </condition>
   <property name="junit.parallel.selector" value="org.apache.lucene.util.LuceneJUnitDividingSelector"/>
 
-  <property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
+  <property name="manifest.file" location="${common-lucene.dir}/build/MANIFEST.MF"/>
 
   <!-- 
     we attempt to exec svnversion to get details build information
@@ -187,8 +187,8 @@
   <property name="gpg.exe" value="gpg" />
   <property name="gpg.key" value="CODE SIGNING KEY" />
 
-  <property name="clover.db.dir" location="${common.dir}/build/test/clover/db"/>
-  <property name="clover.report.dir" location="${common.dir}/build/test/clover/reports"/>
+  <property name="clover.db.dir" location="${common-lucene.dir}/build/test/clover/db"/>
+  <property name="clover.report.dir" location="${common-lucene.dir}/build/test/clover/reports"/>
 
     <available
             property="clover.present"
@@ -405,7 +405,7 @@
         <manifest>
         	<manifest-attributes/>
         </manifest>
-        <metainf dir="${common.dir}">
+        <metainf dir="${common-lucene.dir}">
           <include name="LICENSE.txt"/>
           <include name="NOTICE.txt"/>
         </metainf>
@@ -415,14 +415,14 @@
   </macrodef>
 
   <target name="compile-test-framework" depends="compile-core">
-  	<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
+  	<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common-lucene.dir}/build/classes/test-framework"
   						test.classpath="test.classpath"/>
   </target>
 
   <target name="compile-tools">
     <compile
-      srcdir="${common.dir}/src/tools/java"
-      destdir="${common.build.dir}/classes/tools">
+      srcdir="${common-lucene.dir}/src/tools/java"
+      destdir="${common-lucene.build.dir}/classes/tools">
       <classpath refid="classpath"/>
     </compile>
   </target>
Index: modules/facet/build.xml
===================================================================
--- modules/facet/build.xml	(revision 1141246)
+++ modules/facet/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -30,7 +30,7 @@
   <property name="dist.dir" location="dist/" />
 
   <!-- TODO, cut over tests to MockAnalyzer etc and nuke this dependency -->
-  <module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
+  <module-uptodate name="analysis/common" jarfile="${common-lucene.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
       property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
 
   <path id="examples.classpath">
@@ -64,12 +64,12 @@
 
   <target name="jar-analyzers-common" unless="analyzers-common.uptodate">
     <subant target="jar-core">
-      <fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
+      <fileset dir="${common-lucene.dir}/../modules/analysis/common" includes="build.xml"/>
     </subant>
   </target>
     
-  <target name="compile-core" depends="jar-analyzers-common,common.compile-core,compile-examples" description="Compiles facet classes" />
+  <target name="compile-core" depends="jar-analyzers-common,common-lucene.compile-core,compile-examples" description="Compiles facet classes" />
 
-  <target name="jar-core" depends="common.jar-core,jar-examples" />
+  <target name="jar-core" depends="common-lucene.jar-core,jar-examples" />
 
 </project>
Index: lucene/contrib/highlighter/build.xml
===================================================================
--- lucene/contrib/highlighter/build.xml	(revision 1140379)
+++ lucene/contrib/highlighter/build.xml	Thu Jun 30 15:14:19 NZST 2011
@@ -34,7 +34,7 @@
     <path refid="base.classpath"/>
   </path>
 
-  <target name="compile-core" depends="build-memory, build-queries, common.compile-core" />
+  <target name="compile-core" depends="build-memory, build-queries, common-lucene.compile-core" />
 
   <target name="build-memory" unless="memory.uptodate">
     <echo>Highlighter building dependency contrib/memory</echo>