lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1241730 - in /lucene/dev/branches/branch_3x: ./ dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/ dev-tools/maven/lucene/ dev-tools/maven/lucene/core/ dev-tools/maven/lucene/src/ dev-tools/maven/lucene/test-framework/ dev-too...
Date Wed, 08 Feb 2012 01:49:34 GMT
Author: sarowe
Date: Wed Feb  8 01:49:32 2012
New Revision: 1241730

URL: http://svn.apache.org/viewvc?rev=1241730&view=rev
Log:
LUCENE-3753: Restructure the Lucene build system

Added:
    lucene/dev/branches/branch_3x/dev-tools/maven/lucene/core/
    lucene/dev/branches/branch_3x/dev-tools/maven/lucene/core/pom.xml.template
      - copied, changed from r1241727, lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template
    lucene/dev/branches/branch_3x/dev-tools/maven/lucene/test-framework/
    lucene/dev/branches/branch_3x/dev-tools/maven/lucene/test-framework/pom.xml.template
      - copied, changed from r1241727, lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template
    lucene/dev/branches/branch_3x/dev-tools/scripts/LUCENE-3753.patch.hack.pl   (with props)
    lucene/dev/branches/branch_3x/lucene/core/
    lucene/dev/branches/branch_3x/lucene/core/build.xml   (with props)
    lucene/dev/branches/branch_3x/lucene/core/src/
    lucene/dev/branches/branch_3x/lucene/core/src/java/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/java/
    lucene/dev/branches/branch_3x/lucene/core/src/test/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/test/
    lucene/dev/branches/branch_3x/lucene/site/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/site/
    lucene/dev/branches/branch_3x/lucene/test-framework/
    lucene/dev/branches/branch_3x/lucene/test-framework/build.xml   (with props)
    lucene/dev/branches/branch_3x/lucene/test-framework/src/
    lucene/dev/branches/branch_3x/lucene/test-framework/src/java/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/test-framework/java/
    lucene/dev/branches/branch_3x/lucene/test-framework/src/resources/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/test-framework/resources/
    lucene/dev/branches/branch_3x/lucene/tools/
    lucene/dev/branches/branch_3x/lucene/tools/build.xml   (with props)
    lucene/dev/branches/branch_3x/lucene/tools/javadoc/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/tools/javadoc/
    lucene/dev/branches/branch_3x/lucene/tools/prettify/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/tools/prettify/
    lucene/dev/branches/branch_3x/lucene/tools/src/
    lucene/dev/branches/branch_3x/lucene/tools/src/java/
      - copied from r1241727, lucene/dev/branches/branch_3x/lucene/src/tools/java/
Removed:
    lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/
    lucene/dev/branches/branch_3x/lucene/src/
Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/branch_3x/dev-tools/idea/.idea/ant.xml
    lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml
    lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml
    lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/CHANGES.txt
    lucene/dev/branches/branch_3x/lucene/backwards/backwards-readme.txt
    lucene/dev/branches/branch_3x/lucene/build.xml
    lucene/dev/branches/branch_3x/lucene/common-build.xml
    lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
    lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml
    lucene/dev/branches/branch_3x/lucene/contrib/join/build.xml
    lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/package.html
    lucene/dev/branches/branch_3x/lucene/site/build/site/scoring.html
    lucene/dev/branches/branch_3x/lucene/site/src/documentation/content/xdocs/scoring.xml
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/build.xml
    lucene/dev/branches/branch_3x/solr/common-build.xml
    lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml
    lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml
    lucene/dev/branches/branch_3x/solr/core/build.xml
    lucene/dev/branches/branch_3x/solr/test-framework/build.xml

Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Wed Feb  8 01:49:32 2012
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="lucene/src/java"/>
-	<classpathentry kind="src" path="lucene/src/test-framework/java"/>
-	<classpathentry kind="src" path="lucene/src/test"/>
+	<classpathentry kind="src" path="lucene/core/src/java"/>
+	<classpathentry kind="src" path="lucene/core/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/analyzers/common/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/analyzers/common/src/resources"/>
 	<classpathentry kind="src" path="lucene/contrib/analyzers/common/src/test"/>
@@ -54,6 +53,7 @@
 	<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/test"/>
 	<classpathentry kind="src" path="lucene/contrib/pruning/src/java"/>
 	<classpathentry kind="src" path="lucene/contrib/pruning/src/test"/>
+	<classpathentry kind="src" path="lucene/test-framework/src/java"/>
 	<classpathentry kind="src" path="solr/core/src/java"/>
 	<classpathentry kind="src" path="solr/core/src/test"/>
 	<classpathentry kind="src" path="solr/core/src/test-files"/>

Modified: lucene/dev/branches/branch_3x/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/.idea/ant.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/.idea/ant.xml Wed Feb  8 01:49:32 2012
@@ -26,6 +26,9 @@
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/spatial/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/spellchecker/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/lucene/contrib/xml-query-parser/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/core/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/core/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />

Modified: lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/.idea/workspace.xml Wed Feb  8 01:49:32 2012
@@ -8,7 +8,7 @@
       <module name="analysis-extras" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-analysis-extras" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.6 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="benchmark contrib" type="JUnit" factoryName="JUnit">
@@ -22,7 +22,7 @@
       <module name="clustering" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-clustering" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.6 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="common analyzer contrib" type="JUnit" factoryName="JUnit">
@@ -119,8 +119,8 @@
     <configuration default="false" name="lucene" type="JUnit" factoryName="JUnit">
       <module name="lucene" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build" />
-      <option name="VM_PARAMETERS" value="-ea -Dlucene.version=3.5-SNAPSHOT -DtempDir=temp" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/lucene-idea" />
+      <option name="VM_PARAMETERS" value="-ea -Dlucene.version=3.6-SNAPSHOT -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="memory contrib" type="JUnit" factoryName="JUnit">
@@ -183,7 +183,7 @@
       <module name="solr" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/solr-idea" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.6 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="spatial contrib" type="JUnit" factoryName="JUnit">
