You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/05/17 19:45:20 UTC
svn commit: r945270 [2/2] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/docume...
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 17:45:18 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130,945245
/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 17:45:18 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130
+/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130,945245
/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java Mon May 17 17:45:18 2010
@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.bea
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
+
import java.lang.reflect.*;
import java.util.*;
import java.util.regex.Pattern;
@@ -178,7 +179,7 @@ public class DocumentObjectBinder {
} else {
String setterName = setter.getName();
if (setterName.startsWith("set") && setterName.length() > 3) {
- name = setterName.substring(3, 4).toLowerCase() + setterName.substring(4);
+ name = setterName.substring(3, 4).toLowerCase(Locale.ENGLISH) + setterName.substring(4);
} else {
name = setter.getName();
}
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java Mon May 17 17:45:18 2010
@@ -22,6 +22,8 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -187,7 +189,7 @@ public class XMLResponseParser extends R
{
if( v != null ) {
try {
- return KnownType.valueOf( v.toUpperCase() );
+ return KnownType.valueOf( v.toUpperCase(Locale.ENGLISH) );
}
catch( Exception ex ) {}
}
@@ -267,7 +269,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() ) ) {
+ if( !"arr".equals( parser.getLocalName().toLowerCase(Locale.ENGLISH) ) ) {
throw new RuntimeException( "must be 'arr', not: "+parser.getLocalName() );
}
@@ -370,7 +372,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() ) ) {
+ if( !"doc".equals( parser.getLocalName().toLowerCase(Locale.ENGLISH) ) ) {
throw new RuntimeException( "must be 'lst', not: "+parser.getLocalName() );
}
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 17:45:18 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130,945245
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestConfig.java?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/TestConfig.java Mon May 17 17:45:18 2010
@@ -35,6 +35,7 @@ import static org.junit.Assert.*;
import javax.xml.xpath.XPathConstants;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Locale;
public class TestConfig extends SolrTestCaseJ4 {
@@ -114,7 +115,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()));
+ assertFalse(handler.getHiddenFiles().contains("scheam.xml".toUpperCase(Locale.ENGLISH)));
assertTrue(handler.getHiddenFiles().contains("PROTWORDS.TXT"));
}
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java Mon May 17 17:45:18 2010
@@ -27,6 +27,7 @@ import org.apache.solr.util.AbstractSolr
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.util.Locale;
import java.util.UUID;
/**
@@ -49,7 +50,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();
+ String s = UUID.randomUUID().toString().toLowerCase(Locale.ENGLISH);
assertU(adoc("id", "101", "uuid", s));
assertU(commit());
LocalSolrQueryRequest req = lrf.makeRequest("q", "*:*");
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 17 17:45:18 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,933541-933575,933598,933613,933679,933879,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,942166,942235,942288,942719,943493,945090,945130,945245
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java Mon May 17 17:45:18 2010
@@ -28,6 +28,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -378,7 +379,7 @@ class StandardRequestParser implements S
public SolrParams parseParamsAndFillStreams(
final HttpServletRequest req, ArrayList<ContentStream> streams ) throws Exception
{
- String method = req.getMethod().toUpperCase();
+ String method = req.getMethod().toUpperCase(Locale.ENGLISH);
if( "GET".equals( method ) || "HEAD".equals( method )) {
return new ServletSolrParams(req);
}
@@ -389,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() ) ) {
+ if( "application/x-www-form-urlencoded".equals( contentType.toLowerCase(Locale.ENGLISH) ) ) {
return new ServletSolrParams(req); // just get the params from parameterMap
}
if( ServletFileUpload.isMultipartContent(req) ) {
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/cache/Method.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/cache/Method.java?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/cache/Method.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/servlet/cache/Method.java Mon May 17 17:45:18 2010
@@ -17,12 +17,14 @@
package org.apache.solr.servlet.cache;
+import java.util.Locale;
+
public enum Method {
GET, POST, HEAD, OTHER;
public static Method getMethod(String method) {
try {
- return Method.valueOf(method.toUpperCase());
+ return Method.valueOf(method.toUpperCase(Locale.ENGLISH));
} catch (Exception e) {
return OTHER;
}
Modified: lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/analysis.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/analysis.jsp?rev=945270&r1=945269&r2=945270&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/analysis.jsp (original)
+++ lucene/dev/branches/branch_3x/solr/src/webapp/web/admin/analysis.jsp Mon May 17 17:45:18 2010
@@ -46,7 +46,7 @@
// is name a field name or a type name?
String nt = request.getParameter("nt");
if (nt==null || nt.length()==0) nt="name"; // assume field name
- nt = nt.toLowerCase().trim();
+ nt = nt.toLowerCase(Locale.ENGLISH).trim();
String name = request.getParameter("name");
if (name==null || name.length()==0) name="";
String val = request.getParameter("val");