Author: hossman
Date: Mon May 31 23:45:09 2010
New Revision: 949899
URL: http://svn.apache.org/viewvc?rev=949899&view=rev
Log:
merging r890243 from solr/branches/branch-1.5-dev for SOLR-1651
Modified:
lucene/solr/branches/branch-1.4/ (props changed)
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
(props changed)
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:45:09 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,909705,911245,919871,925898
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949899&r1=949898&r2=949899&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Mon May 31 23:45:09 2010
@@ -111,6 +111,9 @@ Bug Fixes
"SEVERE: SolrIndexWriter was not closed prior to finalize()" although
there were no other consequences. (yonik)
+* SOLR-1651: Fixed Incorrect dataimport handler package name in
SolrResourceLoader
+ (Akshay Ukey via shalin)
+
================== Release 1.4.0 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Modified:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/core/SolrResourceLoader.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=949899&r1=949898&r2=949899&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/core/SolrResourceLoader.java
(original)
+++
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/core/SolrResourceLoader.java
Mon May 31 23:45:09 2010
@@ -63,7 +63,7 @@ public class SolrResourceLoader implemen
static final String project = "solr";
static final String base = "org.apache" + "." + project;
- static final String[] packages =
{"","analysis.","schema.","handler.","search.","update.","core.","request.","update.processor.","util.",
"spelling.", "handler.component.", "handler.dataimport"};
+ static final String[] packages =
{"","analysis.","schema.","handler.","search.","update.","core.","request.","update.processor.","util.",
"spelling.", "handler.component.", "handler.dataimport."};
private URLClassLoader classLoader;
private final String instanceDir;
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:45:09 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,906553,909705,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:45:09 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,906553,909705,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:45:09 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,906553,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,906553,909705,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 23:45:09 2010
@@ -1,2 +1,2 @@
-/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,891596,891889,898119,903271,909705,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,909705,911245,919871,925898
/lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java:906553
