lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1039899 - in /lucene/java/branches/lucene_2_9: ./ 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...
Date Sun, 28 Nov 2010 16:26:37 GMT
Author: uschindler
Date: Sun Nov 28 16:26:36 2010
New Revision: 1039899

URL: http://svn.apache.org/viewvc?rev=1039899&view=rev
Log:
LUCENE-1756: Port the PatternAnalyzer test fix back to 2.9

Modified:
    lucene/java/branches/lucene_2_9/   (props changed)
    lucene/java/branches/lucene_2_9/CHANGES.txt   (props changed)
    lucene/java/branches/lucene_2_9/build.xml   (props changed)
    lucene/java/branches/lucene_2_9/contrib/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/CHANGES.txt   (props changed)
    lucene/java/branches/lucene_2_9/contrib/analyzers/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/analyzers/common/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/benchmark/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/highlighter/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/   (props changed)
    lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java   (props changed)
    lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java
    lucene/java/branches/lucene_2_9/src/   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseCharFilter.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LengthFilter.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LetterTokenizer.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standard/   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/AttributeSource.java   (props changed)
    lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/StringHelper.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestSpans.java   (props changed)
    lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java   (props changed)

Propchange: lucene/java/branches/lucene_2_9/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -2,4 +2,4 @@
 /lucene/dev/trunk/lucene:929738,930932,932398,935522,938989,939611,939649,940730,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:748824
 /lucene/java/branches/lucene_3_0:886275,889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk:821888,824125,826029,826385,830871,833095,833297,833886,834035,836155,881819,882672,883554,884870,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk:821888,824125,825112,826029,826385,830871,833095,833297,833886,834035,836155,881819,882672,883554,884870,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/CHANGES.txt:941394,946651,948430,957490,957920,984210,1034036,1039774
 /lucene/dev/trunk/lucene/CHANGES.txt:929738,932398,935522,938989,939611,939649,940730,946599,948082,948429,949288,949976,949997,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,994979,1034017,1039773
 /lucene/java/branches/lucene_3_0/CHANGES.txt:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028873,1028915,1028920,1028931,1029022,1029024,1029039,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/CHANGES.txt:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/CHANGES.txt:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/build.xml:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/build.xml:889688,891211,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/build.xml:821888,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/build.xml:821888,825112,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/contrib:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/contrib:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/contrib:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
 /lucene/dev/trunk/lucene/contrib/CHANGES.txt:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/contrib/CHANGES.txt:889688,891211,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/CHANGES.txt:821888,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,919060,920270
+/lucene/java/trunk/contrib/CHANGES.txt:821888,825112,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,919060,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/contrib/analyzers:930932,939611,940730,949288,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/contrib/analyzers:950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/analyzers:834035,836155,887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270
+/lucene/java/trunk/contrib/analyzers:825112,834035,836155,887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common:957920,988629,990167,990286,999226,999847,1034036,1039774
 /lucene/dev/trunk/lucene/contrib/analyzers/common:930932,957707,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/contrib/analyzers/common:990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/analyzers/common:900030,903368,916543,919869
+/lucene/java/trunk/contrib/analyzers/common:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1039774
 /lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1039773
 /lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:1039775
-/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:900030
+/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle:825112,900030

Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test:957920,990167,999226,999847,1034036,1039774
 /lucene/dev/trunk/lucene/contrib/analyzers/common/src/test:930932,957707,963372,965299,990161,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test:999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/analyzers/common/src/test:900030,903368,916543,919869
+/lucene/java/trunk/contrib/analyzers/common/src/test:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1039774
 /lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1039773
 /lucene/java/branches/lucene_3_0/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:1039775
-/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:900030
+/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/shingle:825112,900030

Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn:957920,988629,990167,990286,999226,999847,1034036,1039774
 /lucene/dev/trunk/lucene/contrib/analyzers/smartcn:930932,957707,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/contrib/analyzers/smartcn:990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/analyzers/smartcn:900030,903368,916543,919869
