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/10/02 23:03:00 UTC
svn commit: r1003885 [3/6] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/ind...
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:967125-979432
-/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963
781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,99954
5,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873
+/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963
781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,99954
5,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/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,948516
/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/analysis/standard/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,96
3906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000
424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,96
3906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000
424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard:1002032
/lucene/dev/trunk/src/java/org/apache/lucene/analysis/standard:932749
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard:924791,924850,930201
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro?rev=1003885&r1=1003884&r2=1003885&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro Sat Oct 2 21:02:57 2010
@@ -1,318 +1,318 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated from IANA Root Zone Database <http://www.internic.net/zones/root.zone>
-// file version from Tuesday, September 28, 2010 11:34:02 AM UTC
-// generated on Wednesday, September 29, 2010 12:52:01 AM UTC
-// by org.apache.lucene.analysis.standard.GenerateJflexTLDMacros
-
-ASCIITLD = "." (
- [aA][cC]
- | [aA][dD]
- | [aA][eE]
- | [aA][eE][rR][oO]
- | [aA][fF]
- | [aA][gG]
- | [aA][iI]
- | [aA][lL]
- | [aA][mM]
- | [aA][nN]
- | [aA][oO]
- | [aA][qQ]
- | [aA][rR]
- | [aA][rR][pP][aA]
- | [aA][sS]
- | [aA][sS][iI][aA]
- | [aA][tT]
- | [aA][uU]
- | [aA][wW]
- | [aA][xX]
- | [aA][zZ]
- | [bB][aA]
- | [bB][bB]
- | [bB][dD]
- | [bB][eE]
- | [bB][fF]
- | [bB][gG]
- | [bB][hH]
- | [bB][iI]
- | [bB][iI][zZ]
- | [bB][jJ]
- | [bB][mM]
- | [bB][nN]
- | [bB][oO]
- | [bB][rR]
- | [bB][sS]
- | [bB][tT]
- | [bB][vV]
- | [bB][wW]
- | [bB][yY]
- | [bB][zZ]
- | [cC][aA]
- | [cC][aA][tT]
- | [cC][cC]
- | [cC][dD]
- | [cC][fF]
- | [cC][gG]
- | [cC][hH]
- | [cC][iI]
- | [cC][kK]
- | [cC][lL]
- | [cC][mM]
- | [cC][nN]
- | [cC][oO]
- | [cC][oO][mM]
- | [cC][oO][oO][pP]
- | [cC][rR]
- | [cC][uU]
- | [cC][vV]
- | [cC][xX]
- | [cC][yY]
- | [cC][zZ]
- | [dD][eE]
- | [dD][jJ]
- | [dD][kK]
- | [dD][mM]
- | [dD][oO]
- | [dD][zZ]
- | [eE][cC]
- | [eE][dD][uU]
- | [eE][eE]
- | [eE][gG]
- | [eE][rR]
- | [eE][sS]
- | [eE][tT]
- | [eE][uU]
- | [fF][iI]
- | [fF][jJ]
- | [fF][kK]
- | [fF][mM]
- | [fF][oO]
- | [fF][rR]
- | [gG][aA]
- | [gG][bB]
- | [gG][dD]
- | [gG][eE]
- | [gG][fF]
- | [gG][gG]
- | [gG][hH]
- | [gG][iI]
- | [gG][lL]
- | [gG][mM]
- | [gG][nN]
- | [gG][oO][vV]
- | [gG][pP]
- | [gG][qQ]
- | [gG][rR]
- | [gG][sS]
- | [gG][tT]
- | [gG][uU]
- | [gG][wW]
- | [gG][yY]
- | [hH][kK]
- | [hH][mM]
- | [hH][nN]
- | [hH][rR]
- | [hH][tT]
- | [hH][uU]
- | [iI][dD]
- | [iI][eE]
- | [iI][lL]
- | [iI][mM]
- | [iI][nN]
- | [iI][nN][fF][oO]
- | [iI][nN][tT]
- | [iI][oO]
- | [iI][qQ]
- | [iI][rR]
- | [iI][sS]
- | [iI][tT]
- | [jJ][eE]
- | [jJ][mM]
- | [jJ][oO]
- | [jJ][oO][bB][sS]
- | [jJ][pP]
- | [kK][eE]
- | [kK][gG]
- | [kK][hH]
- | [kK][iI]
- | [kK][mM]
- | [kK][nN]
- | [kK][pP]
- | [kK][rR]
- | [kK][wW]
- | [kK][yY]
- | [kK][zZ]
- | [lL][aA]
- | [lL][bB]
- | [lL][cC]
- | [lL][iI]
- | [lL][kK]
- | [lL][rR]
- | [lL][sS]
- | [lL][tT]
- | [lL][uU]
- | [lL][vV]
- | [lL][yY]
- | [mM][aA]
- | [mM][cC]
- | [mM][dD]
- | [mM][eE]
- | [mM][gG]
- | [mM][hH]
- | [mM][iI][lL]
- | [mM][kK]
- | [mM][lL]
- | [mM][mM]
- | [mM][nN]
- | [mM][oO]
- | [mM][oO][bB][iI]
- | [mM][pP]
- | [mM][qQ]
- | [mM][rR]
- | [mM][sS]
- | [mM][tT]
- | [mM][uU]
- | [mM][uU][sS][eE][uU][mM]
- | [mM][vV]
- | [mM][wW]
- | [mM][xX]
- | [mM][yY]
- | [mM][zZ]
- | [nN][aA]
- | [nN][aA][mM][eE]
- | [nN][cC]
- | [nN][eE]
- | [nN][eE][tT]
- | [nN][fF]
- | [nN][gG]
- | [nN][iI]
- | [nN][lL]
- | [nN][oO]
- | [nN][pP]
- | [nN][rR]
- | [nN][uU]
- | [nN][zZ]
- | [oO][mM]
- | [oO][rR][gG]
- | [pP][aA]
- | [pP][eE]
- | [pP][fF]
- | [pP][gG]
- | [pP][hH]
- | [pP][kK]
- | [pP][lL]
- | [pP][mM]
- | [pP][nN]
- | [pP][rR]
- | [pP][rR][oO]
- | [pP][sS]
- | [pP][tT]
- | [pP][wW]
- | [pP][yY]
- | [qQ][aA]
- | [rR][eE]
- | [rR][oO]
- | [rR][sS]
- | [rR][uU]
- | [rR][wW]
- | [sS][aA]
- | [sS][bB]
- | [sS][cC]
- | [sS][dD]
- | [sS][eE]
- | [sS][gG]
- | [sS][hH]
- | [sS][iI]
- | [sS][jJ]
- | [sS][kK]
- | [sS][lL]
- | [sS][mM]
- | [sS][nN]
- | [sS][oO]
- | [sS][rR]
- | [sS][tT]
- | [sS][uU]
- | [sS][vV]
- | [sS][yY]
- | [sS][zZ]
- | [tT][cC]
- | [tT][dD]
- | [tT][eE][lL]
- | [tT][fF]
- | [tT][gG]
- | [tT][hH]
- | [tT][jJ]
- | [tT][kK]
- | [tT][lL]
- | [tT][mM]
- | [tT][nN]
- | [tT][oO]
- | [tT][pP]
- | [tT][rR]
- | [tT][rR][aA][vV][eE][lL]
- | [tT][tT]
- | [tT][vV]
- | [tT][wW]
- | [tT][zZ]
- | [uU][aA]
- | [uU][gG]
- | [uU][kK]
- | [uU][sS]
- | [uU][yY]
- | [uU][zZ]
- | [vV][aA]
- | [vV][cC]
- | [vV][eE]
- | [vV][gG]
- | [vV][iI]
- | [vV][nN]
- | [vV][uU]
- | [wW][fF]
- | [wW][sS]
- | [xX][nN]--0[zZ][wW][mM]56[dD]
- | [xX][nN]--11[bB]5[bB][sS]3[aA]9[aA][jJ]6[gG]
- | [xX][nN]--80[aA][kK][hH][bB][yY][kK][nN][jJ]4[fF]
- | [xX][nN]--9[tT]4[bB]11[yY][iI]5[aA]
- | [xX][nN]--[dD][eE][bB][aA]0[aA][dD]
- | [xX][nN]--[fF][iI][qQ][sS]8[sS]
- | [xX][nN]--[fF][iI][qQ][zZ]9[sS]
- | [xX][nN]--[fF][zZ][cC]2[cC]9[eE]2[cC]
- | [xX][nN]--[gG]6[wW]251[dD]
- | [xX][nN]--[hH][gG][bB][kK]6[aA][jJ]7[fF]53[bB][bB][aA]
- | [xX][nN]--[hH][lL][cC][jJ]6[aA][yY][aA]9[eE][sS][cC]7[aA]
- | [xX][nN]--[jJ]6[wW]193[gG]
- | [xX][nN]--[jJ][xX][aA][lL][pP][dD][lL][pP]
- | [xX][nN]--[kK][gG][bB][eE][cC][hH][tT][vV]
- | [xX][nN]--[kK][pP][rR][wW]13[dD]
- | [xX][nN]--[kK][pP][rR][yY]57[dD]
- | [xX][nN]--[mM][gG][bB][aA][aA][mM]7[aA]8[hH]
- | [xX][nN]--[mM][gG][bB][aA][yY][hH]7[gG][pP][aA]
- | [xX][nN]--[mM][gG][bB][eE][rR][pP]4[aA]5[dD]4[aA][rR]
- | [xX][nN]--[oO]3[cC][wW]4[hH]
- | [xX][nN]--[pP]1[aA][iI]
- | [xX][nN]--[pP][gG][bB][sS]0[dD][hH]
- | [xX][nN]--[wW][gG][bB][hH]1[cC]
- | [xX][nN]--[xX][kK][cC]2[aA][lL]3[hH][yY][eE]2[aA]
- | [xX][nN]--[yY][gG][bB][iI]2[aA][mM][mM][xX]
- | [xX][nN]--[zZ][cC][kK][zZ][aA][hH]
- | [yY][eE]
- | [yY][tT]
- | [zZ][aA]
- | [zZ][mM]
- | [zZ][wW]
- ) "."? // Accept trailing root (empty) domain
-
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Generated from IANA Root Zone Database <http://www.internic.net/zones/root.zone>
+// file version from Saturday, October 2, 2010 11:34:09 AM UTC
+// generated on Saturday, October 2, 2010 8:56:05 PM UTC
+// by org.apache.lucene.analysis.standard.GenerateJflexTLDMacros
+
+ASCIITLD = "." (
+ [aA][cC]
+ | [aA][dD]
+ | [aA][eE]
+ | [aA][eE][rR][oO]
+ | [aA][fF]
+ | [aA][gG]
+ | [aA][iI]
+ | [aA][lL]
+ | [aA][mM]
+ | [aA][nN]
+ | [aA][oO]
+ | [aA][qQ]
+ | [aA][rR]
+ | [aA][rR][pP][aA]
+ | [aA][sS]
+ | [aA][sS][iI][aA]
+ | [aA][tT]
+ | [aA][uU]
+ | [aA][wW]
+ | [aA][xX]
+ | [aA][zZ]
+ | [bB][aA]
+ | [bB][bB]
+ | [bB][dD]
+ | [bB][eE]
+ | [bB][fF]
+ | [bB][gG]
+ | [bB][hH]
+ | [bB][iI]
+ | [bB][iI][zZ]
+ | [bB][jJ]
+ | [bB][mM]
+ | [bB][nN]
+ | [bB][oO]
+ | [bB][rR]
+ | [bB][sS]
+ | [bB][tT]
+ | [bB][vV]
+ | [bB][wW]
+ | [bB][yY]
+ | [bB][zZ]
+ | [cC][aA]
+ | [cC][aA][tT]
+ | [cC][cC]
+ | [cC][dD]
+ | [cC][fF]
+ | [cC][gG]
+ | [cC][hH]
+ | [cC][iI]
+ | [cC][kK]
+ | [cC][lL]
+ | [cC][mM]
+ | [cC][nN]
+ | [cC][oO]
+ | [cC][oO][mM]
+ | [cC][oO][oO][pP]
+ | [cC][rR]
+ | [cC][uU]
+ | [cC][vV]
+ | [cC][xX]
+ | [cC][yY]
+ | [cC][zZ]
+ | [dD][eE]
+ | [dD][jJ]
+ | [dD][kK]
+ | [dD][mM]
+ | [dD][oO]
+ | [dD][zZ]
+ | [eE][cC]
+ | [eE][dD][uU]
+ | [eE][eE]
+ | [eE][gG]
+ | [eE][rR]
+ | [eE][sS]
+ | [eE][tT]
+ | [eE][uU]
+ | [fF][iI]
+ | [fF][jJ]
+ | [fF][kK]
+ | [fF][mM]
+ | [fF][oO]
+ | [fF][rR]
+ | [gG][aA]
+ | [gG][bB]
+ | [gG][dD]
+ | [gG][eE]
+ | [gG][fF]
+ | [gG][gG]
+ | [gG][hH]
+ | [gG][iI]
+ | [gG][lL]
+ | [gG][mM]
+ | [gG][nN]
+ | [gG][oO][vV]
+ | [gG][pP]
+ | [gG][qQ]
+ | [gG][rR]
+ | [gG][sS]
+ | [gG][tT]
+ | [gG][uU]
+ | [gG][wW]
+ | [gG][yY]
+ | [hH][kK]
+ | [hH][mM]
+ | [hH][nN]
+ | [hH][rR]
+ | [hH][tT]
+ | [hH][uU]
+ | [iI][dD]
+ | [iI][eE]
+ | [iI][lL]
+ | [iI][mM]
+ | [iI][nN]
+ | [iI][nN][fF][oO]
+ | [iI][nN][tT]
+ | [iI][oO]
+ | [iI][qQ]
+ | [iI][rR]
+ | [iI][sS]
+ | [iI][tT]
+ | [jJ][eE]
+ | [jJ][mM]
+ | [jJ][oO]
+ | [jJ][oO][bB][sS]
+ | [jJ][pP]
+ | [kK][eE]
+ | [kK][gG]
+ | [kK][hH]
+ | [kK][iI]
+ | [kK][mM]
+ | [kK][nN]
+ | [kK][pP]
+ | [kK][rR]
+ | [kK][wW]
+ | [kK][yY]
+ | [kK][zZ]
+ | [lL][aA]
+ | [lL][bB]
+ | [lL][cC]
+ | [lL][iI]
+ | [lL][kK]
+ | [lL][rR]
+ | [lL][sS]
+ | [lL][tT]
+ | [lL][uU]
+ | [lL][vV]
+ | [lL][yY]
+ | [mM][aA]
+ | [mM][cC]
+ | [mM][dD]
+ | [mM][eE]
+ | [mM][gG]
+ | [mM][hH]
+ | [mM][iI][lL]
+ | [mM][kK]
+ | [mM][lL]
+ | [mM][mM]
+ | [mM][nN]
+ | [mM][oO]
+ | [mM][oO][bB][iI]
+ | [mM][pP]
+ | [mM][qQ]
+ | [mM][rR]
+ | [mM][sS]
+ | [mM][tT]
+ | [mM][uU]
+ | [mM][uU][sS][eE][uU][mM]
+ | [mM][vV]
+ | [mM][wW]
+ | [mM][xX]
+ | [mM][yY]
+ | [mM][zZ]
+ | [nN][aA]
+ | [nN][aA][mM][eE]
+ | [nN][cC]
+ | [nN][eE]
+ | [nN][eE][tT]
+ | [nN][fF]
+ | [nN][gG]
+ | [nN][iI]
+ | [nN][lL]
+ | [nN][oO]
+ | [nN][pP]
+ | [nN][rR]
+ | [nN][uU]
+ | [nN][zZ]
+ | [oO][mM]
+ | [oO][rR][gG]
+ | [pP][aA]
+ | [pP][eE]
+ | [pP][fF]
+ | [pP][gG]
+ | [pP][hH]
+ | [pP][kK]
+ | [pP][lL]
+ | [pP][mM]
+ | [pP][nN]
+ | [pP][rR]
+ | [pP][rR][oO]
+ | [pP][sS]
+ | [pP][tT]
+ | [pP][wW]
+ | [pP][yY]
+ | [qQ][aA]
+ | [rR][eE]
+ | [rR][oO]
+ | [rR][sS]
+ | [rR][uU]
+ | [rR][wW]
+ | [sS][aA]
+ | [sS][bB]
+ | [sS][cC]
+ | [sS][dD]
+ | [sS][eE]
+ | [sS][gG]
+ | [sS][hH]
+ | [sS][iI]
+ | [sS][jJ]
+ | [sS][kK]
+ | [sS][lL]
+ | [sS][mM]
+ | [sS][nN]
+ | [sS][oO]
+ | [sS][rR]
+ | [sS][tT]
+ | [sS][uU]
+ | [sS][vV]
+ | [sS][yY]
+ | [sS][zZ]
+ | [tT][cC]
+ | [tT][dD]
+ | [tT][eE][lL]
+ | [tT][fF]
+ | [tT][gG]
+ | [tT][hH]
+ | [tT][jJ]
+ | [tT][kK]
+ | [tT][lL]
+ | [tT][mM]
+ | [tT][nN]
+ | [tT][oO]
+ | [tT][pP]
+ | [tT][rR]
+ | [tT][rR][aA][vV][eE][lL]
+ | [tT][tT]
+ | [tT][vV]
+ | [tT][wW]
+ | [tT][zZ]
+ | [uU][aA]
+ | [uU][gG]
+ | [uU][kK]
+ | [uU][sS]
+ | [uU][yY]
+ | [uU][zZ]
+ | [vV][aA]
+ | [vV][cC]
+ | [vV][eE]
+ | [vV][gG]
+ | [vV][iI]
+ | [vV][nN]
+ | [vV][uU]
+ | [wW][fF]
+ | [wW][sS]
+ | [xX][nN]--0[zZ][wW][mM]56[dD]
+ | [xX][nN]--11[bB]5[bB][sS]3[aA]9[aA][jJ]6[gG]
+ | [xX][nN]--80[aA][kK][hH][bB][yY][kK][nN][jJ]4[fF]
+ | [xX][nN]--9[tT]4[bB]11[yY][iI]5[aA]
+ | [xX][nN]--[dD][eE][bB][aA]0[aA][dD]
+ | [xX][nN]--[fF][iI][qQ][sS]8[sS]
+ | [xX][nN]--[fF][iI][qQ][zZ]9[sS]
+ | [xX][nN]--[fF][zZ][cC]2[cC]9[eE]2[cC]
+ | [xX][nN]--[gG]6[wW]251[dD]
+ | [xX][nN]--[hH][gG][bB][kK]6[aA][jJ]7[fF]53[bB][bB][aA]
+ | [xX][nN]--[hH][lL][cC][jJ]6[aA][yY][aA]9[eE][sS][cC]7[aA]
+ | [xX][nN]--[jJ]6[wW]193[gG]
+ | [xX][nN]--[jJ][xX][aA][lL][pP][dD][lL][pP]
+ | [xX][nN]--[kK][gG][bB][eE][cC][hH][tT][vV]
+ | [xX][nN]--[kK][pP][rR][wW]13[dD]
+ | [xX][nN]--[kK][pP][rR][yY]57[dD]
+ | [xX][nN]--[mM][gG][bB][aA][aA][mM]7[aA]8[hH]
+ | [xX][nN]--[mM][gG][bB][aA][yY][hH]7[gG][pP][aA]
+ | [xX][nN]--[mM][gG][bB][eE][rR][pP]4[aA]5[dD]4[aA][rR]
+ | [xX][nN]--[oO]3[cC][wW]4[hH]
+ | [xX][nN]--[pP]1[aA][iI]
+ | [xX][nN]--[pP][gG][bB][sS]0[dD][hH]
+ | [xX][nN]--[wW][gG][bB][hH]1[cC]
+ | [xX][nN]--[xX][kK][cC]2[aA][lL]3[hH][yY][eE]2[aA]
+ | [xX][nN]--[yY][gG][bB][iI]2[aA][mM][mM][xX]
+ | [xX][nN]--[zZ][cC][kK][zZ][aA][hH]
+ | [yY][eE]
+ | [yY][tT]
+ | [zZ][aA]
+ | [zZ][mM]
+ | [zZ][wW]
+ ) "."? // Accept trailing root (empty) domain
+
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java?rev=1003885&r1=1003884&r2=1003885&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java Sat Oct 2 21:02:57 2010
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/28/10 8:52 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 10/2/10 4:56 PM */
package org.apache.lucene.analysis.standard;
@@ -33,8 +33,8 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 9/28/10 8:52 PM from the specification file
- * <tt>C:/cygwin/home/us/svn/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
+ * on 10/2/10 4:56 PM from the specification file
+ * <tt>C:/Users/rmuir/workspace/lucene_3xclean/lucene/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
*/
class ClassicTokenizerImpl implements StandardTokenizerInterface {
@@ -680,44 +680,44 @@ public final void getText(CharTermAttrib
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 5:
- { return NUM;
+ case 10:
+ { return EMAIL;
}
case 11: break;
- case 9:
- { return ACRONYM;
+ case 2:
+ { return ALPHANUM;
}
case 12: break;
- case 7:
- { return COMPANY;
+ case 4:
+ { return HOST;
}
case 13: break;
- case 10:
- { return EMAIL;
- }
- case 14: break;
case 1:
{ /* ignore */
}
+ case 14: break;
+ case 8:
+ { return ACRONYM_DEP;
+ }
case 15: break;
- case 6:
- { return APOSTROPHE;
+ case 5:
+ { return NUM;
}
case 16: break;
- case 3:
- { return CJ;
+ case 9:
+ { return ACRONYM;
}
case 17: break;
- case 8:
- { return ACRONYM_DEP;
+ case 7:
+ { return COMPANY;
}
case 18: break;
- case 2:
- { return ALPHANUM;
+ case 6:
+ { return APOSTROPHE;
}
case 19: break;
- case 4:
- { return HOST;
+ case 3:
+ { return CJ;
}
case 20: break;
default:
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963
720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,99922
3,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963
720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,99922
3,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:1002032,1002221
/lucene/dev/trunk/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:932749
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardFilter.java:924791,924850,930201
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,96
3654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,9990
16,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:1002032,1003877
+/lucene/dev/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:932749
+/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:748824
+/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:818601-821336
+/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:880793,896906
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java?rev=1003885&r1=1003884&r2=1003885&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.java Sat Oct 2 21:02:57 2010
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 9/28/10 8:52 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 10/2/10 4:56 PM */
package org.apache.lucene.analysis.standard;
@@ -802,28 +802,28 @@ public final class UAX29Tokenizer extend
zzMarkedPos = zzMarkedPosL;
switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
- case 5:
- { if (populateAttributes(IDEOGRAPHIC_TYPE)) return true;
+ case 2:
+ { if (populateAttributes(WORD_TYPE)) return true;
}
case 7: break;
- case 1:
- { /* Not numeric, word, ideographic, hiragana, or SE Asian -- ignore it. */
+ case 6:
+ { if (populateAttributes(HIRAGANA_TYPE)) return true;
}
case 8: break;
- case 3:
- { if (populateAttributes(NUMERIC_TYPE)) return true;
+ case 5:
+ { if (populateAttributes(IDEOGRAPHIC_TYPE)) return true;
}
case 9: break;
- case 6:
- { if (populateAttributes(HIRAGANA_TYPE)) return true;
- }
- case 10: break;
case 4:
{ if (populateAttributes(SOUTH_EAST_ASIAN_TYPE)) return true;
}
+ case 10: break;
+ case 3:
+ { if (populateAttributes(NUMERIC_TYPE)) return true;
+ }
case 11: break;
- case 2:
- { if (populateAttributes(WORD_TYPE)) return true;
+ case 1:
+ { /* Not numeric, word, ideographic, hiragana, or SE Asian -- ignore it. */
}
case 12: break;
default:
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,96
3720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,9992
23,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:1002032,1003877
+/lucene/dev/trunk/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:932749
+/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:748824
+/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:818601-821336
+/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:880793,896906
+/lucene/java/trunk/src/java/org/apache/lucene/analysis/standard/UAX29Tokenizer.jflex:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java?rev=1003885&r1=1003884&r2=1003885&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/queryParser/QueryParser.java Sat Oct 2 21:02:57 2010
@@ -1587,16 +1587,6 @@ public class QueryParser implements Quer
finally { jj_save(0, xla); }
}
- private boolean jj_3_1() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_2()) {
- jj_scanpos = xsp;
- if (jj_3R_3()) return true;
- }
- return false;
- }
-
private boolean jj_3R_3() {
if (jj_scan_token(STAR)) return true;
if (jj_scan_token(COLON)) return true;
@@ -1609,6 +1599,16 @@ public class QueryParser implements Quer
return false;
}
+ private boolean jj_3_1() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_2()) {
+ jj_scanpos = xsp;
+ if (jj_3R_3()) return true;
+ }
+ return false;
+ }
+
/** Generated Token Manager. */
public QueryParserTokenManager token_source;
/** Current token. */
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:967125-979432
-/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999
016,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873
+/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999
016,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/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,948516
/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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,9639
09,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000424,10005
81,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,9639
09,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000424,10005
81,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core:1002032
/lucene/dev/trunk/src/test/org/apache/lucene/analysis:932749
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis:924791,924850,930201
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963
720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,99922
3,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPage.html:1002032,1003877
+/lucene/dev/trunk/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:932749
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:748824
+/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:818601-821336
+/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:880793,896906
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPage.html:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,
963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,99
9223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPageURLs.txt:1002032,1003877
+/lucene/dev/trunk/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:932749
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:748824
+/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:818601-821336
+/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:880793,896906
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/LuceneResourcesWikiPageURLs.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999
016,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873
+/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999
016,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/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,948516
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestUAX29Tokenizer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/WordBreakTestUnicode_5_2_0.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,96
0719,962555,963372,963654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,9980
55,998505,998684,999016,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/email.addresses.from.random.text.with.email.addresses.txt:1002032,1003877
+/lucene/dev/trunk/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:932749
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:748824
+/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:818601-821336
+/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:880793,896906
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/email.addresses.from.random.text.with.email.addresses.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,96
3654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,9990
16,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.email.addresses.txt:1002032,1003877
+/lucene/dev/trunk/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:932749
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:748824
+/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:818601-821336
+/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:880793,896906
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/random.text.with.email.addresses.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/random.text.with.urls.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/random.text.with.urls.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,9
99545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.urls.txt:1002032,1003877
+/lucene/dev/trunk/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:932749
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:748824
+/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:818601-821336
+/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:880793,896906
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/random.text.with.urls.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -0,0 +1,9 @@
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963
654,963720,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,99901
6,999223,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
+/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/urls.from.random.text.with.urls.txt:1002032,1003877
+/lucene/dev/trunk/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:932749
+/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:924791,924850,930201
+/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:748824
+/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:817269-818600,825998,829134,829881,831036,896850,909334,948516
+/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:818601-821336
+/lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:880793,896906
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/urls.from.random.text.with.urls.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/collation/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/collation:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963
909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000424,1000
581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/collation:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781,963873,963906,963
909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000424,1000
581,1000675,1001006,1001420,1001661,1001796,1002032,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/collation:997180
/lucene/dev/trunk/src/test/org/apache/lucene/collation:932749
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/collation:924791,924850,930201
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 2 21:02:57 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/document/TestDateTools.java:967125-979432
-/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,9
99545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873
+/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,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,9
99545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877
/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,948516