[DL-Learner SVN] SF.net SVN: dl-learner:[3909] trunk

[<lor...@us...>]

Revision: 3909
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3909&view=rev
Author:   lorenz_b
Date:     2013-03-04 10:48:54 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
Updated SOLR lib.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java
    trunk/pom.xml

Modified: trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java	2013-03-02 09:41:31 UTC (rev 3908)
+++ trunk/components-ext/src/main/java/org/dllearner/common/index/SOLRIndex.java	2013-03-04 10:48:54 UTC (rev 3909)
@@ -1,6 +1,5 @@
 package org.dllearner.common.index;
 
-import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -8,7 +7,7 @@
 import org.apache.solr.client.solrj.SolrQuery.ORDER;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
@@ -16,7 +15,7 @@
 
 public class SOLRIndex implements Index{
 	
-private CommonsHttpSolrServer server;
+private HttpSolrServer server;
 	
 	private static final int DEFAULT_LIMIT = 10;
 	private static final int DEFAULT_OFFSET = 0;
@@ -29,12 +28,8 @@
 	private boolean restrictiveSearch = true;
 	
 	public SOLRIndex(String solrServerURL){
-		try {
-			server = new CommonsHttpSolrServer(solrServerURL);
-			server.setRequestWriter(new BinaryRequestWriter());
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		}
+		server = new HttpSolrServer(solrServerURL);
+		server.setRequestWriter(new BinaryRequestWriter());
 	}
 	
 	public void setSearchFields(String primarySearchField, String secondarySearchField){

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2013-03-02 09:41:31 UTC (rev 3908)
+++ trunk/pom.xml	2013-03-04 10:48:54 UTC (rev 3909)
@@ -20,6 +20,7 @@
 
         <slf4j.version>1.6.4</slf4j.version>
         <log4j.version>1.2.16</log4j.version>
+        <solr.version>4.1.0</solr.version>
 	</properties>
 
 	<modules>
@@ -164,7 +165,7 @@
             <dependency>
                 <groupId>org.apache.solr</groupId>
                 <artifactId>solr-core</artifactId>
-                <version>3.5.0</version>
+                <version>${solr.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.