@@ -211,7 +211,7 @@
       <module name="uima" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/solr-uima" />
-      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.5 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
+      <option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=3.6 -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="xml-query-parser contrib" type="JUnit" factoryName="JUnit">

Modified: lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/branch_3x/dev-tools/idea/lucene/lucene.iml Wed Feb  8 01:49:32 2012
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/java" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <output url="file://$MODULE_DIR$/build/lucene-idea/classes/java" />
+    <output-test url="file://$MODULE_DIR$/build/lucene-idea/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/demo" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jsp" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/tools/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test-framework/src/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test-framework/src/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tools/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
     </content>

Copied: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/core/pom.xml.template (from r1241727, lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/core/pom.xml.template?p2=lucene/dev/branches/branch_3x/dev-tools/maven/lucene/core/pom.xml.template&p1=lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template&r1=1241727&r2=1241730&rev=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/core/pom.xml.template Wed Feb  8 01:49:32 2012
@@ -32,8 +32,8 @@
   <name>Lucene Core</name>
   <description>Apache Lucene Java Core</description>
   <properties>
-    <module-directory>lucene</module-directory>
-    <build-directory>../build</build-directory>
+    <module-directory>lucene/core</module-directory>
+    <build-directory>../build/lucene-maven</build-directory>
   </properties>
   <dependencies>
     <dependency>
@@ -56,13 +56,13 @@
     <directory>${build-directory}</directory>
     <outputDirectory>${build-directory}/classes/java</outputDirectory>
     <testOutputDirectory>${build-directory}/classes/test</testOutputDirectory>
-    <sourceDirectory>java</sourceDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>
-        <directory>resources</directory>
+        <directory>src/resources</directory>
       </resource>
     </resources>
-    <testSourceDirectory>test</testSourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
     <testResources>
       <testResource>
         <directory>${project.build.testSourceDirectory}</directory>
@@ -71,10 +71,10 @@
         </excludes>
       </testResource>
       <testResource>
-        <directory>test-framework/resources</directory>
+        <directory>../test-framework/src/resources</directory>
       </testResource>
       <testResource>
-        <directory>test-framework/java</directory>
+        <directory>../test-framework/src/java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
@@ -136,7 +136,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>test-framework</source>
+                <source>../test-framework/src/java</source>
               </sources>
             </configuration>
           </execution>

Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/pom.xml.template Wed Feb  8 01:49:32 2012
@@ -32,8 +32,8 @@
   <name>Lucene parent POM</name>
   <description>Lucene parent POM</description>
   <modules>
-    <module>src</module>
-    <module>src/test-framework</module>
+    <module>core</module>
+    <module>test-framework</module>
     <module>contrib</module>
   </modules>
   <build>

Copied: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/test-framework/pom.xml.template (from r1241727, lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/test-framework/pom.xml.template?p2=lucene/dev/branches/branch_3x/dev-tools/maven/lucene/test-framework/pom.xml.template&p1=lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template&r1=1241727&r2=1241730&rev=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/src/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/test-framework/pom.xml.template Wed Feb  8 01:49:32 2012
@@ -24,7 +24,7 @@
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-parent</artifactId>
     <version>@version@</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.lucene</groupId>
   <artifactId>lucene-test-framework</artifactId>
@@ -32,8 +32,8 @@
   <name>Lucene Test Framework</name>
   <description>Apache Lucene Java Test Framework</description>
   <properties>
-    <module-directory>lucene/src/test-framework</module-directory>
-    <build-directory>../../build</build-directory>
+    <module-directory>lucene/test-framework</module-directory>
+    <build-directory>../build/test-framework</build-directory>
   </properties>
   <dependencies>
     <dependency>
@@ -52,11 +52,11 @@
   </dependencies>
   <build>
     <directory>${build-directory}</directory>
-    <outputDirectory>${build-directory}/classes/test-framework</outputDirectory>
-    <sourceDirectory>java</sourceDirectory>
+    <outputDirectory>${build-directory}/classes/java</outputDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>
-        <directory>resources</directory>
+        <directory>src/resources</directory>
       </resource>
       <resource>
         <directory>${project.build.sourceDirectory}</directory>

Added: lucene/dev/branches/branch_3x/dev-tools/scripts/LUCENE-3753.patch.hack.pl
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/scripts/LUCENE-3753.patch.hack.pl?rev=1241730&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/scripts/LUCENE-3753.patch.hack.pl (added)
+++ lucene/dev/branches/branch_3x/dev-tools/scripts/LUCENE-3753.patch.hack.pl Wed Feb  8 01:49:32 2012
@@ -0,0 +1,108 @@
+#!/usr/bin/perl
+#
+# This script can be used to fix up paths that were moved as a result
+# of the structural changes committed as part of LUCENE-3753.
+#
+# Input is on STDIN, output is to STDOUT
+#
+# Example use:
+#
+#    perl LUCENE-3753.patch.hack.pl <my.pre-LUCENE-3753.patch >my.post-LUCENE-3753.patch
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+use strict;
+use warnings;
+
+my @moves = (
+
+    'lucene/src/java'
+ => 'lucene/core/src/java',
+
+    'lucene/src/test'
+ => 'lucene/core/src/test',
+
+    'lucene/src/site'
+ => 'lucene/site',
+
+    'lucene/src/test-framework/java'
+ => 'lucene/test-framework/src/java',
+
+    'lucene/src/test-framework/resources'
+ => 'lucene/test-framework/src/resources',
+
+    'lucene/src/tools/java'
+ => 'lucene/tools/src/java',
+
+    'lucene/src/tools/javadoc'
+ => 'lucene/tools/javadoc',
+
+    'lucene/src/tools/prettify'
+ => 'lucene/tools/prettify',
+
+    'dev-tools/maven/lucene/src/pom.xml.template'
+ => 'dev-tools/maven/lucene/core/pom.xml.template',
+ 
+    'dev-tools/maven/lucene/src/test-framework/pom.xml.template'
+ => 'dev-tools/maven/lucene/test-framework/pom.xml.template',
+);
+
+my @copies = ();
+
+my $diff;
+
+while (<>) {
+  if (/^Index/) {
+    my $next_diff = $_;
+    &fixup_paths if ($diff);
+    $diff = $next_diff;
+  } else {
+    $diff .= $_;
+  }
+}
+
+&fixup_paths; # Handle the final diff
+
+sub fixup_paths {
+  for (my $move_pos = 0 ; $move_pos < $#moves ; $move_pos += 2) {
+    my $source = $moves[$move_pos];
+    my $target = $moves[$move_pos + 1];
+    if ($diff =~ /^Index: \Q$source\E/) {
+      $diff =~ s/^Index: \Q$source\E/Index: $target/;
+      $diff =~ s/\n--- \Q$source\E/\n--- $target/;
+      $diff =~ s/\n\+\+\+ \Q$source\E/\n+++ $target/;
+      $diff =~ s/\nProperty changes on: \Q$source\E/\nProperty changes on: $target/;
+      last;
+    }
+  }
+  print $diff;
+
+  for (my $copy_pos = 0 ; $copy_pos < $#copies ; $copy_pos += 2) {
+    my $source = $copies[$copy_pos];
+    my $target = $copies[$copy_pos + 1];
+    if ($diff =~ /^Index: \Q$source\E/) {
+      my $new_diff = $diff;
+      $new_diff =~ s/^Index: \Q$source\E/Index: $target/;
+      $new_diff =~ s/\n--- \Q$source\E/\n--- $target/;
+      $new_diff =~ s/\n\+\+\+ \Q$source\E/\n+++ $target/;
+      $new_diff =~ s/\nProperty changes on: \Q$source\E/\nProperty changes on: $target/;
+      print $new_diff;
+      last;
+    }
+  }
+}

Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Wed Feb  8 01:49:32 2012
@@ -215,6 +215,17 @@ Build
 
   (Steve Rowe, hossman)
 
+* LUCENE-3753: Restructure the Lucene build system:
+  - Created a new Lucene-internal module named "core" by moving the java/
+    and test/ directories from lucene/src/ to lucene/core/src/.
+  - Eliminated lucene/src/ by moving all its directories up one level.
+  - Each internal module (core/, test-framework/, and tools/) now has its own
+    build.xml, from which it is possible to run module-specific targets.
+    lucene/build.xml delegates all build tasks (via
+    <ant dir="internal-module-dir"> calls) to these modules' build.xml files.
+  (Steve Rowe)
+
+
 ======================= Lucene 3.5.0 =======================
 
 Changes in backwards compatibility policy

Modified: lucene/dev/branches/branch_3x/lucene/backwards/backwards-readme.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/backwards/backwards-readme.txt?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/backwards/backwards-readme.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/backwards/backwards-readme.txt Wed Feb  8 01:49:32 2012
@@ -10,12 +10,12 @@ later bugfix releases should not be test
 compatible to the last base version, bugfixes should not taken into account):
 
 * cd lucene/backwards
-* svn rm src/test src/test-framework lib/lucene-core*.jar
+* svn rm core/src/test test-framework lib/lucene-core*.jar
 * svn commit (1st commit; you must do this, else you will corrupt your checkout)
-* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/src/test-framework src
-* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/src/test src
+* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/test-framework ./
+* svn cp https://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_X_Y_0/lucene/core/src/test core/src/
 * Copy the lucene-core.jar from the last release tarball to lib.
-* Check that everything is correct: The backwards folder should contain a src/ folder
-  that now contains "test" and "test-framework". The files should be the ones from the last version.
+* Check that everything is correct: The backwards folder should contain folders "core/src/test/"
+  and "test-framework/". The files should be the ones from the last version.
 * Run "ant test-backwards"
 * Commit the stuff again (2nd commit)

Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Wed Feb  8 01:49:32 2012
@@ -17,16 +17,13 @@
     limitations under the License.
  -->
 
-<project name="core" default="default" basedir="."
+<project name="lucene" default="default" basedir="."
          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-  <property name="junit.includes" value="**/Test*.java"/>
-
   <import file="common-build.xml"/>
 
-  <!-- Build classpath -->
   <path id="classpath">
-    <pathelement location="${build.dir}/classes/java"/>
+    <pathelement location="${common.dir}/build/core/classes/java"/>
   </path>
 
   <path id="demo.classpath">
@@ -34,23 +31,8 @@
     <pathelement location="${build.dir}/classes/demo"/>
   </path>
 
-  <path id="test.classpath">
-  	<path refid="classpath"/>
-    <path refid="junit-path"/>
-    <pathelement location="${build.dir}/classes/test-framework"/>
-    <pathelement location="${build.dir}/classes/test"/>
-  </path>
-
-  <path id="junit.classpath">
-    <path refid="junit-path"/>
-    <pathelement location="${build.dir}/classes/test-framework"/>
-    <pathelement location="${build.dir}/classes/test"/>
-    <pathelement location="${build.dir}/classes/java"/>
-    <pathelement path="${java.class.path}"/>
-  </path>
-
   <patternset id="binary.build.dist.patterns"
-              includes="${final.name}*.jar,lucene-test-framework*.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+              includes="docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
               excludes="*-src.jar"
   />
   <patternset id="binary.root.dist.patterns"
@@ -62,9 +44,11 @@
   <!-- Prepares the build directory                                       -->
   <!-- ================================================================== -->
 
-  <target name="test-core" depends="common.test"
-          description="Runs unit tests for the core Lucene code"
-  />
+  <target name="test-core" description="Runs unit tests for the core Lucene code">
+    <ant dir="${common.dir}/core" target="test" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+  </target>
   <target name="test" depends="test-core, test-contrib, test-backwards"
           description="Runs all unit tests (core, contrib and back-compat)"
   />
@@ -162,13 +146,7 @@
     </parallel>
   </target>
 
-  <!-- ================================================================== -->
-  <!-- J A R                                                              -->
-  <!-- ================================================================== -->
-  <!--                                                                    -->
-  <!-- ================================================================== -->
-
-  <target name="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
+  <target name="compile-core" depends="compile-lucene-core"/>
 
   <!-- ================================================================== -->
   <!-- D O C U M E N T A T I O N                                          -->
@@ -178,7 +156,7 @@
   <target name="docs">
   <!-- copies the docs over to the docs folder -->
     <copy todir="build/docs">
-      <fileset dir="src/site/build/site"/> 
+      <fileset dir="site/build/site"/> 
     </copy>
   </target>
 
@@ -203,18 +181,15 @@
   </target>
 	
   <target name="javadocs-core" description="Generate javadoc for core classes">
-  	<sequential>
-      <mkdir dir="${javadoc.dir}/core"/>
-      <invoke-javadoc
-        destdir="${javadoc.dir}/core"
-      	title="${Name} ${version} core API">
-        <sources>
-          <packageset dir="src/java"/>
-          <link href=""/>
-        </sources>
-      </invoke-javadoc>
-     <jarify basedir="${javadoc.dir}/core" destfile="${build.dir}/${final.name}-javadoc.jar"/>
-    </sequential>
+    <ant dir="${common.dir}/core" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+  </target>
+
+  <target name="javadocs-test-framework">
+    <ant dir="${common.dir}/test-framework" target="javadocs" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
   <target name="javadocs-contrib" description="Generate javadoc for contrib classes">
@@ -235,12 +210,12 @@
         </fileset>
       </path>
 
-      <invoke-javadoc
-        destdir="${javadoc.dir}/all">
+      <invoke-javadoc overview="${common.dir}/core/src/java/overview.html"
+                      destdir="${javadoc.dir}/all">
         <sources>
           <!-- TODO: find a dynamic way to do include multiple source roots -->
-          <packageset dir="src/java"/>
-          <packageset dir="src/test-framework/java"/>
+          <packageset dir="core/src/java"/>
+          <packageset dir="test-framework/src/java"/>
 
           <!-- please keep this list up to date, and in alpha order...   -->
 
@@ -308,7 +283,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar-core, jar-test-framework, docs, javadocs, build-contrib, init-dist, changes-to-html"/>
+  <target name="package" depends="jar-lucene-core, jar-test-framework, docs, javadocs, build-contrib, init-dist, changes-to-html"/>
 
   <target name="nightly" depends="test, package-tgz">
   </target>
@@ -327,6 +302,12 @@
         <patternset refid="binary.root.dist.patterns"/>
       </zipfileset>
       <zipfileset dir="${build.dir}" includes="build-demo.xml" fullpath="lucene-${version}/build.xml"/>
+      <zipfileset prefix="lucene-${version}" dir="${build.dir}/core">
+        <patternset includes="lucene-core*.jar" excludes="*-src.jar"/>
+      </zipfileset>
+      <zipfileset prefix="lucene-${version}" dir="${build.dir}/test-framework">
+        <patternset includes="lucene-test-framework*.jar" excludes="*-src.jar"/>
+      </zipfileset>
       <zipfileset prefix="lucene-${version}" dir="${build.dir}">
         <patternset refid="binary.build.dist.patterns"/>
       </zipfileset>
@@ -345,6 +326,12 @@
     <delete file="${build.dir}/lucene-${version}.tar"/>
     <delete file="${dist.dir}/lucene-${version}.tgz"/>
     <tar tarfile="${build.dir}/lucene-${version}.tar" longfile="gnu">
+      <tarfileset prefix="lucene-${version}" dir="${build.dir}/core">
+        <patternset includes="lucene-core*.jar" excludes="*-src.jar"/>
+      </tarfileset>
+      <tarfileset prefix="lucene-${version}" dir="${build.dir}/test-framework">
+        <patternset includes="lucene-test-framework*.jar" excludes="*-src.jar"/>
+      </tarfileset>
       <tarfileset prefix="lucene-${version}" dir=".">
         <patternset refid="binary.root.dist.patterns"/>
       </tarfileset>
@@ -396,9 +383,9 @@
     <svn-export-source source.dir="."/>
 
     <!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
-    <delete dir="${svn.export.dir}/src/tools/javadoc/java5"/>
+    <delete dir="${svn.export.dir}/tools/javadoc/java5"/>
 
-    <build-changes changes.src.dir="${svn.export.dir}/src/site/changes"
+    <build-changes changes.src.dir="${svn.export.dir}/site/changes"
                    changes.target.dir="${svn.export.dir}/docs/changes"/>
     <tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
@@ -437,34 +424,23 @@
 
   <target name="stage" depends="prepare-release, copy-to-stage"/>
 
-  <target name="generate-maven-artifacts"
-          depends="package, jar-src, jar-test-framework-src, javadocs">
+  <target name="generate-maven-artifacts" depends="package, javadocs">
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
              uri="antlib:org.apache.maven.artifact.ant" 
              classpathref="maven-ant-tasks.classpath"/>
     <sequential>
+      
       <ant target="get-maven-poms" dir=".."/>
 
       <m2-deploy pom.xml="../pom.xml"/> <!-- Lucene/Solr grandparent POM -->
       <m2-deploy pom.xml="pom.xml"/>    <!-- Lucene parent POM -->
-      <m2-deploy pom.xml="src/pom.xml"> <!-- Lucene core POM -->
-        <artifact-attachments>
-          <attach file="${build.dir}/${final.name}-src.jar"
-                  classifier="sources"/>
-          <attach file="${build.dir}/${final.name}-javadoc.jar"
-                  classifier="javadoc"/>
-        </artifact-attachments>
-      </m2-deploy>
-      <m2-deploy pom.xml="src/test-framework/pom.xml"
-                 jar.file="${build.dir}/lucene-test-framework-${version}.jar">
-        <artifact-attachments>
-          <attach file="${build.dir}/lucene-test-framework-${version}-src.jar"
-                  classifier="sources"/>
-          <attach file="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
-                  classifier="javadoc"/>
-        </artifact-attachments>
-      </m2-deploy>
-
+      
+      <subant target="dist-maven" failonerror="true" inheritall="false">
+        <propertyset refid="uptodate.and.compiled.properties"/>
+        <fileset dir="${common.dir}/core" includes="build.xml"/>
+        <fileset dir="${common.dir}/test-framework" includes="build.xml"/>
+      </subant>
+      
       <contrib-crawl target="dist-maven"/>
     </sequential>
   </target>
@@ -593,12 +569,20 @@
     </delete>
   </target>
 
-  <target name="build-contrib" depends="compile-test"
+  <target name="build-contrib" depends="common.compile-test"
           description="Builds all contrib modules and their tests">
     <contrib-crawl target="build-artifacts-and-tests"/>
   </target>
 
-  <target name="test-contrib" depends="build-contrib">
+   <target name="compile-test" depends="compile-lucene-core,compile-test-framework"
+           description="Builds core, test-framework, and contrib tests">
+     <ant dir="${common.dir}/core" target="compile-test" inheritAll="false">
+       <propertyset refid="uptodate.and.compiled.properties"/>
+     </ant>
+     <contrib-crawl target="compile-test" failonerror="true"/>
+   </target>
+
+  <target name="test-contrib" depends="compile-test">
     <contrib-crawl target="test" failonerror="true"/>
   </target>
 
@@ -641,39 +625,18 @@
     <patch patchfile="${patch.file}" strip="0"/>
   </target>
 
-  <target name="jar-test-framework" depends="compile-test-framework">
-    <jarify basedir="${build.dir}/classes/test-framework" destfile="${build.dir}/lucene-test-framework-${version}.jar"
-            title="Lucene Search Engine: Test Framework" />
-  </target>
-
-  <target name="javadocs-test-framework">
-	<sequential>
-      <mkdir dir="${javadoc.dir}/test-framework"/>
-      <invoke-javadoc
-          overview="src/test-framework/java/overview.html"
-          destdir="${javadoc.dir}/test-framework"
-          title="${Name} ${version} Test Framework API">
-        <sources>
-          <packageset dir="src/test-framework/java"/>
-          <link offline="true" href="${javadoc.link.junit}"
-                packagelistLoc="${javadoc.packagelist.dir}/junit"/>
-          <link href=""/>
-        </sources>
-      </invoke-javadoc>
-      <jarify basedir="${javadoc.dir}/test-framework" destfile="${build.dir}/lucene-test-framework-${version}-javadoc.jar"
-	          title="Lucene Search Engine: Test Framework" />
-    </sequential>
-  </target>
-
-  <target name="jar-test-framework-src" depends="init">
-    <jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/lucene-test-framework-${version}-src.jar"
-            title="Lucene Search Engine: Test Framework">
-      <fileset dir="${tests-framework.src.dir}/../resources" erroronmissingdir="no"/>
-    </jarify>
+  <target name="jar-test-framework">
+    <ant dir="${common.dir}/test-framework" target="jar-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
   </target>
 
   <!-- Override common-build.xml definition to check for the jar already being up-to-date -->
-  <target name="jar-core" depends="check-lucene-core-uptodate,compile-core" unless="lucene-core.uptodate">
-    <jarify/>
+  <target name="jar-core" depends="check-lucene-core-uptodate,compile-lucene-core" unless="lucene-core.uptodate">
+    <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="core.compiled" value="true"/>
+    <property name="lucene-core.uptodate" value="true"/>
   </target>
 </project>

Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Wed Feb  8 01:49:32 2012
@@ -25,7 +25,7 @@
 
   <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="prettify.dir" value="${common.dir}/tools/prettify"/>
   <property name="maven.build.dir" value="${build.dir}/maven"/>
 
   <!-- Give user a chance to override without editing this file
@@ -63,7 +63,7 @@
   </path>
 
   <path id="tools.runtime.classpath">
-    <pathelement location="${common.dir}/build/classes/tools"/>
+    <pathelement location="${common.dir}/build/tools/classes/java"/>
   </path>
 
   <path id="maven-ant-tasks.classpath">
@@ -107,7 +107,7 @@
 
   <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/"/>
   <property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
-  <property name="javadoc.packagelist.dir" value="${common.dir}/src/tools/javadoc"/>
+  <property name="javadoc.packagelist.dir" value="${common.dir}/tools/javadoc"/>
   <available file="${javadoc.packagelist.dir}/java5/package-list" property="javadoc.java5.packagelist.exists"/>
   <property name="javadoc.access" value="protected"/>
   <property name="javadoc.charset" value="utf-8"/>
@@ -123,7 +123,7 @@
     </fileset>
   </path>
 	
-  <property name="changes.src.dir" value="${common.dir}/src/site/changes"/>
+  <property name="changes.src.dir" value="${common.dir}/site/changes"/>
   <property name="changes.target.dir" value="${common.dir}/build/docs/changes"/>
 
   <property name="project.name" value="site"/> <!-- todo: is this used by anakia or something else? -->
@@ -131,13 +131,13 @@
 
   <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/java"/>
+  <property name="tests-framework.src.dir" location="${common.dir}/test-framework/src/java"/>
   <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="tests.lockdir" location="${common.build.dir}"/>
-  <property name="dist.dir" location="dist"/>
-  <property name="maven.dist.dir" location="dist/maven"/>
+  <property name="dist.dir" location="${common.dir}/dist"/>
+  <property name="maven.dist.dir" location="${dist.dir}/maven"/>
   <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
   <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/>
 
@@ -211,7 +211,7 @@
 
   <patternset id="lucene.local.src.package.patterns"
               includes="src/,index.html,*build*.xml,docs/,*.txt,contrib/,lib/,backwards/"
-              excludes="**/pom.xml,**/*.iml,src/site/build/"
+              excludes="**/pom.xml,**/*.iml,site/build/"
   />
 
   <target name="clean"
@@ -448,48 +448,38 @@
     </sequential>
   </macrodef>
 
-  <property name="lucene-core.jar" value="${common.dir}/build/lucene-core-${version}.jar"/>
+  <property name="lucene-core.jar" value="${common.dir}/build/core/lucene-core-${version}.jar"/>
   <target name="check-lucene-core-uptodate" unless="lucene-core.uptodate">
     <uptodate property="lucene-core.uptodate" targetfile="${lucene-core.jar}">
-     	<srcfiles dir="${common.dir}/src/java" includes="**/*.java"/>
+     	<srcfiles dir="${common.dir}/core/src/java" includes="**/*.java"/>
     </uptodate>
   </target>
   <target name="jar-lucene-core" unless="lucene-core.uptodate" depends="check-lucene-core-uptodate">
-    <ant dir="${common.dir}" target="jar-core" inheritAll="false">
+    <echo>Got here #3</echo>
+    <ant dir="${common.dir}/core" target="jar-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
     <property name="lucene-core.uptodate" value="true"/>
   </target>
   <target name="compile-lucene-core" unless="core.compiled">
-    <ant dir="${common.dir}" target="compile-core" inheritAll="false">
+    <ant dir="${common.dir}/core" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
     <property name="core.compiled" value="true"/>
   </target>
   
-  <path id="test-framework.classpath">
-    <path refid="ant-path"/>
-    <path refid="test.classpath"/>
-  </path>
-  
-  <target name="compile-test-framework" depends="compile-core">
-  	<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
-  						test.classpath="test-framework.classpath"/>
-       <!-- Copy the resources folder (if existent) -->
-       <copy todir="${common.dir}/build/classes/test-framework">
-          <fileset dir="${tests-framework.src.dir}/../resources" erroronmissingdir="no"/>
-       </copy>
+  <target name="compile-test-framework" unless="lucene.test.framework.compiled">
+    <ant dir="${common.dir}/test-framework" target="compile-core" inheritAll="false">
+      <propertyset refid="uptodate.and.compiled.properties"/>
+    </ant>
+    <property name="lucene.test.framework.compiled" value="true"/>
   </target>
 
   <target name="compile-tools">
-    <compile
-      srcdir="${common.dir}/src/tools/java"
-      destdir="${common.build.dir}/classes/tools">
-      <classpath refid="classpath"/>
-    </compile>
+    <ant dir="${common.dir}/tools" target="compile-core" inheritAll="false"/>
   </target>
 
-  <target name="compile-test" depends="compile-test-framework">
+  <target name="compile-test" depends="compile-core,compile-test-framework">
   	<compile-test-macro srcdir="${tests.src.dir}" destdir="${build.dir}/classes/test"
   						test.classpath="test.classpath"/>
   </target>
@@ -760,6 +750,24 @@
 
   <target name="default" depends="jar-core"/>
 
+  <available type="file" file="pom.xml" property="pom.xml.present"/>
+  
+  <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
+    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
+             uri="antlib:org.apache.maven.artifact.ant" 
+             classpathref="maven-ant-tasks.classpath"/>
+    <sequential>
+      <m2-deploy>
+        <artifact-attachments>
+          <attach file="${build.dir}/${final.name}-src.jar"
+                  classifier="sources"/>
+          <attach file="${build.dir}/${final.name}-javadoc.jar"
+                  classifier="javadoc"/>
+        </artifact-attachments>
+      </m2-deploy>
+    </sequential>
+  </target>
+
   <target name="rat-sources-typedef">
     <typedef resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:rat.anttasks">
       <classpath>

Modified: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml Wed Feb  8 01:49:32 2012
@@ -234,7 +234,7 @@
 		     />
     </target>
 
-  <target name="dist-maven" depends="contrib-build.dist-maven">
+  <target name="dist-maven" depends="common.dist-maven">
     <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
                                  jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar" />
   </target>

Modified: lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/contrib-build.xml Wed Feb  8 01:49:32 2012
@@ -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.dir}/build/core/classes/java"/>
    <pathelement path="${project.classpath}"/>
   </path>
   
