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 [2/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...
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Sat Jul 7 15:42:40 2012
@@ -101,7 +101,7 @@ public class ShowFileRequestHandler exte
String[] hidden = invariants.getParams( HIDDEN );
if( hidden != null ) {
for( String s : hidden ) {
- hiddenFiles.add( s.toUpperCase(Locale.ENGLISH) );
+ hiddenFiles.add( s.toUpperCase(Locale.ROOT) );
}
}
}
@@ -138,7 +138,7 @@ public class ShowFileRequestHandler exte
adminFile = confPath;
} else {
fname = fname.replace('\\', '/'); // normalize slashes
- if (hiddenFiles.contains(fname.toUpperCase(Locale.ENGLISH))) {
+ if (hiddenFiles.contains(fname.toUpperCase(Locale.ROOT))) {
throw new SolrException(ErrorCode.FORBIDDEN, "Can not access: " + fname);
}
if (fname.indexOf("..") >= 0) {
@@ -159,7 +159,7 @@ public class ShowFileRequestHandler exte
NamedList<SimpleOrderedMap<Object>> files = new SimpleOrderedMap<SimpleOrderedMap<Object>>();
for (String f : children) {
- if (hiddenFiles.contains(f.toUpperCase(Locale.ENGLISH))) {
+ if (hiddenFiles.contains(f.toUpperCase(Locale.ROOT))) {
continue; // don't show 'hidden' files
}
if (f.startsWith(".")) {
@@ -214,7 +214,7 @@ public class ShowFileRequestHandler exte
}
else {
fname = fname.replace( '\\', '/' ); // normalize slashes
- if( hiddenFiles.contains( fname.toUpperCase(Locale.ENGLISH) ) ) {
+ if( hiddenFiles.contains( fname.toUpperCase(Locale.ROOT) ) ) {
throw new SolrException( ErrorCode.FORBIDDEN, "Can not access: "+fname );
}
if( fname.indexOf( ".." ) >= 0 ) {
@@ -241,7 +241,7 @@ public class ShowFileRequestHandler exte
for( File f : adminFile.listFiles() ) {
String path = f.getAbsolutePath().substring( basePath );
path = path.replace( '\\', '/' ); // normalize slashes
- if( hiddenFiles.contains( path.toUpperCase(Locale.ENGLISH) ) ) {
+ if( hiddenFiles.contains( path.toUpperCase(Locale.ROOT) ) ) {
continue; // don't show 'hidden' files
}
if( f.isHidden() || f.getName().startsWith( "." ) ) {
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Sat Jul 7 15:42:40 2012
@@ -255,9 +255,9 @@ public class SolrInfoMBeanHandler extend
.append(ref).append(", Now: ").append(now);
if(ref instanceof Number) {
- NumberFormat nf = NumberFormat.getIntegerInstance(Locale.ENGLISH);
+ NumberFormat nf = NumberFormat.getIntegerInstance(Locale.ROOT);
if((ref instanceof Double) || (ref instanceof Float)) {
- nf = NumberFormat.getInstance(Locale.ENGLISH);
+ nf = NumberFormat.getInstance(Locale.ROOT);
}
double dref = ((Number)ref).doubleValue();
double dnow = ((Number)now).doubleValue();
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Sat Jul 7 15:42:40 2012
@@ -131,7 +131,7 @@ public class SystemInfoHandler extends R
addGetterIfAvaliable( os, "maxFileDescriptorCount", info );
try {
- if( !os.getName().toLowerCase(Locale.ENGLISH).startsWith( "windows" ) ) {
+ if( !os.getName().toLowerCase(Locale.ROOT).startsWith( "windows" ) ) {
// Try some command line things
info.add( "uname", execute( "uname -a" ) );
info.add( "uptime", execute( "uptime" ) );
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java Sat Jul 7 15:42:40 2012
@@ -242,7 +242,7 @@ public class TermsComponent extends Sear
int flags = 0;
for (String flagParam : flagParams) {
try {
- flags |= TermsParams.TermsRegexpFlag.valueOf(flagParam.toUpperCase(Locale.ENGLISH)).getValue();
+ flags |= TermsParams.TermsRegexpFlag.valueOf(flagParam.toUpperCase(Locale.ROOT)).getValue();
} catch (IllegalArgumentException iae) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Unknown terms regex flag '" + flagParam + "'");
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/DateField.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/DateField.java Sat Jul 7 15:42:40 2012
@@ -127,7 +127,7 @@ public class DateField extends Primitive
* Fixed Locale needed for parsing/formating Milliseconds in the
* canonical representation.
*/
- protected static final Locale CANONICAL_LOCALE = Locale.US;
+ protected static final Locale CANONICAL_LOCALE = Locale.ROOT;
// The XML (external) date format will sort correctly, except if
// fractions of seconds are present (because '.' is lower than 'Z').
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/TrieField.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/TrieField.java Sat Jul 7 15:42:40 2012
@@ -96,7 +96,7 @@ public class TrieField extends Primitive
if (t != null) {
try {
- type = TrieTypes.valueOf(t.toUpperCase(Locale.ENGLISH));
+ type = TrieTypes.valueOf(t.toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Invalid type specified in schema.xml for field: " + args.get("name"), e);
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/UUIDField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/UUIDField.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/UUIDField.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/schema/UUIDField.java Sat Jul 7 15:42:40 2012
@@ -70,7 +70,7 @@ public class UUIDField extends StrField
@Override
public String toInternal(String val) {
if (val == null || 0==val.length() || NEW.equals(val)) {
- return UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
+ return UUID.randomUUID().toString().toLowerCase(Locale.ROOT);
} else {
// we do some basic validation if 'val' looks like an UUID
if (val.length() != 36 || val.charAt(8) != DASH || val.charAt(13) != DASH
@@ -79,12 +79,12 @@ public class UUIDField extends StrField
"Invalid UUID String: '" + val + "'");
}
- return val.toLowerCase(Locale.ENGLISH);
+ return val.toLowerCase(Locale.ROOT);
}
}
public String toInternal(UUID uuid) {
- return uuid.toString().toLowerCase(Locale.ENGLISH);
+ return uuid.toString().toLowerCase(Locale.ROOT);
}
@Override
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java Sat Jul 7 15:42:40 2012
@@ -379,7 +379,7 @@ class StandardRequestParser implements S
public SolrParams parseParamsAndFillStreams(
final HttpServletRequest req, ArrayList<ContentStream> streams ) throws Exception
{
- String method = req.getMethod().toUpperCase(Locale.ENGLISH);
+ String method = req.getMethod().toUpperCase(Locale.ROOT);
if( "GET".equals( method ) || "HEAD".equals( method )) {
return new ServletSolrParams(req);
}
@@ -390,7 +390,7 @@ class StandardRequestParser implements S
if( idx > 0 ) { // remove the charset definition "; charset=utf-8"
contentType = contentType.substring( 0, idx );
}
- if( "application/x-www-form-urlencoded".equals( contentType.toLowerCase(Locale.ENGLISH) ) ) {
+ if( "application/x-www-form-urlencoded".equals( contentType.toLowerCase(Locale.ROOT) ) ) {
return new ServletSolrParams(req); // just get the params from parameterMap
}
if( ServletFileUpload.isMultipartContent(req) ) {
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/cache/Method.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/cache/Method.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/cache/Method.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/servlet/cache/Method.java Sat Jul 7 15:42:40 2012
@@ -24,7 +24,7 @@ public enum Method {
public static Method getMethod(String method) {
try {
- return Method.valueOf(method.toUpperCase(Locale.ENGLISH));
+ return Method.valueOf(method.toUpperCase(Locale.ROOT));
} catch (Exception e) {
return OTHER;
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/UpdateLog.java Sat Jul 7 15:42:40 2012
@@ -756,7 +756,7 @@ public class UpdateLog implements Plugin
private void ensureLog() {
if (tlog == null) {
- String newLogName = String.format(Locale.ENGLISH, LOG_FILENAME_PATTERN, TLOG_NAME, id);
+ String newLogName = String.format(Locale.ROOT, LOG_FILENAME_PATTERN, TLOG_NAME, id);
tlog = new TransactionLog(new File(tlogDir, newLogName), globalStrings);
}
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java Sat Jul 7 15:42:40 2012
@@ -59,7 +59,7 @@ public class UUIDUpdateProcessorFactory
UpdateRequestProcessor next ) {
return new DefaultValueUpdateProcessor(fieldName, next) {
public Object getDefaultValue() {
- return UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
+ return UUID.randomUUID().toString().toLowerCase(Locale.ROOT);
}
};
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/util/DateMathParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/util/DateMathParser.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/util/DateMathParser.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/java/org/apache/solr/util/DateMathParser.java Sat Jul 7 15:42:40 2012
@@ -83,8 +83,8 @@ public class DateMathParser {
/** Default TimeZone for DateMath rounding (UTC) */
public static final TimeZone DEFAULT_MATH_TZ = UTC;
- /** Default Locale for DateMath rounding (Locale.US) */
- public static final Locale DEFAULT_MATH_LOCALE = Locale.US;
+ /** Default Locale for DateMath rounding (Locale.ROOT) */
+ public static final Locale DEFAULT_MATH_LOCALE = Locale.ROOT;
/**
* A mapping from (uppercased) String labels idenyifying time units,
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/TestTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/TestTrie.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/TestTrie.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/TestTrie.java Sat Jul 7 15:42:40 2012
@@ -169,11 +169,11 @@ public class TestTrie extends SolrTestCa
assertQ("Range filter tint:[* to *] must match 10 documents", req("q", "*:*", "fq", "tdate:[* TO *]"), "//*[@numFound='10']");
// Test date math syntax
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
assertU(delQ("*:*"));
- DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
+ DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.ROOT);
String largestDate = "";
for (int i = 0; i < 10; i++) {
// index 10 days starting with today
@@ -220,9 +220,9 @@ public class TestTrie extends SolrTestCa
checkPrecisionSteps("tdate");
// For tdate tests
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
- DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
+ DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.ROOT);
for (int i = 0; i < 10; i++) {
long l = Integer.MAX_VALUE + i*1L;
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/core/TestConfig.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/core/TestConfig.java Sat Jul 7 15:42:40 2012
@@ -109,7 +109,7 @@ public class TestConfig extends SolrTest
//System.out.println( handler.getHiddenFiles() );
// should not contain: <gettableFiles>solrconfig.xml scheam.xml admin-extra.html</gettableFiles>
- assertFalse(handler.getHiddenFiles().contains("scheam.xml".toUpperCase(Locale.ENGLISH)));
+ assertFalse(handler.getHiddenFiles().contains("scheam.xml".toUpperCase(Locale.ROOT)));
assertTrue(handler.getHiddenFiles().contains("PROTWORDS.TXT"));
}
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java Sat Jul 7 15:42:40 2012
@@ -174,7 +174,7 @@ public class StatsComponentTest extends
public void testFieldStatisticsResultsDateField() throws Exception {
SolrCore core = h.getCore();
- DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
String date1 = dateFormat.format(new Date(123456789)) + "Z";
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java Sat Jul 7 15:42:40 2012
@@ -55,7 +55,7 @@ public class TestBinaryResponseWriter ex
* Tests known types implementation by asserting correct encoding/decoding of UUIDField
*/
public void testUUID() throws Exception {
- String s = UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
+ String s = UUID.randomUUID().toString().toLowerCase(Locale.ROOT);
assertU(adoc("id", "101", "uuid", s));
assertU(commit());
LocalSolrQueryRequest req = lrf.makeRequest("q", "*:*");
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/request/TestFaceting.java Sat Jul 7 15:42:40 2012
@@ -52,7 +52,7 @@ public class TestFaceting extends SolrTe
}
String t(int tnum) {
- return String.format(Locale.US, "%08d", tnum);
+ return String.format(Locale.ROOT, "%08d", tnum);
}
void createIndex(int nTerms) {
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java Sat Jul 7 15:42:40 2012
@@ -31,7 +31,7 @@ import java.util.Locale;
public class DateFieldTest extends LuceneTestCase {
public static TimeZone UTC = TimeZone.getTimeZone("UTC");
protected DateField f = null;
- protected DateMathParser p = new DateMathParser(UTC, Locale.US);
+ protected DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
@Override
public void setUp() throws Exception {
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/search/TestRecovery.java Sat Jul 7 15:42:40 2012
@@ -906,7 +906,7 @@ public class TestRecovery extends SolrTe
// WARNING... assumes format of .00000n where n is less than 9
long logNumber = Long.parseLong(fname.substring(fname.lastIndexOf(".") + 1));
- String fname2 = String.format(Locale.ENGLISH,
+ String fname2 = String.format(Locale.ROOT,
UpdateLog.LOG_FILENAME_PATTERN,
UpdateLog.TLOG_NAME,
logNumber + 1);
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java Sat Jul 7 15:42:40 2012
@@ -55,17 +55,17 @@ public class DateMathParserTest extends
public DateMathParserTest() {
super();
fmt = new SimpleDateFormat
- ("G yyyyy MM ww WW DD dd F E aa HH hh mm ss SSS z Z",Locale.US);
+ ("G yyyyy MM ww WW DD dd F E aa HH hh mm ss SSS z Z",Locale.ROOT);
fmt.setTimeZone(UTC);
- parser = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS",Locale.US);
+ parser = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS",Locale.ROOT);
parser.setTimeZone(UTC);
}
/** MACRO: Round: parses s, rounds with u, fmts */
protected String r(String s, String u) throws Exception {
Date d = parser.parse(s);
- Calendar c = Calendar.getInstance(UTC, Locale.US);
+ Calendar c = Calendar.getInstance(UTC, Locale.ROOT);
c.setTime(d);
DateMathParser.round(c, u);
return fmt.format(c.getTime());
@@ -74,7 +74,7 @@ public class DateMathParserTest extends
/** MACRO: Add: parses s, adds v u, fmts */
protected String a(String s, int v, String u) throws Exception {
Date d = parser.parse(s);
- Calendar c = Calendar.getInstance(UTC, Locale.US);
+ Calendar c = Calendar.getInstance(UTC, Locale.ROOT);
c.setTime(d);
DateMathParser.add(c, v, u);
return fmt.format(c.getTime());
@@ -162,7 +162,7 @@ public class DateMathParserTest extends
public void testParseStatelessness() throws Exception {
- DateMathParser p = new DateMathParser(UTC, Locale.US);
+ DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
String e = fmt.format(p.parseMath(""));
@@ -179,7 +179,7 @@ public class DateMathParserTest extends
public void testParseMath() throws Exception {
- DateMathParser p = new DateMathParser(UTC, Locale.US);
+ DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
// No-Op
@@ -272,7 +272,7 @@ public class DateMathParserTest extends
// US, Positive Offset with DST
TimeZone tz = TimeZone.getTimeZone(PLUS_TZS);
- DateMathParser p = new DateMathParser(tz, Locale.US);
+ DateMathParser p = new DateMathParser(tz, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
@@ -294,7 +294,7 @@ public class DateMathParserTest extends
// France, Negative Offset with DST
tz = TimeZone.getTimeZone(NEG_TZS);
- p = new DateMathParser(tz, Locale.US);
+ p = new DateMathParser(tz, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
assertMath("2001-07-04T12:08:56.000", p, "/SECOND");
@@ -311,7 +311,7 @@ public class DateMathParserTest extends
public void testParseMathExceptions() throws Exception {
- DateMathParser p = new DateMathParser(UTC, Locale.US);
+ DateMathParser p = new DateMathParser(UTC, Locale.ROOT);
p.setNow(parser.parse("2001-07-04T12:08:56.235"));
Map<String,Integer> badCommands = new HashMap<String,Integer>();
Modified: lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java (original)
+++ lucene/dev/branches/lucene4199/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java Sat Jul 7 15:42:40 2012
@@ -120,10 +120,10 @@ public class TimeZoneUtilsTest extends L
int hour = _TestUtil.nextInt(r, 0, 23);
int min = _TestUtil.nextInt(r, 0, 59);
- String hours = String.format(Locale.US,
+ String hours = String.format(Locale.ROOT,
(r.nextBoolean() ? ONE_DIGIT : TWO_DIGIT),
hour);
- String mins = String.format(Locale.US, TWO_DIGIT, min);
+ String mins = String.format(Locale.ROOT, TWO_DIGIT, min);
String input = "GMT" + (r.nextBoolean()?"+":"-")
+ hours + (r.nextBoolean() ? "" : ((r.nextBoolean()?":":"") + mins));
assertSameRules(input,
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java Sat Jul 7 15:42:40 2012
@@ -178,7 +178,7 @@ public class DocumentObjectBinder {
} else {
String setterName = setter.getName();
if (setterName.startsWith("set") && setterName.length() > 3) {
- name = setterName.substring(3, 4).toLowerCase(Locale.ENGLISH) + setterName.substring(4);
+ name = setterName.substring(3, 4).toLowerCase(Locale.ROOT) + setterName.substring(4);
} else {
name = setter.getName();
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java Sat Jul 7 15:42:40 2012
@@ -190,7 +190,7 @@ public class XMLResponseParser extends R
{
if( v != null ) {
try {
- return KnownType.valueOf( v.toUpperCase(Locale.ENGLISH) );
+ return KnownType.valueOf( v.toUpperCase(Locale.ROOT) );
}
catch( Exception ex ) {}
}
@@ -270,7 +270,7 @@ public class XMLResponseParser extends R
if( XMLStreamConstants.START_ELEMENT != parser.getEventType() ) {
throw new RuntimeException( "must be start element, not: "+parser.getEventType() );
}
- if( !"arr".equals( parser.getLocalName().toLowerCase(Locale.ENGLISH) ) ) {
+ if( !"arr".equals( parser.getLocalName().toLowerCase(Locale.ROOT) ) ) {
throw new RuntimeException( "must be 'arr', not: "+parser.getLocalName() );
}
@@ -373,7 +373,7 @@ public class XMLResponseParser extends R
if( XMLStreamConstants.START_ELEMENT != parser.getEventType() ) {
throw new RuntimeException( "must be start element, not: "+parser.getEventType() );
}
- if( !"doc".equals( parser.getLocalName().toLowerCase(Locale.ENGLISH) ) ) {
+ if( !"doc".equals( parser.getLocalName().toLowerCase(Locale.ROOT) ) ) {
throw new RuntimeException( "must be 'lst', not: "+parser.getLocalName() );
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java Sat Jul 7 15:42:40 2012
@@ -34,7 +34,7 @@ public interface CollectionParams
{
if( p != null ) {
try {
- return CollectionAction.valueOf( p.toUpperCase(Locale.ENGLISH) );
+ return CollectionAction.valueOf( p.toUpperCase(Locale.ROOT) );
}
catch( Exception ex ) {}
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java Sat Jul 7 15:42:40 2012
@@ -154,7 +154,7 @@ public interface CommonParams {
public static EchoParamStyle get( String v ) {
if( v != null ) {
- v = v.toUpperCase(Locale.ENGLISH);
+ v = v.toUpperCase(Locale.ROOT);
if( v.equals( "EXPLICIT" ) ) {
return EXPLICIT;
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java Sat Jul 7 15:42:40 2012
@@ -99,7 +99,7 @@ public interface CoreAdminParams
{
if( p != null ) {
try {
- return CoreAdminAction.valueOf( p.toUpperCase(Locale.ENGLISH) );
+ return CoreAdminAction.valueOf( p.toUpperCase(Locale.ROOT) );
}
catch( Exception ex ) {}
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java Sat Jul 7 15:42:40 2012
@@ -317,10 +317,10 @@ public interface FacetParams {
public enum FacetRangeInclude {
ALL, LOWER, UPPER, EDGE, OUTER;
@Override
- public String toString() { return super.toString().toLowerCase(Locale.ENGLISH); }
+ public String toString() { return super.toString().toLowerCase(Locale.ROOT); }
public static FacetRangeInclude get(String label) {
try {
- return valueOf(label.toUpperCase(Locale.ENGLISH));
+ return valueOf(label.toUpperCase(Locale.ROOT));
} catch (IllegalArgumentException e) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java Sat Jul 7 15:42:40 2012
@@ -59,7 +59,7 @@ public interface MoreLikeThisParams
public static TermStyle get( String p )
{
if( p != null ) {
- p = p.toUpperCase(Locale.ENGLISH);
+ p = p.toUpperCase(Locale.ROOT);
if( p.equals( "DETAILS" ) ) {
return DETAILS;
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java Sat Jul 7 15:42:40 2012
@@ -52,7 +52,7 @@ public abstract class ContentStreamBase
public static String getCharsetFromContentType( String contentType )
{
if( contentType != null ) {
- int idx = contentType.toLowerCase(Locale.ENGLISH).indexOf( "charset=" );
+ int idx = contentType.toLowerCase(Locale.ROOT).indexOf( "charset=" );
if( idx > 0 ) {
return contentType.substring( idx + "charset=".length() ).trim();
}
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java Sat Jul 7 15:42:40 2012
@@ -57,7 +57,7 @@ public class DateUtil {
private static final Date DEFAULT_TWO_DIGIT_YEAR_START;
static {
- Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.US);
+ Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ROOT);
calendar.set(2000, Calendar.JANUARY, 1, 0, 0);
DEFAULT_TWO_DIGIT_YEAR_START = calendar.getTime();
}
@@ -147,7 +147,7 @@ public class DateUtil {
while (formatIter.hasNext()) {
String format = (String) formatIter.next();
if (dateParser == null) {
- dateParser = new SimpleDateFormat(format, Locale.US);
+ dateParser = new SimpleDateFormat(format, Locale.ROOT);
dateParser.setTimeZone(GMT);
dateParser.set2DigitYearStart(startDate);
} else {
@@ -184,7 +184,7 @@ public class DateUtil {
public ThreadLocalDateFormat() {
super();
//2007-04-26T08:05:04Z
- SimpleDateFormat tmp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+ SimpleDateFormat tmp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ROOT);
tmp.setTimeZone(UTC);
proto = tmp;
}
@@ -202,7 +202,7 @@ public class DateUtil {
// builder's buffer.
StringBuilder sb = out instanceof StringBuilder ? (StringBuilder)out : new StringBuilder();
- if (cal==null) cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.US);
+ if (cal==null) cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ROOT);
cal.setTime(date);
int i = cal.get(Calendar.YEAR);
Modified: lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java?rev=1358594&r1=1358593&r2=1358594&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java (original)
+++ lucene/dev/branches/lucene4199/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java Sat Jul 7 15:42:40 2012
@@ -209,7 +209,7 @@ public class StrUtils {
public static List<String> toLower(List<String> strings) {
ArrayList<String> ret = new ArrayList<String>(strings.size());
for (String str : strings) {
- ret.add(str.toLowerCase(Locale.ENGLISH));
+ ret.add(str.toLowerCase(Locale.ROOT));
}
return ret;
}