+/lucene/java/trunk/contrib/analyzers/smartcn:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/contrib/benchmark/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/benchmark:1039774
 /lucene/dev/trunk/lucene/contrib/benchmark:1039773
 /lucene/java/branches/lucene_3_0/contrib/benchmark:1039775
-/lucene/java/trunk/contrib/benchmark:900030
+/lucene/java/trunk/contrib/benchmark:825112,900030

Propchange: lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -2,4 +2,4 @@
 /lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:929738,932398,935522,938989,939611,939649,940730,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_3_0/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -2,4 +2,4 @@
 /lucene/dev/trunk/lucene/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:929738,932398,935522,938989,939611,939649,940730,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_3_0/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/contrib/fast-vector-highlighter/src/test/org/apache/lucene/search/vectorhighlight:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/highlighter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/contrib/highlighter:957920,988629,990167,990286,999226,999847,1034036,1039774
 /lucene/dev/trunk/lucene/contrib/highlighter:930932,963372,965299,989785,990161,990281,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/contrib/highlighter:990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/highlighter:900030,903368,916543,919869
+/lucene/java/trunk/contrib/highlighter:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/contrib/highlighter/src/test:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/contrib/highlighter/src/test:889688,891211,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/highlighter/src/test:821888,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/contrib/highlighter/src/test:821888,825112,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -4,4 +4,4 @@
 /lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:817269-818599
 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:818601-821336
 /lucene/java/branches/lucene_3_0/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:889463,889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:821888,834035,836155,881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:821888,825112,834035,836155,881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Modified: lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java?rev=1039899&r1=1039898&r2=1039899&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java (original)
+++ lucene/java/branches/lucene_2_9/contrib/memory/src/test/org/apache/lucene/index/memory/PatternAnalyzerTest.java Sun Nov 28 16:26:36 2010
@@ -17,268 +17,118 @@ package org.apache.lucene.index.memory;
  * limitations under the License.
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.Arrays;
 import java.util.regex.Pattern;
 
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.analysis.LetterTokenizer;
-import org.apache.lucene.analysis.LowerCaseFilter;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
 import org.apache.lucene.analysis.StopAnalyzer;