@@ -40,7 +40,7 @@
   
   <path id="test.base.classpath">
     <path refid="classpath"/>
-    <pathelement location="${common.dir}/build/classes/test-framework"/>
+    <pathelement location="${common.dir}/build/test-framework/classes/java"/>
     <path refid="junit-path"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>
@@ -61,28 +61,6 @@
     <antcall target="common.test" inheritRefs="true" />
   </target>
   <target name="build-artifacts-and-tests" depends="jar, compile-test" />
-	
-  <available 
-    type="file" 
-    file="pom.xml" 
-    property="pom.xml.present">
-  </available>
-
-<target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
-  <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
-           uri="antlib:org.apache.maven.artifact.ant"
-           classpathref="maven-ant-tasks.classpath"/>
-    <sequential>
-      <m2-deploy>
-        <artifact-attachments>
-          <attach file="${build.dir}/${final.name}-src.jar"
-                  classifier="sources"/>
-          <attach file="${build.dir}/${final.name}-javadoc.jar"
-                  classifier="javadoc"/>
-        </artifact-attachments>
-      </m2-deploy>
-    </sequential>
-  </target>
 
   <target name="javadocs" depends="compile-core">
    	<sequential>

Modified: lucene/dev/branches/branch_3x/lucene/contrib/join/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/join/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/join/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/join/build.xml Wed Feb  8 01:49:32 2012
@@ -20,5 +20,5 @@
 
   <target name="init" depends="contrib-build.init,jar-grouping"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven" />
