lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r941735 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/ lucene/backwards/src/test/org/apache/lucene/analysis/ lucene/backwards/src/test/org/apache/lucene/document/ lu...
Date Thu, 06 May 2010 13:59:07 GMT
Author: rmuir
Date: Thu May  6 13:59:06 2010
New Revision: 941735

URL: http://svn.apache.org/viewvc?rev=941735&view=rev
Log:
merge remaining fixes to build,tests,website: SOLR-1891, erik's velocity jar fix, grant's fixes to mailing lists and top-level compile

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/build.xml
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/CHANGES.txt   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/build.xml   (props changed)
    lucene/dev/branches/branch_3x/lucene/contrib/   (props changed)
    lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt   (props changed)
    lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/   (props changed)
    lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/build.xml
    lucene/dev/branches/branch_3x/solr/common-build.xml
    lucene/dev/branches/branch_3x/solr/contrib/velocity/build.xml
    lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar   (props changed)
    lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar   (props changed)
    lucene/dev/branches/branch_3x/solr/site/mailing_lists.html
    lucene/dev/branches/branch_3x/solr/site/mailing_lists.pdf
    lucene/dev/branches/branch_3x/solr/site/skin/basic.css
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
    lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
    lucene/dev/branches/branch_3x/solr/site/skin/print.css
    lucene/dev/branches/branch_3x/solr/site/skin/profile.css
    lucene/dev/branches/branch_3x/solr/site/skin/screen.css
    lucene/dev/branches/branch_3x/solr/site/tutorial.html
    lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template   (props changed)
    lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template   (props changed)
    lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/mailing_lists.xml
    lucene/dev/branches/branch_3x/solr/src/solrj/org/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestDistributedSearch.java
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
    lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java

Propchange: lucene/dev/branches/branch_3x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1 +1 @@
-/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270

Modified: lucene/dev/branches/branch_3x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/build.xml (original)
+++ lucene/dev/branches/branch_3x/build.xml Thu May  6 13:59:06 2010
@@ -18,7 +18,7 @@
  -->
 
 <project name="lucene-solr" default="test" basedir=".">
-  <target name="test">
+  <target name="test" description="Test both Lucene and Solr">
     <sequential>
       <subant target="test" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
@@ -30,7 +30,16 @@
     </sequential>
   </target>
 
-  <target name="clean">
+  <target name="compile" description="Compile Lucene and Solr">
+    <sequential>
+      <subant target="compile" inheritall="false" failonerror="true">
+        <!--<fileset dir="lucene" includes="build.xml" /> -->
+        <fileset dir="solr" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+  <target name="clean" description="Clean Lucene and Solr">
     <sequential>
       <subant target="clean" inheritall="false" failonerror="true">
         <fileset dir="lucene" includes="build.xml" />
@@ -39,4 +48,4 @@
     </sequential>
   </target>
 
-</project>
\ No newline at end of file
+</project>

Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,5 +1,5 @@
 /lucene/dev/trunk:932749
-/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458:924791,924850,930201
 /lucene/java/branches/lucene_2_4:748824
 /lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/CHANGES.txt:924791,924850,930201
 /lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334
 /lucene/java/trunk/CHANGES.txt:924483-925561

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,3 +1,3 @@
-/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src:924850,930201
 /lucene/java/trunk/backwards/src:924781

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036

Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036

Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,5 +1,5 @@
 /lucene/dev/trunk/build.xml:932749
-/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/build.xml:924791,924850,930201
 /lucene/java/branches/lucene_2_9/build.xml:896850,909334
 /lucene/java/trunk/build.xml:924483-925561

Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/contrib:924791,924850,930201
 /lucene/java/branches/lucene_2_4/contrib:748824
 /lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850,930201
 /lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
 /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850,930201
 /lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
 /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850,930201
 /lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334
 /lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561

Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850,930201
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:896850,909334
 /lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-925561

Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:896850,909334
 /lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561

Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036,896850,909334

Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334
 /lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561

Propchange: lucene/dev/branches/branch_3x/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/java/branches/lucene_2_4/solr:748824
 /lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Thu May  6 13:59:06 2010
@@ -333,6 +333,9 @@ Build
 
 * SOLR-1522: Automated release signing process. (gsingers)
 
+* SOLR-1891: Make lucene-jars-to-solr fail if copying any of the jars fails, and 
+  update clean to remove the jars in that directory (Mark Miller)
+
 Documentation
 ----------------------
 

Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Thu May  6 13:59:06 2010
@@ -72,6 +72,7 @@
     <delete dir="${dest}" />
     <delete dir="${dist}" />
     <delete dir="example/solr/lib" />
