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 2011/02/25 23:42:33 UTC
svn commit: r1074726 - in /lucene/dev/trunk: dev-tools/eclipse/ solr/
solr/example/lib/ solr/src/test/org/apache/solr/client/solrj/
Author: rmuir
Date: Fri Feb 25 22:42:32 2011
New Revision: 1074726
URL: http://svn.apache.org/viewvc?rev=1074726&view=rev
Log:
SOLR-2381: use patched version of jetty with correct UTF-8 handling
Added:
lucene/dev/trunk/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar (with props)
lucene/dev/trunk/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar (with props)
Removed:
lucene/dev/trunk/solr/example/lib/jetty-6.1.26.jar
lucene/dev/trunk/solr/example/lib/jetty-util-6.1.26.jar
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1074726&r1=1074725&r2=1074726&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Fri Feb 25 22:42:32 2011
@@ -117,8 +117,8 @@
<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/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-util-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-patched-JETTY-1340.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/jsp-2.1-glassfish-2.1.v20091210.jar"/>
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1074726&r1=1074725&r2=1074726&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Feb 25 22:42:32 2011
@@ -802,6 +802,10 @@ Other Changes
* 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
----------------------
Added: lucene/dev/trunk/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar?rev=1074726&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/trunk/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar?rev=1074726&view=auto
==============================================================================
Binary file - no diff available.
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1074726&r1=1074725&r2=1074726&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Fri Feb 25 22:42:32 2011
@@ -181,7 +181,7 @@ abstract public class SolrExampleTests e
SolrInputDocument doc2 = new SolrInputDocument();
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 );
Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
@@ -209,7 +209,7 @@ abstract public class SolrExampleTests e
// System.out.println( rsp.getResults() );
// query outside ascii range
- query.setQuery("name:h\u1234llo");
+ query.setQuery("name:h\uD866\uDF05llo");
rsp = server.query( query );
assertEquals( 1, rsp.getResults().getNumFound() );