+  <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven" />
 </project>

Added: lucene/dev/branches/branch_3x/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/core/build.xml?rev=1241730&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/core/build.xml (added)
+++ lucene/dev/branches/branch_3x/lucene/core/build.xml Wed Feb  8 01:49:32 2012
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="core" default="default">
+  <description>Lucene Core</description>
+
+  <property name="build.dir" location="../build/core"/>
+
+  <import file="../common-build.xml"/>
+
+  <path id="classpath"/>
+  
+  <path id="test.classpath">
+    <pathelement location="${common.dir}/build/test-framework/classes/java"/>
+    <path refid="junit-path"/>
+    <pathelement location="${build.dir}/classes/java"/>
+    <pathelement location="${build.dir}/classes/test"/>
+  </path>
+
+  <path id="junit.classpath">
+    <path refid="test.classpath"/>
+    <pathelement path="${java.class.path}"/>
+  </path>
+
+  <target name="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
+  
+  <target name="test-core" depends="common.test"/>
+
+  <target name="javadocs-core" depends="javadocs"/>
+  <target name="javadocs" description="Generate javadoc for core classes">
+  	<sequential>
+      <mkdir dir="${javadoc.dir}/core"/>
+      <invoke-javadoc destdir="${javadoc.dir}/core" title="${Name} ${version} core API">
+        <sources>
+          <packageset dir="${src.dir}"/>
+          <link href=""/>
+        </sources>
+      </invoke-javadoc>
+      <mkdir dir="${build.dir}"/>
+     <jarify basedir="${javadoc.dir}/core" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+    </sequential>
+  </target>
+
+  <macrodef name="createLevAutomaton">
+  	<attribute name="n"/>
+  	<sequential>
+      <exec dir="src/java/org/apache/lucene/util/automaton"
+            executable="${python.exe}" failonerror="true">
+        <arg line="createLevAutomata.py @{n} True"/>
+      </exec>
+      <exec dir="src/java/org/apache/lucene/util/automaton"
+            executable="${python.exe}" failonerror="true">
+        <arg line="createLevAutomata.py @{n} False"/>
+      </exec>
+    </sequential>
+  </macrodef>
+
+  <target name="createLevAutomata" depends="check-moman,clone-moman,pull-moman">
+  	<createLevAutomaton n="1"/>
+  	<createLevAutomaton n="2"/>
+  </target>
+  
+  <target name="check-moman">
+    <condition property="moman.cloned">
+      <available file="src/java/org/apache/lucene/util/automaton/moman"/>
+  	</condition>
+  </target>
+	
+  <target name="clone-moman" unless="moman.cloned">
+  	<exec dir="src/java/org/apache/lucene/util/automaton" 
+          executable="${hg.exe}" failonerror="true">
+      <arg line="clone -r ${moman.rev} ${moman.url} moman"/>
+    </exec>
+  </target>
+
+  <target name="pull-moman" if="moman.cloned">
+    <exec dir="src/java/org/apache/lucene/util/automaton/moman" 
+          executable="${hg.exe}" failonerror="true">
+      <arg line="pull -f -r ${moman.rev}"/>
+    </exec>
+  </target>
+</project>