+    <delete dir="${lucene-libs}" />
   </target>
 
   <target name="clean-dest"
@@ -126,7 +127,7 @@
 
   <target name="compile-solrj"
           description="Compile the java client."
-          depends="init-forrest-entities">
+          depends="init-forrest-entities, compile-lucene">
 
     <solr-javac destdir="${dest}/solrj"
                 classpathref="compile.classpath">
@@ -149,7 +150,7 @@
   <!-- Compile the project. -->
   <target name="compile"
           description="Compile the source code."
-          depends="compile-lucene, compile-solrj,init-forrest-entities">
+          depends="compile-solrj,init-forrest-entities">
 
     <solr-javac destdir="${dest}/solr"
                 classpathref="compile.classpath.solrj">
@@ -565,7 +566,7 @@
          <exclude name="*.template" />
        </lib>
       
-       <lib dir="lucene-libs"/>
+       <lib dir="${lucene-libs}"/>
          
        <lib dir="${dist}">
          <include name="${fullname}-solrj-${version}.jar" />
@@ -970,7 +971,11 @@
     <get src="http://luke.googlecode.com/files/luke-${luke.version}.jar"
         dest="luke/luke-${luke.version}.jar"/>
   </target>
-  
+  <path id="luke.classpath">
+    <pathelement location="${common-solr.dir}/../lucene/build/classes/java" />
+    <pathelement location="${common-solr.dir}/../lucene/build/contrib/xml-query-parser/classes/java" />
+
+  </path>
   <target name="luke" depends="luke-download">
     <java fork="true" 
           classname="org.getopt.luke.Luke"
@@ -981,6 +986,7 @@
           <include name="luke-${luke.version}.jar"/>
         </fileset>
         <path refid="lucene.classpath"/>
+        <path refid="luke.classpath"/>
         <path refid="test.run.classpath"/>
        </classpath>
     </java>

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=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Thu May  6 13:59:06 2010
@@ -86,6 +86,9 @@
 
   <!-- Destination for compiled classes and binaries -->
   <property name="dest" value="build" />
+  
+  <!-- Destination for Lucene jars -->
+  <property name="lucene-libs" location="lucene-libs" />
 
   <!-- Javadoc properties -->
   <property name="javadoc.years" value="2006 - ${year}" />
@@ -178,18 +181,32 @@
   </target>
       
   <target name="lucene-jars-to-solr" depends="prep-lucene-jars">
-    <mkdir dir="lucene-libs"/>
-    <copy todir="lucene-libs" preservelastmodified="true" flatten="true" failonerror="true">
-      <resources>
-        <file file="../lucene/build/lucene-core-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/analyzers/common/lucene-analyzers-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/highlighter/lucene-highlighter-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/memory/lucene-memory-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/misc/lucene-misc-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/queries/lucene-queries-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/spatial/lucene-spatial-${lucene_version}.jar" />
-        <file file="../lucene/build/contrib/spellchecker/lucene-spellchecker-${lucene_version}.jar" />
-      </resources>
+    <mkdir dir="${lucene-libs}"/>
+    <copy todir="${lucene-libs}" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
+      <fileset dir="../lucene/build/">
+        <include name="lucene-core-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/analyzers/common">
+        <include name="lucene-analyzers-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/highlighter">
+        <include name="lucene-highlighter-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/memory">
+        <include name="lucene-memory-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/misc">
+        <include name="lucene-misc-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/queries">
+        <include name="lucene-queries-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/spatial">
+        <include name="lucene-spatial-${lucene_version}.jar" />
+      </fileset>
+      <fileset dir="../lucene/build/contrib/spellchecker">
+        <include name="lucene-spellchecker-${lucene_version}.jar" />
+      </fileset>
       </copy>
   </target>  
   

Modified: lucene/dev/branches/branch_3x/solr/contrib/velocity/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/velocity/build.xml?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/velocity/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/velocity/build.xml Thu May  6 13:59:06 2010
@@ -44,6 +44,9 @@
 
   <target name="clean">
   	<delete failonerror="false" dir="target"/>
+  	<delete>
+  	  <fileset dir="src/main/solr/lib" includes="apache-solr-velocity-*.jar"/>
+  	</delete>
   </target>
 
   <target name="init">

Propchange: lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091

Propchange: lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091

