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 2012/07/07 17:42:44 UTC
svn commit: r1358594 [1/2] - in /lucene/dev/branches/lucene4199:
lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/test/org/apache/l...
Author: rmuir
Date: Sat Jul 7 15:42:40 2012
New Revision: 1358594
URL: http://svn.apache.org/viewvc?rev=1358594&view=rev
Log:
make Locale.ENGLISH/US -> ROOT for locale-independent operations, now that we are on java6
Modified:
lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
lucene/dev/branches/lucene4199/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java
lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java
lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/document/DateTools.java
lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java
lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java
lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/lucene4199/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java
lucene/dev/branches/lucene4199/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
lucene/dev/branches/lucene4199/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java
lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java
lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java
lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java
lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java
lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIcuHack.java
lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
lucene/dev/branches/lucene4199/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
lucene/dev/branches/lucene4199/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/DateField.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/UUIDField.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/cache/Method.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/UpdateLog.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java
lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/util/DateMathParser.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/TestTrie.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestFaceting.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/search/TestRecovery.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java
lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellDictionary.java Sat Jul 7 15:42:40 2012
@@ -376,7 +376,7 @@ public class HunspellDictionary {
Arrays.sort(wordForm.getFlags());
entry = line.substring(0, flagSep);
if(ignoreCase) {
- entry = entry.toLowerCase(Locale.ENGLISH);
+ entry = entry.toLowerCase(Locale.ROOT);
}
}
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java Sat Jul 7 15:42:40 2012
@@ -79,7 +79,7 @@ public class TestKeywordMarkerFilter ext
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
if (!keywordAttr.isKeyword()) {
- final String term = termAtt.toString().toLowerCase(Locale.ENGLISH);
+ final String term = termAtt.toString().toLowerCase(Locale.ROOT);
termAtt.setEmpty().append(term);
}
return true;
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/DateRecognizerSinkTokenizerTest.java Sat Jul 7 15:42:40 2012
@@ -27,7 +27,7 @@ import org.apache.lucene.analysis.MockTo
public class DateRecognizerSinkTokenizerTest extends BaseTokenStreamTestCase {
public void test() throws IOException {
- DateRecognizerSinkFilter sinkFilter = new DateRecognizerSinkFilter(new SimpleDateFormat("MM/dd/yyyy", Locale.US));
+ DateRecognizerSinkFilter sinkFilter = new DateRecognizerSinkFilter(new SimpleDateFormat("MM/dd/yyyy", Locale.ROOT));
String test = "The quick red fox jumped over the lazy brown dogs on 7/11/2006 The dogs finally reacted on 7/12/2006";
TeeSinkTokenFilter tee = new TeeSinkTokenFilter(new MockTokenizer(new StringReader(test), MockTokenizer.WHITESPACE, false));
TeeSinkTokenFilter.SinkTokenStream sink = tee.newSinkTokenStream(sinkFilter);
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java Sat Jul 7 15:42:40 2012
@@ -36,7 +36,7 @@ public class TestCharArrayMap extends Lu
key[j] = (char)random().nextInt(127);
}
String keyStr = new String(key);
- String hmapKey = ignoreCase ? keyStr.toLowerCase(Locale.ENGLISH) : keyStr;
+ String hmapKey = ignoreCase ? keyStr.toLowerCase(Locale.ROOT) : keyStr;
int val = random().nextInt();
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java Sat Jul 7 15:42:40 2012
@@ -123,11 +123,11 @@ public class GenerateJflexTLDMacros {
while (null != (line = reader.readLine())) {
Matcher matcher = TLD_PATTERN_1.matcher(line);
if (matcher.matches()) {
- TLDs.add(matcher.group(1).toLowerCase(Locale.US));
+ TLDs.add(matcher.group(1).toLowerCase(Locale.ROOT));
} else {
matcher = TLD_PATTERN_2.matcher(line);
if (matcher.matches()) {
- TLDs.add(matcher.group(1).toLowerCase(Locale.US));
+ TLDs.add(matcher.group(1).toLowerCase(Locale.ROOT));
}
}
}
@@ -146,7 +146,7 @@ public class GenerateJflexTLDMacros {
*/
private void writeOutput(SortedSet<String> ASCIITLDs) throws IOException {
final DateFormat dateFormat = DateFormat.getDateTimeInstance
- (DateFormat.FULL, DateFormat.FULL, Locale.US);
+ (DateFormat.FULL, DateFormat.FULL, Locale.ROOT);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
final Writer writer = new OutputStreamWriter
(new FileOutputStream(outputFile), "UTF-8");
Modified: lucene/dev/branches/lucene4199/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java Sat Jul 7 15:42:40 2012
@@ -64,7 +64,7 @@ public class TestICUCollationKeyAnalyzer
//
public void testCollationKeySort() throws Exception {
Analyzer usAnalyzer = new ICUCollationKeyAnalyzer
- (TEST_VERSION_CURRENT, Collator.getInstance(Locale.US));
+ (TEST_VERSION_CURRENT, Collator.getInstance(Locale.ROOT));
Analyzer franceAnalyzer = new ICUCollationKeyAnalyzer
(TEST_VERSION_CURRENT, Collator.getInstance(Locale.FRANCE));
Analyzer swedenAnalyzer = new ICUCollationKeyAnalyzer
@@ -73,7 +73,7 @@ public class TestICUCollationKeyAnalyzer
(TEST_VERSION_CURRENT, Collator.getInstance(new Locale("da", "dk")));
// The ICU Collator and java.text.Collator implementations differ in their
- // orderings - "BFJHD" is the ordering for the ICU Collator for Locale.US.
+ // orderings - "BFJHD" is the ordering for the ICU Collator for Locale.ROOT.
testCollationKeySort
(usAnalyzer, franceAnalyzer, swedenAnalyzer, denmarkAnalyzer,
"BFJHD", "ECAGI", "BJDFH", "BJDHF");
Modified: lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java Sat Jul 7 15:42:40 2012
@@ -29,7 +29,7 @@ public class GenerateHTMLStripCharFilter
private static final UnicodeSet BMP = new UnicodeSet("[\u0000-\uFFFF]");
private static final String NL = System.getProperty("line.separator");
private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance
- (DateFormat.FULL, DateFormat.FULL, Locale.US);
+ (DateFormat.FULL, DateFormat.FULL, Locale.ROOT);
static {
DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
}
Modified: lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java Sat Jul 7 15:42:40 2012
@@ -32,7 +32,7 @@ public class GenerateJFlexSupplementaryM
private static final UnicodeSet BMP = new UnicodeSet("[\u0000-\uFFFF]");
private static final String NL = System.getProperty("line.separator");
private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance
- (DateFormat.FULL, DateFormat.FULL, Locale.US);
+ (DateFormat.FULL, DateFormat.FULL, Locale.ROOT);
static {
DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
}
Modified: lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java Sat Jul 7 15:42:40 2012
@@ -65,7 +65,7 @@ public class StempelStemmer {
DataInputStream in = null;
try {
in = new DataInputStream(new BufferedInputStream(stemmerTable));
- String method = in.readUTF().toUpperCase(Locale.ENGLISH);
+ String method = in.readUTF().toUpperCase(Locale.ROOT);
if (method.indexOf('M') < 0) {
return new org.egothor.stemmer.Trie(in);
} else {
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java Sat Jul 7 15:42:40 2012
@@ -163,7 +163,7 @@ public class DirContentSource extends Co
dfi = new DateFormatInfo();
dfi.pos = new ParsePosition(0);
// date format: 30-MAR-1987 14:22:36.87
- dfi.df = new SimpleDateFormat("dd-MMM-yyyy kk:mm:ss.SSS", Locale.US);
+ dfi.df = new SimpleDateFormat("dd-MMM-yyyy kk:mm:ss.SSS", Locale.ROOT);
dfi.df.setLenient(true);
dateFormat.set(dfi);
}
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Sat Jul 7 15:42:40 2012
@@ -182,7 +182,7 @@ public class DocMaker implements Closeab
private boolean storeBytes = false;
private static class DateUtil {
- public SimpleDateFormat parser = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.US);
+ public SimpleDateFormat parser = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.ROOT);
public Calendar cal = Calendar.getInstance();
public ParsePosition pos = new ParsePosition(0);
public DateUtil() {
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java Sat Jul 7 15:42:40 2012
@@ -35,7 +35,7 @@ public class LongToEnglishContentSource
}
// TODO: we could take param to specify locale...
- private final RuleBasedNumberFormat rnbf = new RuleBasedNumberFormat(Locale.ENGLISH,
+ private final RuleBasedNumberFormat rnbf = new RuleBasedNumberFormat(Locale.ROOT,
RuleBasedNumberFormat.SPELLOUT);
@Override
public synchronized DocData getNextDocData(DocData docData) throws NoMoreDataException, IOException {
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java Sat Jul 7 15:42:40 2012
@@ -37,7 +37,7 @@ public class LongToEnglishQueryMaker imp
protected QueryParser parser;
// TODO: we could take param to specify locale...
- private final RuleBasedNumberFormat rnbf = new RuleBasedNumberFormat(Locale.ENGLISH,
+ private final RuleBasedNumberFormat rnbf = new RuleBasedNumberFormat(Locale.ROOT,
RuleBasedNumberFormat.SPELLOUT);
public Query makeQuery(int size) throws Exception {
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java Sat Jul 7 15:42:40 2012
@@ -76,7 +76,7 @@ public class ReutersContentSource extend
if (dfi == null) {
dfi = new DateFormatInfo();
// date format: 30-MAR-1987 14:22:36.87
- dfi.df = new SimpleDateFormat("dd-MMM-yyyy kk:mm:ss.SSS",Locale.US);
+ dfi.df = new SimpleDateFormat("dd-MMM-yyyy kk:mm:ss.SSS",Locale.ROOT);
dfi.df.setLenient(true);
dfi.pos = new ParsePosition(0);
dateFormat.set(dfi);
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java Sat Jul 7 15:42:40 2012
@@ -108,7 +108,7 @@ public class TrecContentSource extends C
dfi = new DateFormatInfo();
dfi.dfs = new SimpleDateFormat[DATE_FORMATS.length];
for (int i = 0; i < dfi.dfs.length; i++) {
- dfi.dfs[i] = new SimpleDateFormat(DATE_FORMATS[i], Locale.US);
+ dfi.dfs[i] = new SimpleDateFormat(DATE_FORMATS[i], Locale.ROOT);
dfi.dfs[i].setLenient(true);
}
dfi.pos = new ParsePosition(0);
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java Sat Jul 7 15:42:40 2012
@@ -47,7 +47,7 @@ public abstract class TrecDocParser {
static final Map<String,ParsePathType> pathName2Type = new HashMap<String,ParsePathType>();
static {
for (ParsePathType ppt : ParsePathType.values()) {
- pathName2Type.put(ppt.name().toUpperCase(Locale.ENGLISH),ppt);
+ pathName2Type.put(ppt.name().toUpperCase(Locale.ROOT),ppt);
}
}
@@ -60,7 +60,7 @@ public abstract class TrecDocParser {
public static ParsePathType pathType(File f) {
int pathLength = 0;
while (f != null && ++pathLength < MAX_PATH_LENGTH) {
- ParsePathType ppt = pathName2Type.get(f.getName().toUpperCase(Locale.ENGLISH));
+ ParsePathType ppt = pathName2Type.get(f.getName().toUpperCase(Locale.ROOT));
if (ppt!=null) {
return ppt;
}
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java Sat Jul 7 15:42:40 2012
@@ -227,7 +227,7 @@ InterruptedException {
Token t1, t2;
boolean inImg = false;
t1 = jj_consume_token(TagName);
- String tagName = t1.image.toLowerCase(Locale.ENGLISH);
+ String tagName = t1.image.toLowerCase(Locale.ROOT);
if(Tags.WS_ELEMS.contains(tagName) ) {
addSpace();
}
@@ -264,7 +264,7 @@ InterruptedException {
)
&& t2 != null)
{
- currentMetaTag=t2.image.toLowerCase(Locale.ENGLISH);
+ currentMetaTag=t2.image.toLowerCase(Locale.ROOT);
if(currentMetaTag != null && currentMetaContent != null) {
addMetaTag();
}
@@ -272,7 +272,7 @@ InterruptedException {
if(inMetaTag && t1.image.equalsIgnoreCase("content") && t2 !=
null)
{
- currentMetaContent=t2.image.toLowerCase(Locale.ENGLISH);
+ currentMetaContent=t2.image.toLowerCase(Locale.ROOT);
if(currentMetaTag != null && currentMetaContent != null) {
addMetaTag();
}
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj Sat Jul 7 15:42:40 2012
@@ -227,7 +227,7 @@ void Tag() throws IOException :
}
{
t1=<TagName> {
- String tagName = t1.image.toLowerCase(Locale.ENGLISH);
+ String tagName = t1.image.toLowerCase(Locale.ROOT);
if(Tags.WS_ELEMS.contains(tagName) ) {
addSpace();
}
@@ -249,7 +249,7 @@ void Tag() throws IOException :
)
&& t2 != null)
{
- currentMetaTag=t2.image.toLowerCase(Locale.ENGLISH);
+ currentMetaTag=t2.image.toLowerCase(Locale.ROOT);
if(currentMetaTag != null && currentMetaContent != null) {
addMetaTag();
}
@@ -257,7 +257,7 @@ void Tag() throws IOException :
if(inMetaTag && t1.image.equalsIgnoreCase("content") && t2 !=
null)
{
- currentMetaContent=t2.image.toLowerCase(Locale.ENGLISH);
+ currentMetaContent=t2.image.toLowerCase(Locale.ROOT);
if(currentMetaTag != null && currentMetaContent != null) {
addMetaTag();
}
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java Sat Jul 7 15:42:40 2012
@@ -77,7 +77,7 @@ public class SearchWithSortTask extends
} else {
throw new RuntimeException("You must specify the sort type ie page:int,subject:string");
}
- sortField0 = new SortField(fieldName, SortField.Type.valueOf(typeString.toUpperCase(Locale.ENGLISH)));
+ sortField0 = new SortField(fieldName, SortField.Type.valueOf(typeString.toUpperCase(Locale.ROOT)));
}
sortFields[upto++] = sortField0;
}
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java Sat Jul 7 15:42:40 2012
@@ -99,7 +99,7 @@ public class StreamUtils {
String fileName = file.getName();
int idx = fileName.lastIndexOf('.');
if (idx != -1) {
- type = extensionToType.get(fileName.substring(idx).toLowerCase(Locale.ENGLISH));
+ type = extensionToType.get(fileName.substring(idx).toLowerCase(Locale.ROOT));
}
return type==null ? Type.PLAIN : type;
}
Modified: lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/document/DateTools.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/document/DateTools.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/document/DateTools.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/document/DateTools.java Sat Jul 7 15:42:40 2012
@@ -53,7 +53,7 @@ public class DateTools {
private static final ThreadLocal<Calendar> TL_CAL = new ThreadLocal<Calendar>() {
@Override
protected Calendar initialValue() {
- return Calendar.getInstance(GMT, Locale.US);
+ return Calendar.getInstance(GMT, Locale.ROOT);
}
};
@@ -194,7 +194,7 @@ public class DateTools {
this.formatLen = formatLen;
// formatLen 10's place: 11111111
// formatLen 1's place: 12345678901234567
- this.format = new SimpleDateFormat("yyyyMMddHHmmssSSS".substring(0,formatLen),Locale.US);
+ this.format = new SimpleDateFormat("yyyyMMddHHmmssSSS".substring(0,formatLen),Locale.ROOT);
this.format.setTimeZone(GMT);
}
@@ -202,7 +202,7 @@ public class DateTools {
* in lowercase (for backwards compatibility) */
@Override
public String toString() {
- return super.toString().toLowerCase(Locale.ENGLISH);
+ return super.toString().toLowerCase(Locale.ROOT);
}
}
Modified: lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java Sat Jul 7 15:42:40 2012
@@ -559,7 +559,7 @@ public final class RamUsageEstimator {
*/
public static String humanReadableUnits(long bytes) {
return humanReadableUnits(bytes,
- new DecimalFormat("0.#", DecimalFormatSymbols.getInstance(Locale.ENGLISH)));
+ new DecimalFormat("0.#", DecimalFormatSymbols.getInstance(Locale.ROOT)));
}
/**
Modified: lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/util/Version.java Sat Jul 7 15:42:40 2012
@@ -73,7 +73,7 @@ public enum Version {
}
public static Version parseLeniently(String version) {
- String parsedMatchVersion = version.toUpperCase(Locale.ENGLISH);
+ String parsedMatchVersion = version.toUpperCase(Locale.ROOT);
return Version.valueOf(parsedMatchVersion.replaceFirst("^(\\d)\\.(\\d)$", "LUCENE_$1$2"));
}
}
\ No newline at end of file
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java Sat Jul 7 15:42:40 2012
@@ -159,7 +159,7 @@ public class TestCharTermAttributeImpl e
public void testAppendableInterface() {
CharTermAttributeImpl t = new CharTermAttributeImpl();
- Formatter formatter = new Formatter(t, Locale.US);
+ Formatter formatter = new Formatter(t, Locale.ROOT);
formatter.format("%d", 1234);
assertEquals("1234", t.toString());
formatter.format("%d", 5678);
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java Sat Jul 7 15:42:40 2012
@@ -71,7 +71,7 @@ public class Test10KPulsings extends Luc
Field field = newField("field", "", ft);
document.add(field);
- NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ENGLISH));
+ NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ROOT));
for (int i = 0; i < 10050; i++) {
field.setStringValue(df.format(i));
@@ -122,7 +122,7 @@ public class Test10KPulsings extends Luc
Field field = newField("field", "", ft);
document.add(field);
- NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ENGLISH));
+ NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ROOT));
final int freq = freqCutoff + 1;
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java Sat Jul 7 15:42:40 2012
@@ -180,7 +180,7 @@ public class TestDateTools extends Lucen
}
private String isoFormat(Date date) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.US);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.ROOT);
sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
return sdf.format(date);
}
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Sat Jul 7 15:42:40 2012
@@ -44,7 +44,7 @@ public class TestMultiValuedNumericRange
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
- DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.US));
+ DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.ROOT));
int num = atLeast(500);
for (int l = 0; l < num; l++) {
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java Sat Jul 7 15:42:40 2012
@@ -58,7 +58,7 @@ public class TestRegexpRandom extends Lu
Field field = newField("field", "", customType);
doc.add(field);
- NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ENGLISH));
+ NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ROOT));
for (int i = 0; i < 1000; i++) {
field.setStringValue(df.format(i));
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java Sat Jul 7 15:42:40 2012
@@ -54,7 +54,7 @@ public class TestWildcardRandom extends
Field field = newStringField("field", "", Field.Store.NO);
doc.add(field);
- NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ENGLISH));
+ NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ROOT));
for (int i = 0; i < 1000; i++) {
field.setStringValue(df.format(i));
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java Sat Jul 7 15:42:40 2012
@@ -59,7 +59,7 @@ public class StressRamUsageEstimator ext
// Check the current memory consumption and provide the estimate.
long jvmUsed = memoryMXBean.getHeapMemoryUsage().getUsed();
long estimated = RamUsageEstimator.sizeOf(first);
- System.out.println(String.format(Locale.ENGLISH, "%10d, %10d",
+ System.out.println(String.format(Locale.ROOT, "%10d, %10d",
jvmUsed, estimated));
// Make a batch of objects.
@@ -125,7 +125,7 @@ public class StressRamUsageEstimator ext
break;
}
- System.out.println(String.format(Locale.ENGLISH, "%10s\t%10s\t%10s",
+ System.out.println(String.format(Locale.ROOT, "%10s\t%10s\t%10s",
RamUsageEstimator.humanReadableUnits(mu.getUsed()),
RamUsageEstimator.humanReadableUnits(mu.getMax()),
RamUsageEstimator.humanReadableUnits(estimated)));
Modified: lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Sat Jul 7 15:42:40 2012
@@ -1298,7 +1298,7 @@ public class TestFSTs extends LuceneTest
ord++;
if (ord % 500000 == 0) {
System.out.println(
- String.format(Locale.ENGLISH,
+ String.format(Locale.ROOT,
"%6.2fs: %9d...", ((System.currentTimeMillis() - tStart) / 1000.0), ord));
}
if (ord >= limit) {
Modified: lucene/dev/branches/lucene4199/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java Sat Jul 7 15:42:40 2012
@@ -30,7 +30,7 @@ public class BreakIteratorBoundaryScanne
public void testOutOfRange() throws Exception {
StringBuilder text = new StringBuilder(TEXT);
- BreakIterator bi = BreakIterator.getWordInstance(Locale.ENGLISH);
+ BreakIterator bi = BreakIterator.getWordInstance(Locale.ROOT);
BoundaryScanner scanner = new BreakIteratorBoundaryScanner(bi);
int start = TEXT.length() + 1;
@@ -44,7 +44,7 @@ public class BreakIteratorBoundaryScanne
public void testWordBoundary() throws Exception {
StringBuilder text = new StringBuilder(TEXT);
- BreakIterator bi = BreakIterator.getWordInstance(Locale.ENGLISH);
+ BreakIterator bi = BreakIterator.getWordInstance(Locale.ROOT);
BoundaryScanner scanner = new BreakIteratorBoundaryScanner(bi);
int start = TEXT.indexOf("formance");
Modified: lucene/dev/branches/lucene4199/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java Sat Jul 7 15:42:40 2012
@@ -183,7 +183,7 @@ public class ChainedFilterTest extends L
/*
private Date parseDate(String s) throws ParseException {
- return new SimpleDateFormat("yyyy MMM dd", Locale.US).parse(s);
+ return new SimpleDateFormat("yyyy MMM dd", Locale.ROOT).parse(s);
}
*/
Modified: lucene/dev/branches/lucene4199/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java (original)
+++ lucene/dev/branches/lucene4199/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java Sat Jul 7 15:42:40 2012
@@ -91,7 +91,7 @@ public class NumericQueryNode extends Qu
*/
protected CharSequence getTermEscaped(EscapeQuerySyntax escaper) {
return escaper.escape(NumberFormat.getNumberInstance().format(this.value),
- Locale.ENGLISH, Type.NORMAL);
+ Locale.ROOT, Type.NORMAL);
}
public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
Modified: lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java (original)
+++ lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java Sat Jul 7 15:42:40 2012
@@ -122,7 +122,7 @@ public class BBoxStrategy extends Spatia
ff.setIndexOptions(IndexOptions.DOCS_ONLY);
ff.freeze();
- NumberFormat nf = NumberFormat.getInstance( Locale.US );
+ NumberFormat nf = NumberFormat.getInstance( Locale.ROOT );
nf.setMaximumFractionDigits( 5 );
nf.setMinimumFractionDigits( 5 );
nf.setGroupingUsed(false);
Modified: lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java (original)
+++ lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java Sat Jul 7 15:42:40 2012
@@ -61,14 +61,14 @@ public class SpatialOperation implements
this.sourceNeedsArea = sourceNeedsArea;
this.targetNeedsArea = targetNeedsArea;
registry.put(name, this);
- registry.put(name.toUpperCase(Locale.US), this);
+ registry.put(name.toUpperCase(Locale.ROOT), this);
list.add( this );
}
public static SpatialOperation get( String v ) {
SpatialOperation op = registry.get( v );
if( op == null ) {
- op = registry.get(v.toUpperCase(Locale.US));
+ op = registry.get(v.toUpperCase(Locale.ROOT));
}
if( op == null ) {
throw new InvalidSpatialArgument("Unknown Operation: " + v );
Modified: lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java (original)
+++ lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java Sat Jul 7 15:42:40 2012
@@ -320,7 +320,7 @@ public class DirectSpellChecker {
return new SuggestWord[0];
if (lowerCaseTerms) {
- term = new Term(term.field(), text.toLowerCase(Locale.ENGLISH));
+ term = new Term(term.field(), text.toLowerCase(Locale.ROOT));
}
int docfreq = ir.docFreq(term);
Modified: lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java (original)
+++ lucene/dev/branches/lucene4199/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/Sort.java Sat Jul 7 15:42:40 2012
@@ -132,7 +132,7 @@ public final class Sort {
@Override
public String toString() {
- return String.format(Locale.ENGLISH,
+ return String.format(Locale.ROOT,
"time=%.2f sec. total (%.2f reading, %.2f sorting, %.2f merging), lines=%d, temp files=%d, merges=%d, soft ram limit=%.2f MB",
totalTime / 1000.0d, readTime / 1000.0d, sortTime / 1000.0d, mergeTime / 1000.0d,
lines, tempMergeFiles, mergeRounds,
Modified: lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java (original)
+++ lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java Sat Jul 7 15:42:40 2012
@@ -47,7 +47,7 @@ final class Average
public String toString()
{
- return String.format(Locale.ENGLISH, "%.0f [+- %.2f]",
+ return String.format(Locale.ROOT, "%.0f [+- %.2f]",
avg, stddev);
}
Modified: lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java Sat Jul 7 15:42:40 2012
@@ -119,7 +119,7 @@ public class LookupBenchmarkTest extends
});
System.err.println(
- String.format(Locale.ENGLISH, "%-15s input: %d, time[ms]: %s",
+ String.format(Locale.ROOT, "%-15s input: %d, time[ms]: %s",
cls.getSimpleName(),
dictionaryInput.length,
result.average.toString()));
@@ -134,7 +134,7 @@ public class LookupBenchmarkTest extends
for (Class<? extends Lookup> cls : benchmarkClasses) {
Lookup lookup = buildLookup(cls, dictionaryInput);
System.err.println(
- String.format(Locale.ENGLISH, "%-15s size[B]:%,13d",
+ String.format(Locale.ROOT, "%-15s size[B]:%,13d",
lookup.getClass().getSimpleName(),
RamUsageEstimator.sizeOf(lookup)));
}
@@ -181,7 +181,7 @@ public class LookupBenchmarkTest extends
*/
public void runPerformanceTest(final int minPrefixLen, final int maxPrefixLen,
final int num, final boolean onlyMorePopular) throws Exception {
- System.err.println(String.format(Locale.ENGLISH,
+ System.err.println(String.format(Locale.ROOT,
"-- prefixes: %d-%d, num: %d, onlyMorePopular: %s",
minPrefixLen, maxPrefixLen, num, onlyMorePopular));
@@ -206,7 +206,7 @@ public class LookupBenchmarkTest extends
});
System.err.println(
- String.format(Locale.ENGLISH, "%-15s queries: %d, time[ms]: %s, ~kQPS: %.0f",
+ String.format(Locale.ROOT, "%-15s queries: %d, time[ms]: %s, ~kQPS: %.0f",
lookup.getClass().getSimpleName(),
input.size(),
result.average.toString(),
Modified: lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java (original)
+++ lucene/dev/branches/lucene4199/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java Sat Jul 7 15:42:40 2012
@@ -233,9 +233,9 @@ public class FSTCompletionTest extends L
StringBuilder b = new StringBuilder();
String format = "%" + colLen + "s " + "%" + colLen + "s\n";
- b.append(String.format(Locale.ENGLISH, format, "Expected", "Result"));
+ b.append(String.format(Locale.ROOT, format, "Expected", "Result"));
for (int i = 0; i < Math.max(result.length, expected.length); i++) {
- b.append(String.format(Locale.ENGLISH, format,
+ b.append(String.format(Locale.ROOT, format,
i < expected.length ? expected[i] : "--",
i < result.length ? result[i] : "--"));
}
Modified: lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java (original)
+++ lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java Sat Jul 7 15:42:40 2012
@@ -71,7 +71,7 @@ public class RandomCodec extends Lucene4
codec = formats.get(Math.abs(perFieldSeed ^ name.hashCode()) % formats.size());
if (codec instanceof SimpleTextPostingsFormat && perFieldSeed % 5 != 0) {
// make simpletext rarer, choose again
- codec = formats.get(Math.abs(perFieldSeed ^ name.toUpperCase(Locale.ENGLISH).hashCode()) % formats.size());
+ codec = formats.get(Math.abs(perFieldSeed ^ name.toUpperCase(Locale.ROOT).hashCode()) % formats.size());
}
previousMappings.put(name, codec);
// Safety:
Modified: lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java Sat Jul 7 15:42:40 2012
@@ -357,7 +357,7 @@ public class CheckHits {
// - end with one of: "product of:", "sum of:", "max of:", or
// - have "max plus <x> times others" (where <x> is float).
float x = 0;
- String descr = expl.getDescription().toLowerCase(Locale.ENGLISH);
+ String descr = expl.getDescription().toLowerCase(Locale.ROOT);
boolean productOf = descr.endsWith("product of:");
boolean sumOf = descr.endsWith("sum of:");
boolean maxOf = descr.endsWith("max of:");
Modified: lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIcuHack.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIcuHack.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIcuHack.java (original)
+++ lucene/dev/branches/lucene4199/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIcuHack.java Sat Jul 7 15:42:40 2012
@@ -39,7 +39,7 @@ final class TestRuleIcuHack implements T
if (!icuTested.getAndSet(true)) {
Locale previous = Locale.getDefault();
try {
- Locale.setDefault(Locale.US);
+ Locale.setDefault(Locale.ROOT);
Class.forName("com.ibm.icu.util.ULocale");
} catch (ClassNotFoundException cnfe) {
// ignore if no ICU is in classpath
Modified: lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java (original)
+++ lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/ForbiddenApisCheckTask.java Sat Jul 7 15:42:40 2012
@@ -168,7 +168,7 @@ public class ForbiddenApisCheckTask exte
violations[0]++;
final StringBuilder sb = new StringBuilder(" in ").append(className);
if (source != null && lineNo >= 0) {
- new Formatter(sb, Locale.ENGLISH).format(" (%s:%d)", source, lineNo).flush();
+ new Formatter(sb, Locale.ROOT).format(" (%s:%d)", source, lineNo).flush();
}
log(sb.toString(), Project.MSG_ERR);
}
@@ -251,7 +251,7 @@ public class ForbiddenApisCheckTask exte
checked++;
}
- log(String.format(Locale.ENGLISH,
+ log(String.format(Locale.ROOT,
"Scanned %d class file(s) for forbidden method invocations (in %.2fs), %d error(s).",
checked, (System.currentTimeMillis() - start) / 1000.0, errors),
errors > 0 ? Project.MSG_ERR : Project.MSG_INFO);
Modified: lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java (original)
+++ lucene/dev/branches/lucene4199/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java Sat Jul 7 15:42:40 2012
@@ -140,7 +140,7 @@ public class LicenseCheckTask extends Ta
checked++;
}
- log(String.format(Locale.ENGLISH,
+ log(String.format(Locale.ROOT,
"Scanned %d JAR file(s) for licenses (in %.2fs.), %d error(s).",
checked, (System.currentTimeMillis() - start) / 1000.0, errors),
errors > 0 ? Project.MSG_ERR : Project.MSG_INFO);
@@ -255,7 +255,7 @@ outer:
private static final String createChecksumString(byte[] digest) {
StringBuilder checksum = new StringBuilder();
for (int i = 0; i < digest.length; i++) {
- checksum.append(String.format(Locale.ENGLISH, "%02x",
+ checksum.append(String.format(Locale.ROOT, "%02x",
CHECKSUM_BYTE_MASK & digest[i]));
}
return checksum.toString();
Modified: lucene/dev/branches/lucene4199/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java (original)
+++ lucene/dev/branches/lucene4199/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java Sat Jul 7 15:42:40 2012
@@ -69,7 +69,7 @@ public class MorfologikFilterFactory ext
String dictionaryName = args.get(DICTIONARY_SCHEMA_ATTRIBUTE);
if (dictionaryName != null && !dictionaryName.isEmpty()) {
try {
- DICTIONARY dictionary = DICTIONARY.valueOf(dictionaryName.toUpperCase(Locale.ENGLISH));
+ DICTIONARY dictionary = DICTIONARY.valueOf(dictionaryName.toUpperCase(Locale.ROOT));
assert dictionary != null;
this.dictionary = dictionary;
} catch (IllegalArgumentException e) {
Modified: lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java (original)
+++ lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java Sat Jul 7 15:42:40 2012
@@ -171,7 +171,7 @@ public class MailEntityProcessor extends
InputStream is = part.getInputStream();
String fileName = part.getFileName();
Metadata md = new Metadata();
- md.set(HttpHeaders.CONTENT_TYPE, ctype.getBaseType().toLowerCase(Locale.ENGLISH));
+ md.set(HttpHeaders.CONTENT_TYPE, ctype.getBaseType().toLowerCase(Locale.ROOT));
md.set(TikaMetadataKeys.RESOURCE_NAME_KEY, fileName);
String content = tika.parseToString(is, md);
if (disp != null && disp.equalsIgnoreCase(Part.ATTACHMENT)) {
Modified: lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java Sat Jul 7 15:42:40 2012
@@ -128,7 +128,7 @@ public class DataImporter {
private void loadSchemaFieldMap() {
Map<String, SchemaField> modLnvsf = new HashMap<String, SchemaField>();
for (Map.Entry<String, SchemaField> entry : schema.getFields().entrySet()) {
- modLnvsf.put(entry.getKey().toLowerCase(Locale.ENGLISH), entry.getValue());
+ modLnvsf.put(entry.getKey().toLowerCase(Locale.ROOT), entry.getValue());
}
lowerNameVsSchemaField = Collections.unmodifiableMap(modLnvsf);
}
@@ -139,7 +139,7 @@ public class DataImporter {
schemaField = schema.getFieldOrNull(caseInsensitiveName);
}
if (schemaField == null) {
- schemaField = lowerNameVsSchemaField.get(caseInsensitiveName.toLowerCase(Locale.ENGLISH));
+ schemaField = lowerNameVsSchemaField.get(caseInsensitiveName.toLowerCase(Locale.ROOT));
}
return schemaField;
}
Modified: lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java (original)
+++ lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java Sat Jul 7 15:42:40 2012
@@ -72,7 +72,7 @@ public class NumberFormatTransformer ext
}
Object val = row.get(srcCol);
- String styleSmall = style.toLowerCase(Locale.ENGLISH);
+ String styleSmall = style.toLowerCase(Locale.ROOT);
if (val instanceof List) {
List<String> inputs = (List) val;
Modified: lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java (original)
+++ lucene/dev/branches/lucene4199/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java Sat Jul 7 15:42:40 2012
@@ -108,7 +108,7 @@ public class TestCachedSqlEntityProcesso
if (r == null)
break;
rows.add(r);
- assertEquals(r.get("desc").toString().toUpperCase(Locale.ENGLISH), r.get("desc"));
+ assertEquals(r.get("desc").toString().toUpperCase(Locale.ROOT), r.get("desc"));
}
assertEquals(2, rows.size());
assertEquals(2, rows.get(0).size());
@@ -176,7 +176,7 @@ public class TestCachedSqlEntityProcesso
Object val = entry.getValue();
if (val instanceof String) {
String s = (String) val;
- entry.setValue(s.toUpperCase(Locale.ENGLISH));
+ entry.setValue(s.toUpperCase(Locale.ROOT));
}
}
return row;
Modified: lucene/dev/branches/lucene4199/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java (original)
+++ lucene/dev/branches/lucene4199/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java Sat Jul 7 15:42:40 2012
@@ -138,7 +138,7 @@ public class ExtractingDocumentLoader ex
String streamType = req.getParams().get(ExtractingParams.STREAM_TYPE, null);
if (streamType != null) {
//Cache? Parsers are lightweight to construct and thread-safe, so I'm told
- MediaType mt = MediaType.parse(streamType.trim().toLowerCase(Locale.ENGLISH));
+ MediaType mt = MediaType.parse(streamType.trim().toLowerCase(Locale.ROOT));
parser = new DefaultParser(config.getMediaTypeRegistry()).getParsers().get(mt);
} else {
parser = autoDetectParser;
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java Sat Jul 7 15:42:40 2012
@@ -93,7 +93,7 @@ public class JapaneseTokenizerFactory ex
private Mode getMode(Map<String, String> args) {
String mode = args.get(MODE);
if (mode != null) {
- return Mode.valueOf(mode.toUpperCase(Locale.ENGLISH));
+ return Mode.valueOf(mode.toUpperCase(Locale.ROOT));
} else {
return JapaneseTokenizer.DEFAULT_MODE;
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java Sat Jul 7 15:42:40 2012
@@ -68,12 +68,12 @@ public class PhoneticFilterFactory exten
private static final Map<String, Class<? extends Encoder>> registry = new HashMap<String, Class<? extends Encoder>>(6);
static {
- registry.put("DoubleMetaphone".toUpperCase(Locale.ENGLISH), DoubleMetaphone.class);
- registry.put("Metaphone".toUpperCase(Locale.ENGLISH), Metaphone.class);
- registry.put("Soundex".toUpperCase(Locale.ENGLISH), Soundex.class);
- registry.put("RefinedSoundex".toUpperCase(Locale.ENGLISH), RefinedSoundex.class);
- registry.put("Caverphone".toUpperCase(Locale.ENGLISH), Caverphone2.class);
- registry.put("ColognePhonetic".toUpperCase(Locale.ENGLISH), ColognePhonetic.class);
+ registry.put("DoubleMetaphone".toUpperCase(Locale.ROOT), DoubleMetaphone.class);
+ registry.put("Metaphone".toUpperCase(Locale.ROOT), Metaphone.class);
+ registry.put("Soundex".toUpperCase(Locale.ROOT), Soundex.class);
+ registry.put("RefinedSoundex".toUpperCase(Locale.ROOT), RefinedSoundex.class);
+ registry.put("Caverphone".toUpperCase(Locale.ROOT), Caverphone2.class);
+ registry.put("ColognePhonetic".toUpperCase(Locale.ROOT), ColognePhonetic.class);
}
protected boolean inject = true;
@@ -93,7 +93,7 @@ public class PhoneticFilterFactory exten
throw new InitializationException("Missing required parameter: " + ENCODER
+ " [" + registry.keySet() + "]");
}
- clazz = registry.get(name.toUpperCase(Locale.ENGLISH));
+ clazz = registry.get(name.toUpperCase(Locale.ROOT));
if( clazz == null ) {
clazz = resolveEncoder(name);
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java Sat Jul 7 15:42:40 2012
@@ -198,7 +198,7 @@ public abstract class CachingDirectoryFa
log.warn("No lockType configured for " + dir + " assuming 'simple'");
rawLockType = "simple";
}
- final String lockType = rawLockType.toLowerCase(Locale.ENGLISH).trim();
+ final String lockType = rawLockType.toLowerCase(Locale.ROOT).trim();
if ("simple".equals(lockType)) {
// multiple SimpleFSLockFactory instances should be OK
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/CoreContainer.java Sat Jul 7 15:42:40 2012
@@ -781,7 +781,7 @@ public class CoreContainer
if (schemaFile.exists()) {
String key = schemaFile.getAbsolutePath()
+ ":"
- + new SimpleDateFormat("yyyyMMddHHmmss", Locale.US).format(new Date(
+ + new SimpleDateFormat("yyyyMMddHHmmss", Locale.ROOT).format(new Date(
schemaFile.lastModified()));
schema = indexSchemaCache.get(key);
if (schema == null) {
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java Sat Jul 7 15:42:40 2012
@@ -281,7 +281,7 @@ public class JmxMonitoredMap<K, V> exten
} else if (staticStats.contains(attribute) && attribute != null
&& attribute.length() > 0) {
try {
- String getter = "get" + attribute.substring(0, 1).toUpperCase(Locale.ENGLISH)
+ String getter = "get" + attribute.substring(0, 1).toUpperCase(Locale.ROOT)
+ attribute.substring(1);
Method meth = infoBean.getClass().getMethod(getter);
val = meth.invoke(infoBean);
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrConfig.java Sat Jul 7 15:42:40 2012
@@ -344,7 +344,7 @@ public class SolrConfig extends Config {
/** Input must not be null */
public static LastModFrom parse(final String s) {
try {
- return valueOf(s.toUpperCase(Locale.ENGLISH));
+ return valueOf(s.toUpperCase(Locale.ROOT));
} catch (Exception e) {
log.warn( "Unrecognized value for lastModFrom: " + s, e);
return BOGUS;
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrCore.java Sat Jul 7 15:42:40 2012
@@ -1913,13 +1913,13 @@ public final class SolrCore implements S
Set<String> hide = new HashSet<String>();
for (String file : solrConfig.getResourceLoader().listConfigDir()) {
- hide.add(file.toUpperCase(Locale.ENGLISH));
+ hide.add(file.toUpperCase(Locale.ROOT));
}
// except the "gettable" list
StringTokenizer st = new StringTokenizer( gettable );
while( st.hasMoreTokens() ) {
- hide.remove( st.nextToken().toUpperCase(Locale.ENGLISH) );
+ hide.remove( st.nextToken().toUpperCase(Locale.ROOT) );
}
for( String s : hide ) {
invariants.add( ShowFileRequestHandler.HIDDEN, s );
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java Sat Jul 7 15:42:40 2012
@@ -145,7 +145,7 @@ public class SolrDeletionPolicy implemen
try {
if (maxCommitAge != null) {
if (maxCommitAgeTimeStamp==-1) {
- DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
+ DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.ROOT);
maxCommitAgeTimeStamp = dmp.parseMath(maxCommitAge).getTime();
}
if (IndexDeletionPolicyWrapper.getCommitTimestamp(commit) < maxCommitAgeTimeStamp) {
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java Sat Jul 7 15:42:40 2012
@@ -191,7 +191,7 @@ public class PingRequestHandler extends
}
else {
try {
- action = ACTIONS.valueOf(actionParam.toUpperCase(Locale.ENGLISH));
+ action = ACTIONS.valueOf(actionParam.toUpperCase(Locale.ROOT));
}
catch (IllegalArgumentException iae){
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Sat Jul 7 15:42:40 2012
@@ -530,7 +530,7 @@ public class SnapPuller {
* All the files are copied to a temp dir first
*/
private File createTempindexDir(SolrCore core) {
- String tmpIdxDirName = "index." + new SimpleDateFormat(SnapShooter.DATE_FMT, Locale.US).format(new Date());
+ String tmpIdxDirName = "index." + new SimpleDateFormat(SnapShooter.DATE_FMT, Locale.ROOT).format(new Date());
File tmpIdxDir = new File(core.getDataDir(), tmpIdxDirName);
tmpIdxDir.mkdirs();
return tmpIdxDir;
@@ -713,7 +713,7 @@ public class SnapPuller {
}
private String getDateAsStr(Date d) {
- return new SimpleDateFormat(SnapShooter.DATE_FMT, Locale.US).format(d);
+ return new SimpleDateFormat(SnapShooter.DATE_FMT, Locale.ROOT).format(d);
}
/**
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapShooter.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapShooter.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/SnapShooter.java Sat Jul 7 15:42:40 2012
@@ -91,7 +91,7 @@ public class SnapShooter {
if(numberToKeep<Integer.MAX_VALUE) {
deleteOldBackups(numberToKeep);
}
- SimpleDateFormat fmt = new SimpleDateFormat(DATE_FMT, Locale.US);
+ SimpleDateFormat fmt = new SimpleDateFormat(DATE_FMT, Locale.ROOT);
directoryName = "snapshot." + fmt.format(new Date());
lock = lockFactory.makeLock(directoryName + ".lock");
if (lock.isLocked()) return;