You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by rm...@apache.org on 2011/01/19 13:28:45 UTC
svn commit: r1060786 - in /lucene/java/branches/lucene_3_0: ./ contrib/
contrib/analyzers/ contrib/analyzers/common/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/
contrib/analyzers/common/src/test/ contrib/analyzers/common/src/t...
Author: rmuir
Date: Wed Jan 19 12:28:44 2011
New Revision: 1060786
URL: http://svn.apache.org/viewvc?rev=1060786&view=rev
Log:
LUCENE-2874: Highlighting overlapping tokens outputs doubled words
Added:
lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
- copied, changed from r1060782, lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
Modified:
lucene/java/branches/lucene_3_0/ (props changed)
lucene/java/branches/lucene_3_0/CHANGES.txt (props changed)
lucene/java/branches/lucene_3_0/build.xml (props changed)
lucene/java/branches/lucene_3_0/contrib/ (props changed)
lucene/java/branches/lucene_3_0/contrib/CHANGES.txt
lucene/java/branches/lucene_3_0/contrib/analyzers/ (props changed)
lucene/java/branches/lucene_3_0/contrib/analyzers/common/ (props changed)
lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ (props changed)
lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/ (props changed)
lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/ (props changed)
lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn/ (props changed)
lucene/java/branches/lucene_3_0/contrib/benchmark/ (props changed)
lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/ (props changed)
lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/ (props changed)
lucene/java/branches/lucene_3_0/contrib/highlighter/ (props changed)
lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/ (props changed)
lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/java/branches/lucene_3_0/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (props changed)
lucene/java/branches/lucene_3_0/src/ (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LengthFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LetterTokenizer.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/ (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/StringHelper.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/ (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/ (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestSpans.java (props changed)
lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
Propchange: lucene/java/branches/lucene_3_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,5 +1,5 @@
-/lucene/dev/branches/branch_3x/lucene:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
-/lucene/dev/trunk/lucene:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
+/lucene/dev/branches/branch_3x/lucene:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
+/lucene/dev/trunk/lucene:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773,1060779
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
/lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
Propchange: lucene/java/branches/lucene_3_0/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/CHANGES.txt:941394,946651,948430,957490,957920,984210,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/CHANGES.txt:941394,946651,948430,957490,957920,984210,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/CHANGES.txt:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,994979,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/CHANGES.txt:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/build.xml:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/build.xml:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/build.xml:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/build.xml:748824
/lucene/java/branches/lucene_2_9/build.xml:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Modified: lucene/java/branches/lucene_3_0/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/CHANGES.txt?rev=1060786&r1=1060785&r2=1060786&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/contrib/CHANGES.txt (original)
+++ lucene/java/branches/lucene_3_0/contrib/CHANGES.txt Wed Jan 19 12:28:44 2011
@@ -9,6 +9,9 @@ Bug Fixes
implementors do not override hashcode and equals methods. Now the internal Maps
are using String instead.
+ * LUCENE-2874: Highlighting overlapping tokens outputted doubled words.
+ (Pierre Gossé via Robert Muir)
+
======================= Release 3.0.3 2010-12-03 =======================
Bug Fixes
Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/analyzers:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/analyzers:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/analyzers:929738,930932,935522,939611,940730,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/contrib/analyzers:1028833,1028850,1029331,1029348
/lucene/java/trunk/contrib/analyzers:887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270
Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common:957920,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common:957920,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/analyzers/common:930932,957707,963372,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/contrib/analyzers/common:1028833,1028850,1029331,1029348
/lucene/java/trunk/contrib/analyzers/common:900030,903368,916543,919869
Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1039774,1060782
/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1034017,1039773
/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:900030
Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test:957920,990167,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test:957920,990167,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/analyzers/common/src/test:930932,957707,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test:1028833,1028850,1029331,1029348
/lucene/java/trunk/contrib/analyzers/common/src/test:900030,903368,916543,919869
Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1039774,1060782
/lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1034017,1039773
/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:900030
Propchange: lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn:957920,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn:957920,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/analyzers/smartcn:930932,957707,963372,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn:1028833,1028850,1029331,1029348
/lucene/java/trunk/contrib/analyzers/smartcn:900030,903368,916543,919869
Propchange: lucene/java/branches/lucene_3_0/contrib/benchmark/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/benchmark:1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/benchmark:1039774,1060782
/lucene/dev/trunk/lucene/contrib/benchmark:1034017,1039773
/lucene/java/trunk/contrib/benchmark:900030
Propchange: lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990281,994979,999223,999842
/lucene/dev/trunk/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight:989035
/lucene/java/branches/lucene_2_4/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:748824
Propchange: lucene/java/branches/lucene_3_0/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990281,994979,999223,999842
/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight:989035
/lucene/java/branches/lucene_2_4/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:748824
Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/highlighter:957920,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/highlighter:957920,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/highlighter:930932,963372,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/contrib/highlighter:1028833,1028850,1029331,1029348
/lucene/java/trunk/contrib/highlighter:900030,903368,916543,919869
Modified: lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1060786&r1=1060785&r2=1060786&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/java/branches/lucene_3_0/contrib/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Wed Jan 19 12:28:44 2011
@@ -222,11 +222,10 @@ public class TokenSources
tokensInOriginalOrder= unsortedTokens.toArray(new Token[unsortedTokens.size()]);
Arrays.sort(tokensInOriginalOrder, new Comparator<Token>(){
public int compare(Token t1, Token t2) {
- if(t1.startOffset()>t2.endOffset())
- return 1;
- if(t1.startOffset()<t2.startOffset())
- return -1;
- return 0;
+ if (t1.startOffset() == t2.startOffset())
+ return t1.endOffset() - t2.endOffset();
+ else
+ return t1.startOffset() - t2.startOffset();
}});
}
return new StoredTokenStream(tokensInOriginalOrder);
Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/highlighter/src/test:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,940987,948516,1028833,1028850,1029331,1029348
Copied: lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (from r1060782, lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java)
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?p2=lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java&p1=lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java&r1=1060782&r2=1060786&rev=1060786&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Wed Jan 19 12:28:44 2011
@@ -23,7 +23,7 @@ import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
@@ -40,7 +40,9 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
+import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.Version;
// LUCENE-2874
public class TokenSourcesTest extends LuceneTestCase {
@@ -59,7 +61,7 @@ public class TokenSourcesTest extends Lu
private int i = -1;
- private final CharTermAttribute termAttribute = addAttribute(CharTermAttribute.class);
+ private final TermAttribute termAttribute = addAttribute(TermAttribute.class);
private final OffsetAttribute offsetAttribute = addAttribute(OffsetAttribute.class);
private final PositionIncrementAttribute positionIncrementAttribute = addAttribute(PositionIncrementAttribute.class);
@@ -74,7 +76,7 @@ public class TokenSourcesTest extends Lu
return false;
}
clearAttributes();
- termAttribute.setEmpty().append(this.tokens[i]);
+ termAttribute.setTermBuffer(this.tokens[i].term());
offsetAttribute.setOffset(this.tokens[i].startOffset(),
this.tokens[i].endOffset());
positionIncrementAttribute.setPositionIncrement(this.tokens[i]
@@ -99,9 +101,8 @@ public class TokenSourcesTest extends Lu
public void testOverlapWithOffset() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
- final Directory directory = newDirectory();
- final IndexWriter indexWriter = new IndexWriter(directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer()));
+ final Directory directory = new RAMDirectory();
+ final IndexWriter indexWriter = new IndexWriter(directory, new OverlapAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
try {
final Document document = new Document();
document.add(new Field(FIELD, new TokenStreamOverlap(),
@@ -145,9 +146,8 @@ public class TokenSourcesTest extends Lu
public void testOverlapWithPositionsAndOffset() throws CorruptIndexException,
LockObtainFailedException, IOException, InvalidTokenOffsetsException {
final String TEXT = "the fox did not jump";
- final Directory directory = newDirectory();
- final IndexWriter indexWriter = new IndexWriter(directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new OverlapAnalyzer()));
+ final Directory directory = new RAMDirectory();
+ final IndexWriter indexWriter = new IndexWriter(directory, new OverlapAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
try {
final Document document = new Document();
document.add(new Field(FIELD, new TokenStreamOverlap(),
Propchange: lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:748824
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:817269-818600,825998,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:929738,930932,932398,935014,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:748824
/lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java:817269-818600,825998,829134,829816,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/src:748824
/lucene/java/branches/lucene_2_9/src:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java:929738,930932,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,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,96365
4,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java:990161
/lucene/dev/trunk/src/java/org/apache/lucene/analysis/BaseCharFilter.java:932749
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LengthFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1034017,1039773
/lucene/java/trunk/src/java/org/apache/lucene/analysis/LengthFilter.java:900030
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LetterTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1034017,1039773
/lucene/java/trunk/src/java/org/apache/lucene/analysis/LetterTokenizer.java:900030
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1034017,1039773
/lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:900030
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/Tokenizer.java:748824
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:817269-818600,825998,829134,829881,831036,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard:1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard:1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard:1034017,1039773
/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard:900030
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1 +1,2 @@
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:1039773
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1 +1,2 @@
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java:1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java:1039773
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1 +1,2 @@
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:1039773
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java:1024408
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:929738,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990281,994979,999223,999842
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:748824
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,896850,909334,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/StringHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java:1039774
+/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java:1039774,1060782
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/StringHelper.java:1034017,1039773
/lucene/java/trunk/src/java/org/apache/lucene/util/StringHelper.java:900030
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,3 +1,3 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis:1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis:1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis:1034017,1039773
/lucene/java/trunk/src/test/org/apache/lucene/analysis:900030
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index:929738,930932,935522,940730,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index:1028833,1028850,1029331,1029348
/lucene/java/trunk/src/test/org/apache/lucene/index:887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,940987,948516,1028833,1028850,1029331,1029348
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:957920,990167,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:957920,990167,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:1028833,1028850,1029331,1029348
/lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:900030,903368,916543,919869
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:957920,990167,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:957920,990167,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:1028833,1028850,1029331,1029348
/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:900030,903368,916543,919869
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:957920,990167,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:957920,990167,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestSpans.java:1028833,1028850,1029331,1029348
/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:900030,903368,916543,919869
Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 19 12:28:44 2011
@@ -1,4 +1,4 @@
-/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
+/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774,1060782
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:929738,930932,932398,935522,938989,939611,939649,940730,945420,946599,948082,948429,949288,949976,949997,950458,950613,951521,953407,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
/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,896850,909334,940987,948516,1028833,1028850,1029331,1029348