You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/05/06 14:55:01 UTC
svn commit: r941706 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/ lu...
Author: rmuir
Date: Thu May 6 12:54:59 2010
New Revision: 941706
URL: http://svn.apache.org/viewvc?rev=941706&view=rev
Log:
LUCENE-2414: backport
Added:
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/data/uax29/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/data/uax29/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/data/uax29/Hebrew.rbbi
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/data/uax29/Hebrew.rbbi
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/data/uax29/Khmer.rbbi
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/data/uax29/Khmer.rbbi
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/data/uax29/Lao.rbbi
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/data/uax29/Lao.rbbi
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/data/uax29/Myanmar.rbbi
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/data/uax29/Myanmar.rbbi
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CompositeBreakIterator.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CompositeBreakIterator.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerConfig.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerConfig.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/LaoBreakIterator.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/LaoBreakIterator.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ScriptIterator.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ScriptIterator.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package.html
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package.html
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttribute.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttribute.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Hebrew.brk
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Hebrew.brk
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Khmer.brk
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Khmer.brk
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Lao.brk
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Lao.brk
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Myanmar.brk
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Myanmar.brk
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestLaoBreakIterator.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestLaoBreakIterator.java
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/org/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/org/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/org/apache/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/org/apache/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/org/apache/lucene/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/org/apache/lucene/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/org/apache/lucene/analysis/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/org/apache/lucene/analysis/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/org/apache/lucene/analysis/icu/
- copied from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/org/apache/lucene/analysis/icu/
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java
- copied unchanged from r940447, lucene/dev/trunk/lucene/contrib/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/overview.html
lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar (props changed)
lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/ (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/solrj/org/ (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
Propchange: lucene/dev/branches/branch_3x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1 +1 @@
-/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk:932749
-/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458:924791,924850,930201
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334
/lucene/java/trunk/CHANGES.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,3 +1,3 @@
-/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src:924850,930201
/lucene/java/trunk/backwards/src:924781
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/build.xml:932749
-/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/build.xml:924791,924850,930201
/lucene/java/branches/lucene_2_9/build.xml:896850,909334
/lucene/java/trunk/build.xml:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=941706&r1=941705&r2=941706&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Thu May 6 12:54:59 2010
@@ -137,6 +137,11 @@ New features
sensitive way, either from ICU built-in rules (such as Traditional-Simplified),
or from rules you write yourself. (Robert Muir)
+ * LUCENE-2414: Add ICUTokenizer, a tailorable tokenizer that implements Unicode
+ Text Segmentation. This tokenizer is useful for documents or collections with
+ multiple languages. The default configuration includes special support for
+ Thai, Lao, Myanmar, and Khmer. (Robert Muir, Uwe Schindler)
+
* LUCENE-2298: Add analyzers/stempel, an algorithmic stemmer with support for
the Polish language. (Andrzej Bialecki via Robert Muir)
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Modified: lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml?rev=941706&r1=941705&r2=941706&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml Thu May 6 12:54:59 2010
@@ -43,7 +43,39 @@
<target name="gennorm2">
<echo>Warning: only works on a big-endian platform!</echo>
<exec executable="gennorm2" failonerror="true">
- <arg line="-v -s ${gennorm2.src.dir} ${gennorm2.src.files} -o ${gennorm2.dst}"/>
+ <arg value="-v"/>
+ <arg value="-s"/>
+ <arg value="${gennorm2.src.dir}"/>
+ <arg value="${gennorm2.src.files}"/>
+ <arg value="-o"/>
+ <arg value="${gennorm2.dst}"/>
</exec>
</target>
+
+ <property name="rbbi.src.dir" location="src/data/uax29"/>
+ <property name="rbbi.dst.dir" location="src/resources/org/apache/lucene/analysis/icu/segmentation"/>
+
+ <target name="genrbbi" depends="compile-tools">
+ <mkdir dir="${rbbi.dst.dir}"/>
+ <java
+ classname="org.apache.lucene.analysis.icu.RBBIRuleCompiler"
+ dir="."
+ fork="true"
+ failonerror="true">
+ <classpath>
+ <path refid="additional.dependencies"/>
+ <pathelement location="${build.dir}/classes/tools"/>
+ </classpath>
+ <arg value="${rbbi.src.dir}"/>
+ <arg value="${rbbi.dst.dir}"/>
+ </java>
+ </target>
+
+ <target name="compile-tools">
+ <compile
+ srcdir="src/tools/java"
+ destdir="${build.dir}/classes/tools">
+ <classpath refid="classpath"/>
+ </compile>
+ </target>
</project>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/overview.html?rev=941706&r1=941705&r2=941706&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/overview.html (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/icu/src/java/overview.html Thu May 6 12:54:59 2010
@@ -30,6 +30,8 @@ performance, keeping current with the Un
APIs. This module exposes the following functionality:
</p>
<ul>
+ <li><a href="#segmentation">Text Segmentation</a>: Tokenizes text based on
+ properties and rules defined in Unicode.</li>
<li><a href="#collation">Collation</a>: Compare strings according to the
conventions and standards of a particular language, region or country.</li>
<li><a href="#normalization">Normalization</a>: Converts text to a unique,
@@ -42,6 +44,35 @@ APIs. This module exposes the following
a context-sensitive fashion: e.g. mapping Traditional to Simplified Chinese</li>
</ul>
<hr/>
+<h1><a name="segmentation">Text Segmentation</a></h1>
+<p>
+Text Segmentation (Tokenization) divides document and query text into index terms
+(typically words). Unicode provides special properties and rules so that this can
+be done in a manner that works well with most languages.
+</p>
+<p>
+Text Segmentation implements the word segmentation specified in
+<a href="http://unicode.org/reports/tr29/">Unicode Text Segmentation</a>.
+Additionally the algorithm can be tailored based on writing system, for example
+text in the Thai script is automatically delegated to a dictionary-based segmentation
+algorithm.
+</p>
+<h2>Use Cases</h2>
+<ul>
+ <li>
+ As a more thorough replacement for StandardTokenizer that works well for
+ most languages.
+ </li>
+</ul>
+<h2>Example Usages</h2>
+<h3>Tokenizing multilanguage text</h3>
+<code><pre>
+ /**
+ * This tokenizer will work well in general for most languages.
+ */
+ Tokenizer tokenizer = new ICUTokenizer(reader);
+</pre></code>
+<hr/>
<h1><a name="collation">Collation</a></h1>
<p>
<code>ICUCollationKeyFilter</code>
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/java/branches/lucene_2_4/solr:748824
/lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336
Propchange: lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 12:54:59 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932856-932857,932862,932864,932878,933541-933575,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935628,935734,935739,935771,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091