You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/03/08 15:59:21 UTC
svn commit: r1079382 - in /lucene/dev/branches/lucene_solr_3_1: ./ lucene/
lucene/src/java/org/apache/lucene/index/CheckIndex.java solr/ solr/build.xml
Author: uschindler
Date: Tue Mar 8 14:59:20 2011
New Revision: 1079382
URL: http://svn.apache.org/viewvc?rev=1079382&view=rev
Log:
- LUCENE-2954: Fix CheckIndex to print correct version numbers and fail if tool was not updated.
- fix packaging issues
Modified:
lucene/dev/branches/lucene_solr_3_1/ (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene_solr_3_1/solr/ (props changed)
lucene/dev/branches/lucene_solr_3_1/solr/build.xml
Modified: lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1079382&r1=1079381&r2=1079382&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/lucene_solr_3_1/lucene/src/java/org/apache/lucene/index/CheckIndex.java Tue Mar 8 14:59:20 2011
@@ -373,6 +373,12 @@ public class CheckIndex {
sFormat = "FORMAT_USER_DATA [Lucene 2.9]";
else if (format == SegmentInfos.FORMAT_DIAGNOSTICS)
sFormat = "FORMAT_DIAGNOSTICS [Lucene 2.9]";
+ else if (format == SegmentInfos.FORMAT_HAS_VECTORS)
+ sFormat = "FORMAT_HAS_VECTORS [Lucene 3.1]";
+ else if (format == SegmentInfos.FORMAT_3_1)
+ sFormat = "FORMAT_3_1 [Lucene 3.1]";
+ else if (format == SegmentInfos.CURRENT_FORMAT)
+ throw new RuntimeException("BUG: You should update this tool!");
else if (format < SegmentInfos.CURRENT_FORMAT) {
sFormat = "int=" + format + " [newer version of Lucene than this tool]";
skip = true;
Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1079382&r1=1079381&r2=1079382&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Tue Mar 8 14:59:20 2011
@@ -829,7 +829,7 @@
<target name="create-package"
description="Packages the Solr Binary Distribution"
- depends="dist, example">
+ depends="dist, example, javadoc">
<copy failonerror="false" todir="${build.docs}">
<fileset dir="site" />