You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/05/07 17:46:57 UTC
svn commit: r1479950 - in /manifoldcf/trunk: ./
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/
Author: kwright
Date: Tue May 7 15:46:56 2013
New Revision: 1479950
URL: http://svn.apache.org/r1479950
Log:
Revert CONNECTORS-674 changes.
Added:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
- copied unchanged from r1479919, manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/trunk/pom.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Reverse-merged /manifoldcf/branches/CONNECTORS-674:r1468663-1479918
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1479950&r1=1479949&r2=1479950&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue May 7 15:46:56 2013
@@ -6,10 +6,6 @@ $Id$
======================= Release 1.2 =====================
-CONNECTORS-674: Use Solrj 4.3.0, and get rid of our own hacked
-class, since it now should no longer be needed.
-(Ryan McKinley, Karl Wright)
-
CONNECTORS-682: Fix expect-continue issues with Solr when there is
a Solr delay of more than 3 seconds.
(Oleg Kalnichevski, Erlend Garåsen, Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1479950&r1=1479949&r2=1479950&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Tue May 7 15:46:56 2013
@@ -3639,7 +3639,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.3.0"/>
+ <param name="artifact-version" value="4.1.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/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1479950&r1=1479949&r2=1479950&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Tue May 7 15:46:56 2013
@@ -266,8 +266,7 @@ public class HttpPoster
}
String httpSolrServerUrl = protocol + "://" + server + ":" + port + location;
- HttpSolrServer httpSolrServer = new HttpSolrServer(httpSolrServerUrl, localClient, new XMLResponseParser());
- httpSolrServer.setUseMultiPartPost(true);
+ HttpSolrServer httpSolrServer = new ModifiedHttpSolrServer(httpSolrServerUrl, localClient, new XMLResponseParser());
// Set the solrj instance we want to use
solrServer = httpSolrServer;
}
Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1479950&r1=1479949&r2=1479950&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Tue May 7 15:46:56 2013
@@ -49,7 +49,7 @@
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
<httpcomponent.version>4.2.5</httpcomponent.version>
- <solr.version>4.3.0</solr.version>
+ <solr.version>4.1.0</solr.version>
<commons-el.version>1.0</commons-el.version>
<commons-lang.version>2.6</commons-lang.version>
<xalan.version>2.7.1</xalan.version>