-import org.apache.lucene.analysis.StopFilter;
-import org.apache.lucene.analysis.Token;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.WhitespaceTokenizer;
 
 /**
-Verifies that Lucene PatternAnalyzer and normal Lucene Analyzers have the same behaviour,
-returning the same results for any given free text.
-Runs a set of texts against a tokenizers/analyzers
-Can also be used as a simple benchmark.
-<p>
-Example usage:
-<pre>
-cd lucene-cvs
-java org.apache.lucene.index.memory.PatternAnalyzerTest 1 1 patluc 1 2 2 *.txt *.xml docs/*.html src/java/org/apache/lucene/index/*.java xdocs/*.xml ../nux/samples/data/*.xml
-</pre>
-
-with WhitespaceAnalyzer problems can be found; These are not bugs but questionable 
-Lucene features: CharTokenizer.MAX_WORD_LEN = 255.
-Thus the PatternAnalyzer produces correct output, whereas the WhitespaceAnalyzer 
-silently truncates text, and so the comparison results in assertEquals() don't match up. 
-
-TODO: Convert to new TokenStream API!
-*/
-public class PatternAnalyzerTest extends LuceneTestCase {
-  
-  /** Runs the tests and/or benchmark */
-  public static void main(String[] args) throws Throwable {
-    new PatternAnalyzerTest().run(args);    
-  }
-  
-  public void testMany() throws Throwable {
-//    String[] files = MemoryIndexTest.listFiles(new String[] {
-//      "*.txt", "*.html", "*.xml", "xdocs/*.xml", 
-//      "src/test/org/apache/lucene/queryParser/*.java",
-//      "src/org/apache/lucene/index/memory/*.java",
-//    });
-    String[] files = MemoryIndexTest.listFiles(new String[] {
-      "../../*.txt", "../../*.html", "../../*.xml", "../../xdocs/*.xml", 
-      "../../src/test/org/apache/lucene/queryParser/*.java",
-      "src/java/org/apache/lucene/index/memory/*.java",
-    });
-    System.out.println("files = " + java.util.Arrays.asList(files));
-    String[] xargs = new String[] {
-      "1", "1", "patluc", "1", "2", "2",
-    };
-    String[] args = new String[xargs.length + files.length];
-    System.arraycopy(xargs, 0, args, 0, xargs.length);
-    System.arraycopy(files, 0, args, xargs.length, files.length);
-    run(args);
-  }
-  
-  private void run(String[] args) throws Throwable {
-    int k = -1;
-    
-    int iters = 1;
-    if (args.length > ++k) iters = Math.max(1, Integer.parseInt(args[k]));
-    
-    int runs = 1;
-    if (args.length > ++k) runs = Math.max(1, Integer.parseInt(args[k]));
-    
-    String cmd = "patluc";
-    if (args.length > ++k) cmd = args[k];
-    boolean usePattern = cmd.indexOf("pat") >= 0;
-    boolean useLucene  = cmd.indexOf("luc") >= 0;
-    
-    int maxLetters = 1; // = 2: CharTokenizer.MAX_WORD_LEN issue; see class javadoc
-    if (args.length > ++k) maxLetters = Integer.parseInt(args[k]);
-    
-    int maxToLower = 2;
-    if (args.length > ++k) maxToLower = Integer.parseInt(args[k]);
-
-    int maxStops = 2;
-    if (args.length > ++k) maxStops = Integer.parseInt(args[k]);
-    
-    File[] files = new File[] {new File("CHANGES.txt"), new File("LICENSE.txt") };
-    if (args.length > ++k) {
-      files = new File[args.length - k];
-      for (int i=k; i < args.length; i++) {
-        files[i-k] = new File(args[i]);
-      }
-    }
-    
-    for (int iter=0; iter < iters; iter++) {
-      System.out.println("\n########### iteration=" + iter);
-      long start = System.currentTimeMillis();            
-      long bytes = 0;
-      
-      for (int i=0; i < files.length; i++) {
-        File file = files[i];
-        if (!file.exists() || file.isDirectory()) continue; // ignore
-        bytes += file.length();
-        String text = toString(new FileInputStream(file), null);
-        System.out.println("\n*********** FILE=" + file);
-
-        for (int letters=0; letters < maxLetters; letters++) {
-          boolean lettersOnly = letters == 0;
-          
-          for (int stops=0; stops < maxStops; stops++) {
-            Set stopWords = null;
-            if (stops != 0) stopWords = StopAnalyzer.ENGLISH_STOP_WORDS_SET;
-                
-            for (int toLower=0; toLower < maxToLower; toLower++) {
-              boolean toLowerCase = toLower != 0;
-                
-              for (int run=0; run < runs; run++) {
-                List tokens1 = null; List tokens2 = null;
-                try {
-                  if (usePattern) tokens1 = getTokens(patternTokenStream(text, lettersOnly, toLowerCase, stopWords));
-                  if (useLucene) tokens2 = getTokens(luceneTokenStream(text, lettersOnly, toLowerCase, stopWords));          
-                  if (usePattern && useLucene) assertEquals(tokens1, tokens2);
-                } catch (Throwable t) {
-                  if (t instanceof OutOfMemoryError) t.printStackTrace();
-                  System.out.println("fatal error at file=" + file + ", letters="+ lettersOnly + ", toLowerCase=" + toLowerCase + ", stopwords=" + (stopWords != null ? "english" : "none"));
-                  System.out.println("\n\ntokens1=" + toString(tokens1));
-                  System.out.println("\n\ntokens2=" + toString(tokens2));
-                  throw t;
-                }
-              }
-            }
-          }
-        }
-        long end = System.currentTimeMillis();
-        System.out.println("\nsecs = " + ((end-start)/1000.0f));
-        System.out.println("files/sec= " + 
-            (1.0f * runs * maxLetters * maxToLower * maxStops * files.length 
-            / ((end-start)/1000.0f)));
-        float mb = (1.0f * bytes * runs * maxLetters * maxToLower * maxStops) / (1024.0f * 1024.0f);
-        System.out.println("MB/sec = " + (mb / ((end-start)/1000.0f)));
-      }
-    }
-    
-    if (usePattern && useLucene) 
-      System.out.println("No bug found. done.");
-    else 
-      System.out.println("Done benchmarking (without checking correctness).");
-  }
+ * Verifies the behavior of PatternAnalyzer.
+ */
+public class PatternAnalyzerTest extends BaseTokenStreamTestCase {
 
-  private TokenStream patternTokenStream(String text, boolean letters, boolean toLowerCase, Set stopWords) {
-    Pattern pattern;
-    if (letters) 
-      pattern = PatternAnalyzer.NON_WORD_PATTERN;
-    else               
-      pattern = PatternAnalyzer.WHITESPACE_PATTERN;
-    PatternAnalyzer analyzer = new PatternAnalyzer(pattern, toLowerCase, stopWords);
-    return analyzer.tokenStream("", text);
-  }
-  
-  private TokenStream luceneTokenStream(String text, boolean letters, boolean toLowerCase, Set stopWords) {
-    TokenStream stream;
-    if (letters) 
-      stream = new LetterTokenizer(new StringReader(text));
-    else
-      stream = new WhitespaceTokenizer(new StringReader(text));
-    if (toLowerCase)  stream = new LowerCaseFilter(stream);
-    if (stopWords != null) stream = new StopFilter(stream, stopWords);
-    return stream;            
-  }
-  
-  private List getTokens(TokenStream stream) throws IOException {
-    ArrayList tokens = new ArrayList();
-    final Token reusableToken = new Token();
-    for (Token nextToken = stream.next(reusableToken); nextToken != null; nextToken = stream.next(reusableToken)) {
-      tokens.add(nextToken.clone());
-    }
-    return tokens;
-  }
-  
-  private void assertEquals(List tokens1, List tokens2) {
-    int size = Math.min(tokens1.size(), tokens2.size());
-    int i=0;
-    try {
-      for (; i < size; i++) {
-        Token t1 = (Token) tokens1.get(i);
-        Token t2 = (Token) tokens2.get(i);
-        if (!(t1.term().equals(t2.term()))) throw new IllegalStateException("termText");
-        if (t1.startOffset() != t2.startOffset()) throw new IllegalStateException("startOffset");
-        if (t1.endOffset() != t2.endOffset()) throw new IllegalStateException("endOffset");
-        if (!(t1.type().equals(t2.type()))) throw new IllegalStateException("type");
-      }
-      if (tokens1.size() != tokens2.size())   throw new IllegalStateException("size1=" + tokens1.size() + ", size2=" + tokens2.size());
-    }
-
-    catch (IllegalStateException e) {
-      if (size > 0) {
-        System.out.println("i=" + i + ", size=" + size);
-        System.out.println("t1[size]='" + ((Token) tokens1.get(size-1)).term() + "'");
-        System.out.println("t2[size]='" + ((Token) tokens2.get(size-1)).term() + "'");
-      }
-      throw e;
-    }
-  }
-  
-  private String toString(List tokens) {
-    if (tokens == null) return "null";
-    String str = "[";
-    for (int i=0; i < tokens.size(); i++) {
-      Token t1 = (Token) tokens.get(i);
-      str = str + "'" + t1.term() + "', ";
-    }
-    return str + "]";
-  }
-  
-  // trick to detect default platform charset
-  private static final Charset DEFAULT_PLATFORM_CHARSET = 
-    Charset.forName(new InputStreamReader(new ByteArrayInputStream(new byte[0])).getEncoding());  
-  
-  // the following utility methods below are copied from Apache style Nux library - see http://dsd.lbl.gov/nux
-  private static String toString(InputStream input, Charset charset) throws IOException {
-    if (charset == null) charset = DEFAULT_PLATFORM_CHARSET;      
-    byte[] data = toByteArray(input);
-    return charset.decode(ByteBuffer.wrap(data)).toString();
-  }
-  
-  private static byte[] toByteArray(InputStream input) throws IOException {
-    try {
-      // safe and fast even if input.available() behaves weird or buggy
-      int len = Math.max(256, input.available());
-      byte[] buffer = new byte[len];
-      byte[] output = new byte[len];
-      
-      len = 0;
-      int n;
-      while ((n = input.read(buffer)) >= 0) {
-        if (len + n > output.length) { // grow capacity
-          byte tmp[] = new byte[Math.max(output.length << 1, len + n)];
-          System.arraycopy(output, 0, tmp, 0, len);
-          System.arraycopy(buffer, 0, tmp, len, n);
-          buffer = output; // use larger buffer for future larger bulk reads
-          output = tmp;
-        } else {
-          System.arraycopy(buffer, 0, output, len, n);
-        }
-        len += n;
-      }
-
-      if (len == output.length) return output;
-      buffer = null; // help gc
-      buffer = new byte[len];
-      System.arraycopy(output, 0, buffer, 0, len);
-      return buffer;
-    } finally {
-      if (input != null) input.close();
-    }
+  /**
+   * Test PatternAnalyzer when it is configured with a non-word pattern.
+   * Behavior can be similar to SimpleAnalyzer (depending upon options)
+   */
+  public void testNonWordPattern() throws IOException {
+    // Split on non-letter pattern, do not lowercase, no stopwords
+    PatternAnalyzer a = new PatternAnalyzer(PatternAnalyzer.NON_WORD_PATTERN,
+        false, null);
+    check(a, "The quick brown Fox,the abcd1234 (56.78) dc.", new String[] {
+        "The", "quick", "brown", "Fox", "the", "abcd", "dc" });
+
+    // split on non-letter pattern, lowercase, english stopwords
+    PatternAnalyzer b = new PatternAnalyzer(PatternAnalyzer.NON_WORD_PATTERN,
+        true, StopAnalyzer.ENGLISH_STOP_WORDS_SET);
+    check(b, "The quick brown Fox,the abcd1234 (56.78) dc.", new String[] {
+        "quick", "brown", "fox", "abcd", "dc" });
+  }
+
+  /**
+   * Test PatternAnalyzer when it is configured with a whitespace pattern.
+   * Behavior can be similar to WhitespaceAnalyzer (depending upon options)
+   */
+  public void testWhitespacePattern() throws IOException {
+    // Split on whitespace patterns, do not lowercase, no stopwords
+    PatternAnalyzer a = new PatternAnalyzer(PatternAnalyzer.WHITESPACE_PATTERN,
+        false, null);
+    check(a, "The quick brown Fox,the abcd1234 (56.78) dc.", new String[] {
+        "The", "quick", "brown", "Fox,the", "abcd1234", "(56.78)", "dc." });
+
+    // Split on whitespace patterns, lowercase, english stopwords
+    PatternAnalyzer b = new PatternAnalyzer(PatternAnalyzer.WHITESPACE_PATTERN,
+        true, StopAnalyzer.ENGLISH_STOP_WORDS_SET);
+    check(b, "The quick brown Fox,the abcd1234 (56.78) dc.", new String[] {
+        "quick", "brown", "fox,the", "abcd1234", "(56.78)", "dc." });
+  }
+
+  /**
+   * Test PatternAnalyzer when it is configured with a custom pattern. In this
+   * case, text is tokenized on the comma ","
+   */
+  public void testCustomPattern() throws IOException {
+    // Split on comma, do not lowercase, no stopwords
+    PatternAnalyzer a = new PatternAnalyzer(Pattern.compile(","), false, null);
+    check(a, "Here,Are,some,Comma,separated,words,", new String[] { "Here",
+        "Are", "some", "Comma", "separated", "words" });
+
+    // split on comma, lowercase, english stopwords
+    PatternAnalyzer b = new PatternAnalyzer(Pattern.compile(","), true,
+        StopAnalyzer.ENGLISH_STOP_WORDS_SET);
+    check(b, "Here,Are,some,Comma,separated,words,", new String[] { "here",
+        "some", "comma", "separated", "words" });
+  }
+
+  /**
+   * Test PatternAnalyzer against a large document.
+   */
+  public void testHugeDocument() throws IOException {
+    StringBuilder document = new StringBuilder();
+    // 5000 a's
+    char largeWord[] = new char[5000];
+    Arrays.fill(largeWord, 'a');
+    document.append(largeWord);
+
+    // a space
+    document.append(' ');
+
+    // 2000 b's
+    char largeWord2[] = new char[2000];
+    Arrays.fill(largeWord2, 'b');
+    document.append(largeWord2);
+
+    // Split on whitespace patterns, do not lowercase, no stopwords
+    PatternAnalyzer a = new PatternAnalyzer(PatternAnalyzer.WHITESPACE_PATTERN,
+        false, null);
+    check(a, document.toString(), new String[] { new String(largeWord),
+        new String(largeWord2) });
+  }
+
+  /**
+   * Verify the analyzer analyzes to the expected contents. For PatternAnalyzer,
+   * several methods are verified:
+   * <ul>
+   * <li>Analysis with a normal Reader
+   * <li>Analysis with a FastStringReader
+   * <li>Analysis with a String
+   * </ul>
+   */
+  private void check(PatternAnalyzer analyzer, String document,
+      String expected[]) throws IOException {
+    // ordinary analysis of a Reader
+    assertAnalyzesTo(analyzer, document, expected);
+
+    // analysis with a "FastStringReader"
+    TokenStream ts = analyzer.tokenStream("dummy",
+        new PatternAnalyzer.FastStringReader(document));
+    assertTokenStreamContents(ts, expected);
+
+    // analysis of a String, uses PatternAnalyzer.tokenStream(String, String)
+    TokenStream ts2 = analyzer.tokenStream("dummy", document);
+    assertTokenStreamContents(ts2, expected);
   }
-  
 }
\ No newline at end of file

Propchange: lucene/java/branches/lucene_2_9/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src:957490,957920,984210,988629,990167,990286,999226,999847,1034036,1039774
 /lucene/dev/trunk/lucene/src:930932,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/src:963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src:900030,903368,916543,919869
+/lucene/java/trunk/src:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseCharFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -7,4 +7,4 @@
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseCharFilter.java:817269-818599
 /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/analysis/BaseCharFilter.java:818601-821336
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java:1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/BaseCharFilter.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,889431-889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,891377,893093,894348,897672,899627,900030,900196,903368,908477,908975,909360,909398,910034,910078,912407,915399,916543,919060,919869,920270,924483-925561
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/BaseCharFilter.java:825112,881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,889431-889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,891377,893093,894348,897672,899627,900030,900196,903368,908477,908975,909360,909398,910034,910078,912407,915399,916543,919060,919869,920270,924483-925561

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LengthFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1039774
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LengthFilter.java:1039773
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LengthFilter.java:1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/LengthFilter.java:900030
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/LengthFilter.java:825112,900030

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LetterTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1039774
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1039773
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LetterTokenizer.java:1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/LetterTokenizer.java:900030
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/LetterTokenizer.java:825112,900030

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1039774
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1039773
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:900030
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/LowerCaseTokenizer.java:825112,900030

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/java/org/apache/lucene/analysis/Tokenizer.java:889688,891211,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:821888,834035,836155,887670,889579,889866,890439,891205,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:821888,825112,834035,836155,887670,889579,889866,890439,891205,891377,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standard/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard:1039774
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard:1039773
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard:1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard:900030
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard:825112,900030

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -5,4 +5,4 @@
 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:817269-818599
 /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:818601-821336
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,889431-889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,891377,893093,894348,897672,899627,900030,900196,903368,908477,908975,909360,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:825112,881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887347,887532,887602,887670,888247,889431-889432,889579,889866,890439,890967,890988,891189,891205,891209,891363,891377,893093,894348,897672,899627,900030,900196,903368,908477,908975,909360,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/AttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -2,4 +2,4 @@
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/AttributeSource.java:929738,932398,935522,940730,946599,949976,949997,950613,951521,989785
 /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/util/AttributeSource.java:748824
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/AttributeSource.java:886275,889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java:821888,824125,826029,826385,830871,833095,833297,833886,834035,836155,881819,882672,883554,884870,886257,887347,887532,887670,889579,889866,890439,891189,891205,891363,894348,897672,908975,910034,910078,912407,916543,919060,919869,920270
+/lucene/java/trunk/src/java/org/apache/lucene/util/AttributeSource.java:821888,824125,825112,826029,826385,830871,833095,833297,833886,834035,836155,881819,882672,883554,884870,886257,887347,887532,887670,889579,889866,890439,891189,891205,891363,894348,897672,908975,910034,910078,912407,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/util/StringHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/StringHelper.java:1039774
 /lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/StringHelper.java:1039773
 /lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/util/StringHelper.java:1039775
-/lucene/java/trunk/src/java/org/apache/lucene/util/StringHelper.java:900030
+/lucene/java/trunk/src/java/org/apache/lucene/util/StringHelper.java:825112,900030

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -1,4 +1,4 @@
 /lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis:1039774
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis:1039773
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis:1039775
-/lucene/java/trunk/src/test/org/apache/lucene/analysis:900030
+/lucene/java/trunk/src/test/org/apache/lucene/analysis:825112,900030

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -2,4 +2,4 @@
 /lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:929738,932398,935522,940730,946599,949976,949997,950613,951521,989785
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:748824
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:886275,889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:818920,821888,824125,826029,826385,830871,833095,833297,833886,834035,836155,881819,882672,883554,884870,887347,887532,887670,889579,889866,890439,891189,891205,891363,897672,908975,910034,910078,912407,916543,919060,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:818920,821888,824125,825112,826029,826385,830871,833095,833297,833886,834035,836155,881819,882672,883554,884870,887347,887532,887670,889579,889866,890439,891189,891205,891363,897672,908975,910034,910078,912407,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/test/org/apache/lucene/document/TestDateTools.java:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/test/org/apache/lucene/document/TestNumberTools.java:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/index:930932,940730,949288,950458,950613,951521,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index:950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/index:834035,836155,887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/index:825112,834035,836155,887670,889579,889866,890439,891205,891377,900030,903368,916543,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:930932,963372,965299,990161,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:900030,903368,916543,919869
+/lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:930932,963372,965299,990161,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:900030,903368,916543,919869
+/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/search/spans/TestSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:930932,963372,965299,990161,994979,999223,999842,1034017,1039773
 /lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/search/spans/TestSpans.java:999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:900030,903368,916543,919869
+/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:825112,900030,903368,916543,919869

Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 28 16:26:36 2010
@@ -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/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:929738,930932,932398,935522,938989,939611,939649,940730,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_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java:889688,891211,899639,900212,908479,909401,912383,915404,940993,948090,948432,950033,950301,950474,950580,957495,963788,965105,984217,988638,990293,995063,999228,1028739,1028779,1028789,1028827,1028873,1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374,1034054,1038096,1039775
-/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
+/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:821888,825112,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900030,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270



Mime
View raw message