Modified: lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/package.html?rev=1241730&r1=1241727&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/package.html (original)
+++ lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/package.html Wed Feb  8 01:49:32 2012
@@ -366,7 +366,7 @@ org.apache.lucene.search.Searcher#search
                 <a href="Scorer.html#score()">Scorer#score()</a> &mdash; Return the score of the
                 current document. This value can be determined in any
                 appropriate way for an application. For instance, the
-                <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/TermScorer.java?view=log">TermScorer</a>
+                <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TermScorer.java?view=log">TermScorer</a>
                 returns the tf * Weight.getValue() * fieldNorm.
             </li>
             <li>

Modified: lucene/dev/branches/branch_3x/lucene/site/build/site/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/site/build/site/scoring.html?rev=1241730&r1=1241727&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/site/build/site/scoring.html (original)
+++ lucene/dev/branches/branch_3x/lucene/site/build/site/scoring.html Wed Feb  8 01:49:32 2012
@@ -426,9 +426,9 @@ document.write("Last Published: " + docu
                 control finally passes to the <a href="api/core/org/apache/lucene/search/Weight.html">Weight</a> implementation and its
                     <a href="api/core/org/apache/lucene/search/Scorer.html">Scorer</a> instance.  In the case of any type of
                     <a href="api/core/org/apache/lucene/search/BooleanQuery.html">BooleanQuery</a>, scoring is handled by the
-                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight2</a>
+                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight2</a>
                     (link goes to ViewVC BooleanQuery java code which contains the BooleanWeight2 inner class) or
-                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight</a>
+                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight</a>
                     (link goes to ViewVC BooleanQuery java code, which contains the BooleanWeight inner class).
                 </p>
 <p>
@@ -549,7 +549,7 @@ document.write("Last Published: " + docu
                     the
                     <a href="api/core/org/apache/lucene/search/Scorer.html">Scorer</a>
                     is going to be a
-                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java?view=log">BooleanScorer2</a>
+                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java?view=log">BooleanScorer2</a>
                     (see the section on customizing your scoring for info on changing this.)
 
                 </p>

Modified: lucene/dev/branches/branch_3x/lucene/site/src/documentation/content/xdocs/scoring.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/site/src/documentation/content/xdocs/scoring.xml?rev=1241730&r1=1241727&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/site/src/documentation/content/xdocs/scoring.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/site/src/documentation/content/xdocs/scoring.xml Wed Feb  8 01:49:32 2012
@@ -147,9 +147,9 @@
                 control finally passes to the <a href="api/core/org/apache/lucene/search/Weight.html">Weight</a> implementation and its
                     <a href="api/core/org/apache/lucene/search/Scorer.html">Scorer</a> instance.  In the case of any type of
                     <a href="api/core/org/apache/lucene/search/BooleanQuery.html">BooleanQuery</a>, scoring is handled by the
-                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight2</a>
+                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight2</a>
                     (link goes to ViewVC BooleanQuery java code which contains the BooleanWeight2 inner class) or
-                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight</a>
+                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?view=log">BooleanWeight</a>
                     (link goes to ViewVC BooleanQuery java code, which contains the BooleanWeight inner class).
                 </p>
                 <p>
@@ -257,7 +257,7 @@
                     the
                     <a href="api/core/org/apache/lucene/search/Scorer.html">Scorer</a>
                     is going to be a
-                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java?view=log">BooleanScorer2</a>
+                    <a href="http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java?view=log">BooleanScorer2</a>
                     (see the section on customizing your scoring for info on changing this.)
 
                 </p>

Added: lucene/dev/branches/branch_3x/lucene/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/test-framework/build.xml?rev=1241730&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/test-framework/build.xml (added)
+++ lucene/dev/branches/branch_3x/lucene/test-framework/build.xml Wed Feb  8 01:49:32 2012
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="test-framework" default="default">
+  <description>Lucene Test Framework</description>
+
+  <property name="build.dir" location="../build/test-framework"/>
+
+  <import file="../common-build.xml"/>
+
+  <path id="classpath">
+    <pathelement location="${common.dir}/build/core/classes/java"/>
+    <path refid="junit-path"/>
+    <path refid="ant-path"/>
+  </path>
+
+  <target name="compile-core" depends="compile-lucene-core,common.compile-core" />
+
+  <target name="javadocs-core" depends="javadocs"/>
+  <target name="javadocs">
+    <sequential>
+      <mkdir dir="${javadoc.dir}/test-framework"/>
+      <invoke-javadoc overview="${src.dir}/overview.html"
+                      destdir="${javadoc.dir}/test-framework"
+                      title="${Name} ${version} Test Framework API">
+        <sources>
+          <packageset dir="${src.dir}"/>
+          <link offline="true" href="${javadoc.link.junit}"
+                packagelistLoc="${javadoc.packagelist.dir}/junit"/>
+          <link href=""/>
+        </sources>
+      </invoke-javadoc>
+      <mkdir dir="${build.dir}"/>
+      <jarify basedir="${javadoc.dir}/test-framework" 
+              destfile="${build.dir}/${final.name}-javadoc.jar"
+              title="Lucene Search Engine: Test Framework" />
+    </sequential>
+  </target>
+</project>

Added: lucene/dev/branches/branch_3x/lucene/tools/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/tools/build.xml?rev=1241730&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/tools/build.xml (added)
+++ lucene/dev/branches/branch_3x/lucene/tools/build.xml Wed Feb  8 01:49:32 2012
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+ -->
+
+<project name="tools" default="default">
+  <description>Lucene Tools</description>
+
+  <property name="build.dir" location="../build/tools"/>
+
+  <import file="../common-build.xml"/>
+
+  <target name="javadocs"/> <!-- to make common-build.xml happy -->
+  
+  <path id="classpath"/>
+</project>

Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Wed Feb  8 01:49:32 2012
@@ -102,7 +102,7 @@
          dest="luke/luke-${luke.version}.jar"/>
   </target>
   <path id="luke.classpath">
-    <pathelement location="${common.dir}/build/classes/java" />
+    <pathelement location="${common.dir}/build/core/classes/java" />
     <pathelement location="${common.dir}/build/contrib/xml-query-parser/classes/java" />
   </path>
   <target name="luke" depends="luke-download">
@@ -313,7 +313,7 @@
     <svn-export-source source.dir=".."/>
 
     <!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
-    <delete dir="${svn.export.dir}/lucene/src/tools/javadoc/java5"/>
+    <delete dir="${svn.export.dir}/lucene/tools/javadoc/java5"/>
 
     <tar destfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset dir="${svn.export.dir}"
@@ -550,7 +550,7 @@
       typically it is  colon seperated in Unix, semi-colon seperated
       on windows, ie:
  
-      ant stub-factories -Dstub.src.path="core/src:../lucene/contrib:../lucene/src/java"
+      ant stub-factories -Dstub.src.path="core/src:../lucene/contrib:../lucene/core/src/java"
  
       FYI: The file ${stub.list} contains a list of classes
       that seem to need stub factories. (if java files can be found to

Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Wed Feb  8 01:49:32 2012
@@ -154,7 +154,7 @@
     <property name="validated-solr.uptodate" value="true"/>
   </target>
   <path id="tools.runtime.classpath">
-    <pathelement location="${common.dir}/build/classes/tools"/>
+    <pathelement location="${common.dir}/build/tools/classes/java"/>
   </path>
 
   <target name="init-dist" >

Modified: lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/build.xml Wed Feb  8 01:49:32 2012
@@ -26,7 +26,7 @@
   <import file="../contrib-build.xml"/>
 
   <dirname file="${ant.file}" property="antfile.dir"/>
-  <target name="dist-maven" depends="contrib-build.dist-maven">
+  <target name="dist-maven" depends="common.dist-maven">
     <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-carrot2-core-pom.xml.template"
                                  jar.file="${antfile.dir}/lib/carrot2-core-3.5.0.jar" />
   </target>

Modified: lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/langid/build.xml Wed Feb  8 01:49:32 2012
@@ -32,7 +32,7 @@
   </path>
 
   <dirname file="${ant.file.solr-langid}" property="solr-langid.dir"/>
-  <target name="dist-maven" depends="jar-core,javadocs,jar-src,contrib-build.dist-maven">
+  <target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
     <m2-deploy-with-pom-template pom.xml="${solr-langid.dir}/lib/jsonic-pom.xml.template"
                                  jar.file="${solr-langid.dir}/lib/jsonic-1.2.0.jar" />
 

Modified: lucene/dev/branches/branch_3x/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/build.xml Wed Feb  8 01:49:32 2012
@@ -22,7 +22,7 @@
 
   <target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
 
-  <target name="dist-maven" depends="jar-core,javadocs,jar-src,contrib-build.dist-maven">
+  <target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
     <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/solr-commons-csv-pom.xml.template"
                                  jar.file="${common-solr.dir}/lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
 

Modified: lucene/dev/branches/branch_3x/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/build.xml?rev=1241730&r1=1241729&r2=1241730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/test-framework/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/test-framework/build.xml Wed Feb  8 01:49:32 2012
@@ -22,7 +22,7 @@
 
   <path id="javadoc.classpath">
     <path refid="classpath"/>
-    <pathelement location="${common.dir}/build/classes/test-framework"/>
+    <pathelement location="${common.dir}/build/test-framework/classes/java"/>
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 



Mime
View raw message