Modified: lucene/dev/branches/branch_3x/solr/site/mailing_lists.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/mailing_lists.html?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/mailing_lists.html (original)
+++ lucene/dev/branches/branch_3x/solr/site/mailing_lists.html Thu May  6 13:59:06 2010
@@ -190,7 +190,7 @@ document.write("Last Published: " + docu
 </li>
 </ul>
 </div>
-  
+
     
 <a name="N1000D"></a><a name="Users"></a>
 <h2 class="boxed">Users</h2>
@@ -220,30 +220,35 @@ document.write("Last Published: " + docu
 <div class="content">In order to post to the list, it is necessary to first subscribe to it.</div>
 </div>
 </div>
-  
+
     
 <a name="N10038"></a><a name="Developers"></a>
 <h2 class="boxed">Developers</h2>
 <div class="section">
 <p>If you'd like to contribute to Solr, please subscribe to the
-      Solr developer mailing list.</p>
+      Lucene/Solr developer mailing list.</p>
 <p>
-        The Solr developer mailing list is :
-        <a href="mailto:solr-dev@lucene.apache.org">solr-dev@lucene.apache.org</a>.
+        The Lucene/Solr developer mailing list is:
+        <a href="mailto:dev@lucene.apache.org">dev@lucene.apache.org</a>.
       </p>
 <ul>
         
 <li>
-<a href="mailto:solr-dev-subscribe@lucene.apache.org">Subscribe to List</a>
+<a href="mailto:dev-subscribe@lucene.apache.org">Subscribe to List</a>
 </li>
         
 <li>
-<a href="mailto:solr-dev-unsubscribe@lucene.apache.org">Unsubscribe from List</a>
+<a href="mailto:dev-unsubscribe@lucene.apache.org">Unsubscribe from List</a>
 </li>
         
 <li>
-<a href="http://mail-archives.apache.org/mod_mbox/lucene-solr-dev/">View List Archive</a>  (Alternate list archive providers can be found on the <a href="http://wiki.apache.org/solr/SolrResources">wiki</a>)
+<a href="http://mail-archives.apache.org/mod_mbox/lucene-dev/">View List Archive</a>  (Alternate list archive providers can be found on the <a href="http://wiki.apache.org/solr/SolrResources">wiki</a>)
         </li>
+        
+<li>
+<a href="http://mail-archives.apache.org/mod_mbox/lucene-solr-dev/">View Pre Lucene/Solr Merge List Archive</a>
+        
+</li>
       
 </ul>
 <div class="note">
@@ -251,9 +256,9 @@ document.write("Last Published: " + docu
 <div class="content">In order to post to the list, it is necessary to first subscribe to it.</div>
 </div>
 </div>
-  
+
     
-<a name="N10063"></a><a name="Commits"></a>
+<a name="N10069"></a><a name="Commits"></a>
 <h2 class="boxed">Commits</h2>
 <div class="section">
 <p>If you'd like to see changes made in Solr's <a href="version_control.html">version control system</a>
@@ -261,16 +266,16 @@ document.write("Last Published: " + docu
 <ul>
         
 <li>
-<a href="mailto:solr-commits-subscribe@lucene.apache.org">Subscribe to List</a>
+<a href="mailto:commits-subscribe@lucene.apache.org">Subscribe to List</a>
 </li>
         
 <li>
-<a href="mailto:solr-commits-unsubscribe@lucene.apache.org">Unsubscribe from List</a>
+<a href="mailto:commits-unsubscribe@lucene.apache.org">Unsubscribe from List</a>
 </li>
       
 </ul>
 </div>
-  
+
   
 </div>
 <!--+

Modified: lucene/dev/branches/branch_3x/solr/site/mailing_lists.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/mailing_lists.pdf?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/basic.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/basic.css?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/skin/basic.css (original)
+++ lucene/dev/branches/branch_3x/solr/site/skin/basic.css Thu May  6 13:59:06 2010
@@ -163,4 +163,4 @@ p {
 .codefrag {
   font-family: "Courier New", Courier, monospace;
   font-size: 110%;
-}
+}
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-l-15-1body-2menu-3menu.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-r-15-1body-2menu-3menu.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-15-1body-2menu-3menu.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
Binary files - no diff available.

Modified: lucene/dev/branches/branch_3x/solr/site/skin/print.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/print.css?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/skin/print.css (original)
+++ lucene/dev/branches/branch_3x/solr/site/skin/print.css Thu May  6 13:59:06 2010
@@ -51,4 +51,4 @@ a:link, a:visited {
 
 acronym {
   border: 0;
-}
+}
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/solr/site/skin/profile.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/profile.css?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/skin/profile.css (original)
+++ lucene/dev/branches/branch_3x/solr/site/skin/profile.css Thu May  6 13:59:06 2010
@@ -172,4 +172,4 @@ a:hover { color:#6587ff} 
     }
       
     
-  
+  
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/solr/site/skin/screen.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/skin/screen.css?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/skin/screen.css (original)
+++ lucene/dev/branches/branch_3x/solr/site/skin/screen.css Thu May  6 13:59:06 2010
@@ -584,4 +584,4 @@ p.instruction {
   list-style-image: url('../images/instruction_arrow.png');
   list-style-position: outside;
   margin-left: 2em;
-} 
+} 
\ No newline at end of file

Modified: lucene/dev/branches/branch_3x/solr/site/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/tutorial.html?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/tutorial.html (original)
+++ lucene/dev/branches/branch_3x/solr/site/tutorial.html Thu May  6 13:59:06 2010
@@ -5,7 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="lucene">
-<title>Solr tutorial (version 3.0.0.2010.04.09.09.38.55)</title>
+<title>Solr tutorial (version 3.0.0.2010.03.26.12.34.39)</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -157,7 +157,7 @@ document.write("Last Published: " + docu
 </div>
 <div id="credit">
 <hr>
-      This document is for Apache Solr version 3.0.0.2010.04.09.09.38.55.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+      This document is for Apache Solr version 3.0.0.2010.03.26.12.34.39.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
         </div>
 <div id="roundbottom">
 <img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -181,7 +181,7 @@ document.write("Last Published: " + docu
 </div>
 <h1>Solr tutorial</h1>
 <div id="motd-area">
-      This document is for Apache Solr version 3.0.0.2010.04.09.09.38.55.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+      This document is for Apache Solr version 3.0.0.2010.03.26.12.34.39.  If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
         </div>
 <div id="minitoc-area">
 <ul class="minitoc">

Propchange: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091

Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091

Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091

Modified: lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/mailing_lists.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/mailing_lists.xml?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/mailing_lists.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/mailing_lists.xml Thu May  6 13:59:06 2010
@@ -18,13 +18,13 @@
  limitations under the License.
 -->
 <document>
-  
+
   <header>
     <title>Solr Mailing Lists</title>
   </header>
-  
+
   <body>
-  
+
     <section>
       <title>Users</title>
 
@@ -33,7 +33,7 @@
       <p>
         The Solr user mailing list is :
         <a href="mailto:solr-user@lucene.apache.org">solr-user@lucene.apache.org</a>.
-      </p>      
+      </p>
       <ul>
         <li><a href="mailto:solr-user-subscribe@lucene.apache.org">Subscribe to List</a></li>
         <li><a href="mailto:solr-user-unsubscribe@lucene.apache.org">Unsubscribe from List</a></li>
@@ -42,26 +42,28 @@
       </ul>
       <note>In order to post to the list, it is necessary to first subscribe to it.</note>
     </section>
-  
+
     <section>
       <title>Developers</title>
 
       <p>If you'd like to contribute to Solr, please subscribe to the
-      Solr developer mailing list.</p>
+      Lucene/Solr developer mailing list.</p>
 
       <p>
-        The Solr developer mailing list is :
-        <a href="mailto:solr-dev@lucene.apache.org">solr-dev@lucene.apache.org</a>.
-      </p>      
+        The Lucene/Solr developer mailing list is:
+        <a href="mailto:dev@lucene.apache.org">dev@lucene.apache.org</a>.
+      </p>
       <ul>
-        <li><a href="mailto:solr-dev-subscribe@lucene.apache.org">Subscribe to List</a></li>
-        <li><a href="mailto:solr-dev-unsubscribe@lucene.apache.org">Unsubscribe from List</a></li>
-        <li><a href="http://mail-archives.apache.org/mod_mbox/lucene-solr-dev/">View List Archive</a>  (Alternate list archive providers can be found on the <a href="http://wiki.apache.org/solr/SolrResources">wiki</a>)
+        <li><a href="mailto:dev-subscribe@lucene.apache.org">Subscribe to List</a></li>
+        <li><a href="mailto:dev-unsubscribe@lucene.apache.org">Unsubscribe from List</a></li>
+        <li><a href="http://mail-archives.apache.org/mod_mbox/lucene-dev/">View List Archive</a>  (Alternate list archive providers can be found on the <a href="http://wiki.apache.org/solr/SolrResources">wiki</a>)
+        </li>
+        <li><a href="http://mail-archives.apache.org/mod_mbox/lucene-solr-dev/">View Pre Lucene/Solr Merge List Archive</a>
         </li>
       </ul>
       <note>In order to post to the list, it is necessary to first subscribe to it.</note>
     </section>
-  
+
     <section>
       <title>Commits</title>
 
@@ -70,11 +72,11 @@
       then subscribe to the Solr commit mailing list.</p>
 
       <ul>
-        <li><a href="mailto:solr-commits-subscribe@lucene.apache.org">Subscribe to List</a></li>
-        <li><a href="mailto:solr-commits-unsubscribe@lucene.apache.org">Unsubscribe from List</a></li>
+        <li><a href="mailto:commits-subscribe@lucene.apache.org">Subscribe to List</a></li>
+        <li><a href="mailto:commits-unsubscribe@lucene.apache.org">Unsubscribe from List</a></li>
       </ul>
     </section>
-  
+
   </body>
-  
+
 </document>

Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091

Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java Thu May  6 13:59:06 2010
@@ -13,6 +13,7 @@ import org.apache.solr.common.params.Mod
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.schema.TrieDateField;
 import org.apache.solr.util.AbstractSolrTestCase;
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +26,7 @@ import java.util.*;
  *
  * @since solr 1.5
  */
-public abstract class BaseDistributedSearchTestCase extends TestCase {
+public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
   public static Random r = new Random(0);
 
   protected int shardCount = 4;
@@ -493,6 +494,7 @@ public abstract class BaseDistributedSea
     }
   }
 
+  @Test
   public void testDistribSearch() throws Exception {
     if (fixShardCount) {
       createServers(shardCount);

Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestDistributedSearch.java?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/TestDistributedSearch.java Thu May  6 13:59:06 2010
@@ -17,6 +17,8 @@
 
 package org.apache.solr;
 
+import junit.framework.TestCase;
+
 import org.apache.solr.client.solrj.SolrServerException;
 
 /**
@@ -28,13 +30,6 @@ import org.apache.solr.client.solrj.Solr
  * @since solr 1.3
  */
 public class TestDistributedSearch extends BaseDistributedSearchTestCase {
-  public String getSchemaFile() {
-    return null;
-  }
-
-  public String getSolrConfigFile() {
-    return null;
-  }
 
   String t1="a_t";
   String i1="a_si";
@@ -183,7 +178,7 @@ public class TestDistributedSearch exten
     try {
       // test error produced for field that is invalid for schema
       query("q","*:*", "rows",100, "facet","true", "facet.field",invalidField, "facet.mincount",2);
-      fail("SolrServerException expected for invalid field that is not in schema");
+      TestCase.fail("SolrServerException expected for invalid field that is not in schema");
     } catch (SolrServerException ex) {
       // expected
     }

Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091

Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Thu May  6 13:59:06 2010
@@ -1,7 +1,8 @@
 package org.apache.solr.handler.component;
 
 import org.apache.solr.BaseDistributedSearchTestCase;
-import org.apache.solr.util.AbstractSolrTestCase;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.common.params.ModifiableSolrParams;
 
 /**
  * Test for SpellCheckComponent's distributed querying
@@ -30,6 +31,22 @@ public class DistributedSpellCheckCompon
       System.setProperty("solr.directoryFactory", saveProp);
   }
   
+  private void q(Object... q) throws Exception {
+    final ModifiableSolrParams params = new ModifiableSolrParams();
+
+    for (int i = 0; i < q.length; i += 2) {
+      params.add(q[i].toString(), q[i + 1].toString());
+    }
+
+    controlClient.query(params);
+
+    // query a random server
+    params.set("shards", shards);
+    int which = r.nextInt(clients.size());
+    SolrServer client = clients.get(which);
+    client.query(params);
+  }
+  
   @Override
   public void doTest() throws Exception {
     index(id, "1", "lowerfilt", "toyota");
@@ -51,10 +68,11 @@ public class DistributedSpellCheckCompon
     handle.put("maxScore", SKIPVAL);
     // we care only about the spellcheck results
     handle.put("response", SKIP);
-
-    query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH");
-    query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true");
-    query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","bluo", "spellcheck", "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "4");
-    query("q", "The quick reb fox jumped over the lazy brown dogs", "fl", "id,lowerfilt", "spellcheck", "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "4", SpellCheckComponent.SPELLCHECK_COLLATE, "true");
+    q("q", "*:*", SpellCheckComponent.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH");
+    
+    query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH");
+    query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true");
+    query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","bluo", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "4");
+    query("q", "The quick reb fox jumped over the lazy brown dogs", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "4", SpellCheckComponent.SPELLCHECK_COLLATE, "true");
   }
 }

Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 13:59:06 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270
 /lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091

Modified: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=941735&r1=941734&r2=941735&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Thu May  6 13:59:06 2010
@@ -36,7 +36,6 @@ import org.mortbay.log.Logger;
 /**
  * Run solr using jetty
  * 
- * @version $Id$
  * @since solr 1.3
  */
 public class JettySolrRunner 



Mime
View raw message