Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2381: use patched version of jetty with correct UTF-8 handling 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1074726 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-02-25 22:42:32 +00:00
parent aa671873a4
commit 7b7d144aec
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-tools/eclipse/dot.classpath
View File

@ -117,8 +117,8 @@
<classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/> <classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/> <classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.1.jar"/> <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.1.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-6.1.26.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-util-6.1.26.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-2.5-20081211.jar"/> <classpathentry kind="lib" path="solr/example/lib/servlet-api-2.5-20081211.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/core-3.1.1.jar"/> <classpathentry kind="lib" path="solr/example/lib/jsp-2.1/core-3.1.1.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar"/> <classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar"/>

4
solr/CHANGES.txt
View File

@ -802,6 +802,10 @@ Other Changes
* SOLR-2365: Move DIH jars out of solr.war (David Smiley via yonik) * SOLR-2365: Move DIH jars out of solr.war (David Smiley via yonik)
* SOLR-2381: Include a patched version of Jetty (6.1.26 + JETTY-1340)
to fix problematic UTF-8 handling for supplementary characters.
(uschindler, yonik, rmuir)
Build Build
---------------------- ----------------------

2
solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[33aa586bcc18fc1ff0276b56e595281fb90e2bb5] was removed in git history.
Apache SVN contains full history.

2
solr/example/lib/jetty-6.1.26.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[2cbe07aeefa47ad6321addf0e75e010858f72fba] was removed in git history.
Apache SVN contains full history.

2
solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[286a135efb973e693b20e437dc01eb8658e72ff2] was removed in git history.
Apache SVN contains full history.

2
solr/example/lib/jetty-util-6.1.26.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[cd237528add68b792f2e6e030344f27d9d07ec31] was removed in git history.
Apache SVN contains full history.

4
solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
View File

@ -181,7 +181,7 @@ abstract public class SolrExampleTests extends SolrJettyTestBase
SolrInputDocument doc2 = new SolrInputDocument(); SolrInputDocument doc2 = new SolrInputDocument();
doc2.addField( "id", "id2", 1.0f ); doc2.addField( "id", "id2", 1.0f );
doc2.addField( "name", "h\u1234llo", 1.0f ); doc2.addField( "name", "h\uD866\uDF05llo", 1.0f );
doc2.addField( "price", 20 ); doc2.addField( "price", 20 );
Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>(); Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
@ -209,7 +209,7 @@ abstract public class SolrExampleTests extends SolrJettyTestBase
// System.out.println( rsp.getResults() ); // System.out.println( rsp.getResults() );
// query outside ascii range // query outside ascii range
query.setQuery("name:h\u1234llo"); query.setQuery("name:h\uD866\uDF05llo");
rsp = server.query( query ); rsp = server.query( query );
assertEquals( 1, rsp.getResults().getNumFound() ); assertEquals( 1, rsp.getResults().getNumFound() );