Author: kwright
Date: Thu Feb 27 14:47:00 2014
New Revision: 1572602
URL: http://svn.apache.org/r1572602
Log:
Fix for CONNECTORS-890.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrServer.java
manifoldcf/trunk/pom.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1572602&r1=1572601&r2=1572602&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Feb 27 14:47:00 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-890: Upgrade to Solr 4.7.0, and Httpclient 4.3.2.
+(Karl Wright)
+
CONNECTORS-905: Add property which disables history recording.
(Graeme Seaton)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1572602&r1=1572601&r2=1572602&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Feb 27 14:47:00 2014
@@ -3381,14 +3381,14 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.5"/>
+ <param name="artifact-version" value="4.3.1"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="httpcore"/>
<param name="artifact-type" value="jar"/>
</antcall>
<antcall target="download-via-maven">
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.6"/>
+ <param name="artifact-version" value="4.3.2"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="httpclient"/>
<param name="artifact-type" value="jar"/>
@@ -3396,7 +3396,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/httpcomponents"/>
- <param name="artifact-version" value="4.2.6"/>
+ <param name="artifact-version" value="4.3.2"/>
<param name="artifact-name" value="httpmime"/>
<param name="artifact-type" value="jar"/>
</antcall>
@@ -4282,7 +4282,7 @@ Use Apache Forrest version forrest-0.9-d
<antcall target="download-via-maven">
<param name="target" value="lib"/>
<param name="project-path" value="org/apache/solr"/>
- <param name="artifact-version" value="4.6.0"/>
+ <param name="artifact-version" value="4.7.0"/>
<param name="artifact-name" value="solr-solrj"/>
<param name="artifact-type" value="jar"/>
</antcall>
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrServer.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrServer.java?rev=1572602&r1=1572601&r2=1572602&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrServer.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrServer.java
Thu Feb 27 14:47:00 2014
@@ -19,10 +19,11 @@ package org.apache.manifoldcf.agents.out
import org.apache.solr.client.solrj.impl.LBHttpSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.impl.BinaryResponseParser;
+import org.apache.solr.client.solrj.request.RequestWriter;
import org.apache.solr.client.solrj.*;
import java.net.MalformedURLException;
import org.apache.http.client.HttpClient;
-
+import java.util.Set;
/** This class overrides and somewhat changes the behavior of the
* SolrJ LBHttpSolrServer class. This is so it instantiates our modified
@@ -52,8 +53,17 @@ public class ModifiedLBHttpSolrServer ex
}
@Override
- protected HttpSolrServer makeServer(String server) throws
MalformedURLException {
- return new ModifiedHttpSolrServer(server, httpClient, parser);
+ protected HttpSolrServer makeServer(String server) {
+ HttpSolrServer s = new ModifiedHttpSolrServer(server, httpClient, parser);
+ RequestWriter r = getRequestWriter();
+ Set<String> qp = getQueryParams();
+ if (r != null) {
+ s.setRequestWriter(r);
+ }
+ if (qp != null) {
+ s.setQueryParams(qp);
+ }
+ return s;
}
}
Modified: manifoldcf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1572602&r1=1572601&r2=1572602&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Thu Feb 27 14:47:00 2014
@@ -48,10 +48,10 @@
<commons-logging.version>1.1.1</commons-logging.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
- <httpcomponent.httpclient.version>4.2.6</httpcomponent.httpclient.version>
- <httpcomponent.httpcore.version>4.2.5</httpcomponent.httpcore.version>
- <httpcomponent.httpmime.version>4.2.6</httpcomponent.httpmime.version>
- <solr.version>4.6.0</solr.version>
+ <httpcomponent.httpclient.version>4.3.2</httpcomponent.httpclient.version>
+ <httpcomponent.httpcore.version>4.3.1</httpcomponent.httpcore.version>
+ <httpcomponent.httpmime.version>4.3.2</httpcomponent.httpmime.version>
+ <solr.version>4.7.0</solr.version>
<noggit.version>0.5</noggit.version>
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
