You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2007/06/14 19:26:39 UTC

svn commit: r547324 - in /lucene/solr/trunk/src: test/org/apache/solr/util/TestUtils.java webapp/src/org/apache/solr/servlet/SolrRequestParsers.java webapp/src/org/apache/solr/servlet/SolrServletRequest.java

Author: ryan
Date: Thu Jun 14 10:26:38 2007
New Revision: 547324

URL: http://svn.apache.org/viewvc?view=rev&rev=547324
Log:
SOLR-20: make private URL parsing function public so it is accessible to an embedded solrj client.

(this commit also includes StrUtils refactoring ommited of previous commit)

Modified:
    lucene/solr/trunk/src/test/org/apache/solr/util/TestUtils.java
    lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java
    lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServletRequest.java

Modified: lucene/solr/trunk/src/test/org/apache/solr/util/TestUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/util/TestUtils.java?view=diff&rev=547324&r1=547323&r2=547324
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/util/TestUtils.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/util/TestUtils.java Thu Jun 14 10:26:38 2007
@@ -21,6 +21,8 @@
 
 import java.util.List;
 
+import org.apache.solr.common.util.StrUtils;
+
 /**
  * @author yonik
  * @version $Id$

Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java?view=diff&rev=547324&r1=547323&r2=547324
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java Thu Jun 14 10:26:38 2007
@@ -18,11 +18,8 @@
 package org.apache.solr.servlet;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -109,7 +106,7 @@
     return sreq;
   }
   
-  SolrQueryRequest buildRequestFrom( SolrParams params, Collection<ContentStream> streams ) throws Exception
+  public SolrQueryRequest buildRequestFrom( SolrParams params, Collection<ContentStream> streams ) throws Exception
   {
     // The content type will be applied to all streaming content
     String contentType = params.get( SolrParams.STREAM_CONTENTTYPE );

Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServletRequest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServletRequest.java?view=diff&rev=547324&r1=547323&r2=547324
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServletRequest.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServletRequest.java Thu Jun 14 10:26:38 2007
@@ -19,8 +19,8 @@
 
 import org.apache.solr.request.SolrQueryRequestBase;
 import org.apache.solr.request.ServletSolrParams;
+import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.core.SolrCore;
-import org.apache.solr.util.StrUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;