svn commit: r1554202 - in /manifoldcf/branches/CONNECTORS-674-2: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/

[kwright]

Author: kwright
Date: Mon Dec 30 13:03:35 2013
New Revision: 1554202

URL: http://svn.apache.org/r1554202
Log:
Merge changes from old CONNECTORS-674 branch

Removed:
    
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpMultipart.java
    
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
    
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrServer.java
    
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedMultipartEntity.java
Modified:
    manifoldcf/branches/CONNECTORS-674-2/   (props changed)
    
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

Propchange: manifoldcf/branches/CONNECTORS-674-2/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-674:r1468663-1554199

Modified: 
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1554202&r1=1554201&r2=1554202&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-674-2/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
 Mon Dec 30 13:03:35 2013
@@ -159,7 +159,7 @@ public class HttpPoster
     
     try
     {
-      CloudSolrServer cloudSolrServer = new CloudSolrServer(zookeeperHosts, 
new ModifiedLBHttpSolrServer(HttpClientUtil.createClient(null)));
+      CloudSolrServer cloudSolrServer = new CloudSolrServer(zookeeperHosts/*, 
new ModifiedLBHttpSolrServer(HttpClientUtil.createClient(null))*/);
       cloudSolrServer.setZkClientTimeout(zkClientTimeout);
       cloudSolrServer.setZkConnectTimeout(zkConnectTimeout);
       cloudSolrServer.setDefaultCollection(collection);
@@ -270,7 +270,8 @@ public class HttpPoster
     }
 
     String httpSolrServerUrl = protocol + "://" + server + ":" + port + 
location;
-    HttpSolrServer httpSolrServer = new 
ModifiedHttpSolrServer(httpSolrServerUrl, localClient, new XMLResponseParser());
+    HttpSolrServer httpSolrServer = new HttpSolrServer(httpSolrServerUrl, 
localClient, new XMLResponseParser());
+    httpSolrServer.setUseMultiPartPost(true);
     // Set the solrj instance we want to use
     solrServer = httpSolrServer;
   }