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 us...@apache.org on 2010/10/31 15:50:37 UTC
svn commit: r1029375 - in /lucene/java/branches/lucene_2_9: ./ contrib/
contrib/analyzers/ contrib/analyzers/common/
contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/
contrib/analyzers/common/src/test/ contrib/analyzers/smartcn/ co...
Author: uschindler
Date: Sun Oct 31 14:50:36 2010
New Revision: 1029375
URL: http://svn.apache.org/viewvc?rev=1029375&view=rev
Log:
Bugfix-only backport: LUCENE-2731, LUCENE-2732: Fix (charset) problems in XML loading in HyphenationCompoundWordTokenFilter
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 (contents, 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/compound/CompoundWordTokenFilterBase.java
lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/ (props changed)
lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn/ (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/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/Tokenizer.java (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/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 Oct 31 14:50:36 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/branch_3x/lucene:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847
/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
/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
+/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
/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,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 Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/CHANGES.txt:941394,946651,948430,957490,957920,984210
/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
-/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
+/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
/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,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 Oct 31 14:50: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
/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
-/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
+/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
/lucene/java/trunk/build.xml:821888,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,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 Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/contrib:941394,946651,948430,957490,957920,984210,988629,990167,990286,999226,999847
/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
-/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
+/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
/lucene/java/trunk/contrib:821888,834035,836155,881819,886257,887347,887532,887670,889431-889432,889579,889866,890439,891189,891205,891209,891363,891377,897672,899627,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
Modified: lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt?rev=1029375&r1=1029374&r2=1029375&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/CHANGES.txt (original)
+++ lucene/java/branches/lucene_2_9/contrib/CHANGES.txt Sun Oct 31 14:50:36 2010
@@ -18,6 +18,11 @@ Bug Fixes
* LUCENE-2616: FastVectorHighlighter: out of alignment when the first value is
empty in multiValued field (Koji Sekiguchi)
+
+ * LUCENE-2731, LUCENE-2732: Fix (charset) problems in XML loading in
+ HyphenationCompoundWordTokenFilter (partial bugfix-only in 2.9 and 3.0,
+ full fix will be in later 3.1).
+ (Uwe Schinder)
Documentation
Propchange: lucene/java/branches/lucene_2_9/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50: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
/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
-/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
+/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
/lucene/java/trunk/contrib/CHANGES.txt:821888,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,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 Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/contrib/analyzers:941394,946651,957490,957920,984210,988629,990167,990286,999226,999847
/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
-/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
+/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
/lucene/java/trunk/contrib/analyzers:834035,836155,887670,889579,889866,890439,891205,891377,903368,916543,919869,920270
Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common:957920,988629,990167,990286,999226,999847
/lucene/dev/trunk/lucene/contrib/analyzers/common:930932,957707,963372,965299,989785,990161,990281,994979,999223,999842
-/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
+/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
/lucene/java/trunk/contrib/analyzers/common:903368,916543,919869
Modified: lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java?rev=1029375&r1=1029374&r2=1029375&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (original)
+++ lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java Sun Oct 31 14:50:36 2010
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.Locale;
import java.util.Set;
import org.apache.lucene.analysis.CharArraySet;
@@ -181,7 +182,7 @@ public abstract class CompoundWordTokenF
Iterator iter=col.iterator();
while (iter.hasNext()) {
- target.add(((String)iter.next()).toLowerCase());
+ target.add(((String)iter.next()).toLowerCase(Locale.ENGLISH));
}
}
Modified: lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java?rev=1029375&r1=1029374&r2=1029375&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java (original)
+++ lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java Sun Oct 31 14:50:36 2010
@@ -18,8 +18,6 @@ package org.apache.lucene.analysis.compo
*/
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Set;
@@ -117,7 +115,7 @@ public class HyphenationCompoundWordToke
*/
public static HyphenationTree getHyphenationTree(String hyphenationFilename)
throws Exception {
- return getHyphenationTree(new File(hyphenationFilename));
+ return getHyphenationTree(new InputSource(hyphenationFilename));
}
/**
@@ -129,8 +127,7 @@ public class HyphenationCompoundWordToke
*/
public static HyphenationTree getHyphenationTree(File hyphenationFile)
throws Exception {
- return getHyphenationTree(new InputStreamReader(new FileInputStream(
- hyphenationFile), "ISO-8859-1"));
+ return getHyphenationTree(new InputSource(hyphenationFile.toURL().toExternalForm()));
}
/**
@@ -142,10 +139,25 @@ public class HyphenationCompoundWordToke
*/
public static HyphenationTree getHyphenationTree(Reader hyphenationReader)
throws Exception {
- HyphenationTree tree = new HyphenationTree();
-
- tree.loadPatterns(new InputSource(hyphenationReader));
+ final InputSource is = new InputSource(hyphenationReader);
+ // we need this to load the DTD in very old parsers (like the one in JDK 1.4).
+ // The DTD itsself is provided via EntityResolver, so it should always load, but
+ // some parsers still want to have a base URL (Crimson).
+ is.setSystemId("urn:java:" + HyphenationTree.class.getName());
+ return getHyphenationTree(is);
+ }
+ /**
+ * Create a hyphenator tree
+ *
+ * @param hyphenationSource the InputSource pointing to the XML grammar
+ * @return An object representing the hyphenation patterns
+ * @throws Exception
+ */
+ public static HyphenationTree getHyphenationTree(InputSource hyphenationSource)
+ throws Exception {
+ HyphenationTree tree = new HyphenationTree();
+ tree.loadPatterns(hyphenationSource);
return tree;
}
Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/common/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test:957920,990167,999226,999847
/lucene/dev/trunk/lucene/contrib/analyzers/common/src/test:930932,957707,963372,965299,990161,994979,999223,999842
-/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
+/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
/lucene/java/trunk/contrib/analyzers/common/src/test:903368,916543,919869
Propchange: lucene/java/branches/lucene_2_9/contrib/analyzers/smartcn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/smartcn:957920,988629,990167,990286,999226,999847
/lucene/dev/trunk/lucene/contrib/analyzers/smartcn:930932,957707,963372,965299,989785,990161,990281,994979,999223,999842
-/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
+/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
/lucene/java/trunk/contrib/analyzers/smartcn:903368,916543,919869
Propchange: lucene/java/branches/lucene_2_9/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -1,5 +1,5 @@
/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
/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
+/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
/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,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 Oct 31 14:50:36 2010
@@ -1,5 +1,5 @@
/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
/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
+/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
/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,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 Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/contrib/highlighter:957920,988629,990167,990286,999226,999847
/lucene/dev/trunk/lucene/contrib/highlighter:930932,963372,965299,989785,990161,990281,994979,999223,999842
-/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
+/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
/lucene/java/trunk/contrib/highlighter:903368,916543,919869
Propchange: lucene/java/branches/lucene_2_9/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50: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
/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
-/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
+/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
/lucene/java/trunk/contrib/highlighter/src/test:821888,834035,836155,887670,889431-889432,889579,889866,890439,891205,891209,891377,899627,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 Oct 31 14:50:36 2010
@@ -3,5 +3,5 @@
/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-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
+/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
/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,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270
Propchange: lucene/java/branches/lucene_2_9/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/src:957490,957920,984210,988629,990167,990286,999226,999847
/lucene/dev/trunk/lucene/src:930932,957707,963372,963781,965103,965299,984187,989785,990161,990281,994979,999223,999842
-/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
+/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
/lucene/java/trunk/src:903368,916543,919869
Propchange: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/BaseCharFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -6,5 +6,5 @@
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/BaseCharFilter.java:748824
/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
+/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/BaseCharFilter.java:1028915,1028920,1028931,1029013,1029022,1029024,1029039,1029077,1029138,1029374
/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,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/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50: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
/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
-/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
+/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
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:821888,834035,836155,887670,889579,889866,890439,891205,891377,899627,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/tokenattributes/TermAttributeImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -4,5 +4,5 @@
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/tokenattributes/TermAttributeImpl.java:748824
/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
+/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
/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,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 Oct 31 14:50: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
/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
-/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
+/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
/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,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 Oct 31 14:50:36 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/AttributeSource.java:946651
/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
+/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
/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
Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50:36 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:946651
/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
+/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
/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
Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50: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
/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
-/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
+/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
/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,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 Oct 31 14:50: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
/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
-/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
+/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
/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,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 Oct 31 14:50: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
/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
-/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
+/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
/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,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 Oct 31 14:50: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
/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
-/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
+/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
/lucene/java/trunk/src/test/org/apache/lucene/index:834035,836155,887670,889579,889866,890439,891205,891377,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 Oct 31 14:50: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
/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
-/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
+/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
/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,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 Oct 31 14:50:36 2010
@@ -1,4 +1,4 @@
/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:957920,990167,999226,999847
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:930932,963372,965299,990161,994979,999223,999842
-/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
+/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
/lucene/java/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java: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 Oct 31 14:50: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
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:930932,963372,965299,990161,994979,999223,999842
-/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
+/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
/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java: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 Oct 31 14:50: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
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:930932,963372,965299,990161,994979,999223,999842
-/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
+/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
/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:903368,916543,919869
Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 31 14:50: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
/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
-/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
+/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
/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,900196,903368,908477,908975,909398,910034,910078,912407,915399,916543,919060,919869,920270