diff --git a/.classpath b/.classpath index 32b306c38..b25c948cb 100644 --- a/.classpath +++ b/.classpath @@ -47,20 +47,6 @@ - - - - - - - - - - - - - - @@ -70,6 +56,20 @@ + + + + + + + + + + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 159b876e9..91444bd40 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -40,8 +40,6 @@ $JAVAROOT/lib/J7Zip-modified.jar $JAVAROOT/lib/activation.jar $JAVAROOT/lib/apache-mime4j-0.6.jar - $JAVAROOT/lib/apache-solr-core-4.0.0.jar - $JAVAROOT/lib/apache-solr-solrj-4.0.0.jar $JAVAROOT/lib/arq-2.8.7.jar $JAVAROOT/lib/bcmail-jdk15-145.jar $JAVAROOT/lib/bcprov-jdk15-145.jar @@ -74,17 +72,17 @@ $JAVAROOT/lib/json-simple-1.1.jar $JAVAROOT/lib/log4j-1.2.17.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar - $JAVAROOT/lib/lucene-analyzers-common-4.0.0.jar - $JAVAROOT/lib/lucene-analyzers-phonetic-4.0.0.jar - $JAVAROOT/lib/lucene-core-4.0.0.jar - $JAVAROOT/lib/lucene-grouping-4.0.0.jar - $JAVAROOT/lib/lucene-highlighter-4.0.0.jar - $JAVAROOT/lib/lucene-memory-4.0.0.jar - $JAVAROOT/lib/lucene-misc-4.0.0.jar - $JAVAROOT/lib/lucene-queries-4.0.0.jar - $JAVAROOT/lib/lucene-queryparser-4.0.0.jar - $JAVAROOT/lib/lucene-spatial-4.0.0.jar - $JAVAROOT/lib/lucene-suggest-4.0.0.jar + $JAVAROOT/lib/lucene-analyzers-common-4.1.0.jar + $JAVAROOT/lib/lucene-analyzers-phonetic-4.1.0.jar + $JAVAROOT/lib/lucene-core-4.1.0.jar + $JAVAROOT/lib/lucene-grouping-4.1.0.jar + $JAVAROOT/lib/lucene-highlighter-4.1.0.jar + $JAVAROOT/lib/lucene-memory-4.1.0.jar + $JAVAROOT/lib/lucene-misc-4.1.0.jar + $JAVAROOT/lib/lucene-queries-4.1.0.jar + $JAVAROOT/lib/lucene-queryparser-4.1.0.jar + $JAVAROOT/lib/lucene-spatial-4.1.0.jar + $JAVAROOT/lib/lucene-suggest-4.1.0.jar $JAVAROOT/lib/metadata-extractor-2.4.0-beta-1.jar $JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar $JAVAROOT/lib/pdfbox-1.7.1.jar @@ -94,13 +92,15 @@ $JAVAROOT/lib/servlet-api-2.5-20081211.jar $JAVAROOT/lib/slf4j-api-1.7.2.jar $JAVAROOT/lib/slf4j-jdk14-1.7.2.jar + $JAVAROOT/lib/solr-core-4.1.0.jar + $JAVAROOT/lib/solr-solrj-4.1.0.jar $JAVAROOT/lib/spatial4j-0.3.jar $JAVAROOT/lib/webcat-0.1-swf.jar $JAVAROOT/lib/wstx-asl-3.2.7.jar $JAVAROOT/lib/xercesImpl.jar $JAVAROOT/lib/xml-apis.jar $JAVAROOT/lib/yacycore.jar - $JAVAROOT/lib/zookeeper-3.3.6.jar + $JAVAROOT/lib/zookeeper-3.4.5.jar Properties diff --git a/build.xml b/build.xml index ce7df8ccf..2b1f2c92a 100644 --- a/build.xml +++ b/build.xml @@ -159,8 +159,6 @@ - - @@ -194,17 +192,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -214,12 +212,14 @@ + + - + diff --git a/lib/apache-solr-core-4.0.0.jar b/lib/apache-solr-core-4.0.0.jar deleted file mode 100644 index c0ed9c878..000000000 Binary files a/lib/apache-solr-core-4.0.0.jar and /dev/null differ diff --git a/lib/apache-solr-solrj-4.0.0.jar b/lib/apache-solr-solrj-4.0.0.jar deleted file mode 100644 index 4fe376aba..000000000 Binary files a/lib/apache-solr-solrj-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-analyzers-common-4.0.0.jar b/lib/lucene-analyzers-common-4.1.0.jar similarity index 78% rename from lib/lucene-analyzers-common-4.0.0.jar rename to lib/lucene-analyzers-common-4.1.0.jar index b5809d281..1e3c507e3 100644 Binary files a/lib/lucene-analyzers-common-4.0.0.jar and b/lib/lucene-analyzers-common-4.1.0.jar differ diff --git a/lib/lucene-analyzers-phonetic-4.0.0.jar b/lib/lucene-analyzers-phonetic-4.1.0.jar similarity index 65% rename from lib/lucene-analyzers-phonetic-4.0.0.jar rename to lib/lucene-analyzers-phonetic-4.1.0.jar index c41346505..dd673bc87 100644 Binary files a/lib/lucene-analyzers-phonetic-4.0.0.jar and b/lib/lucene-analyzers-phonetic-4.1.0.jar differ diff --git a/lib/lucene-core-4.0.0.jar b/lib/lucene-core-4.1.0.jar similarity index 51% rename from lib/lucene-core-4.0.0.jar rename to lib/lucene-core-4.1.0.jar index 17dc4a78b..834aa8fc1 100644 Binary files a/lib/lucene-core-4.0.0.jar and b/lib/lucene-core-4.1.0.jar differ diff --git a/lib/lucene-grouping-4.0.0.jar b/lib/lucene-grouping-4.0.0.jar deleted file mode 100644 index eedfc172d..000000000 Binary files a/lib/lucene-grouping-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-grouping-4.1.0.jar b/lib/lucene-grouping-4.1.0.jar new file mode 100644 index 000000000..1dd4bcbaf Binary files /dev/null and b/lib/lucene-grouping-4.1.0.jar differ diff --git a/lib/lucene-highlighter-4.0.0.jar b/lib/lucene-highlighter-4.0.0.jar deleted file mode 100644 index ba8bd2cb7..000000000 Binary files a/lib/lucene-highlighter-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-highlighter-4.1.0.jar b/lib/lucene-highlighter-4.1.0.jar new file mode 100644 index 000000000..94222fc3e Binary files /dev/null and b/lib/lucene-highlighter-4.1.0.jar differ diff --git a/lib/lucene-memory-4.0.0.jar b/lib/lucene-memory-4.0.0.jar deleted file mode 100644 index 052e5bcb0..000000000 Binary files a/lib/lucene-memory-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-memory-4.1.0.jar b/lib/lucene-memory-4.1.0.jar new file mode 100644 index 000000000..3ddf657fe Binary files /dev/null and b/lib/lucene-memory-4.1.0.jar differ diff --git a/lib/lucene-misc-4.0.0.jar b/lib/lucene-misc-4.1.0.jar similarity index 65% rename from lib/lucene-misc-4.0.0.jar rename to lib/lucene-misc-4.1.0.jar index a81d08726..2529dfb65 100644 Binary files a/lib/lucene-misc-4.0.0.jar and b/lib/lucene-misc-4.1.0.jar differ diff --git a/lib/lucene-queries-4.0.0.jar b/lib/lucene-queries-4.0.0.jar deleted file mode 100644 index fdd61ec94..000000000 Binary files a/lib/lucene-queries-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-queries-4.1.0.jar b/lib/lucene-queries-4.1.0.jar new file mode 100644 index 000000000..2a5c4345d Binary files /dev/null and b/lib/lucene-queries-4.1.0.jar differ diff --git a/lib/lucene-queryparser-4.0.0.jar b/lib/lucene-queryparser-4.1.0.jar similarity index 52% rename from lib/lucene-queryparser-4.0.0.jar rename to lib/lucene-queryparser-4.1.0.jar index 47e403f04..72a2db916 100644 Binary files a/lib/lucene-queryparser-4.0.0.jar and b/lib/lucene-queryparser-4.1.0.jar differ diff --git a/lib/lucene-spatial-4.0.0.jar b/lib/lucene-spatial-4.0.0.jar deleted file mode 100644 index 5e3a13b8e..000000000 Binary files a/lib/lucene-spatial-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-spatial-4.1.0.jar b/lib/lucene-spatial-4.1.0.jar new file mode 100644 index 000000000..3a6daf5a3 Binary files /dev/null and b/lib/lucene-spatial-4.1.0.jar differ diff --git a/lib/lucene-suggest-4.0.0.jar b/lib/lucene-suggest-4.0.0.jar deleted file mode 100644 index f5e4286f2..000000000 Binary files a/lib/lucene-suggest-4.0.0.jar and /dev/null differ diff --git a/lib/lucene-suggest-4.1.0.jar b/lib/lucene-suggest-4.1.0.jar new file mode 100644 index 000000000..176eab9f1 Binary files /dev/null and b/lib/lucene-suggest-4.1.0.jar differ diff --git a/lib/apache-solr-core-4.0.0.License b/lib/solr-core-4.1.0.License similarity index 100% rename from lib/apache-solr-core-4.0.0.License rename to lib/solr-core-4.1.0.License diff --git a/lib/solr-core-4.1.0.jar b/lib/solr-core-4.1.0.jar new file mode 100644 index 000000000..8d558f8cf Binary files /dev/null and b/lib/solr-core-4.1.0.jar differ diff --git a/lib/apache-solr-solrj-4.0.0.License b/lib/solr-solrj-4.1.0.License similarity index 100% rename from lib/apache-solr-solrj-4.0.0.License rename to lib/solr-solrj-4.1.0.License diff --git a/lib/solr-solrj-4.1.0.jar b/lib/solr-solrj-4.1.0.jar new file mode 100644 index 000000000..1053e9495 Binary files /dev/null and b/lib/solr-solrj-4.1.0.jar differ diff --git a/lib/zookeeper-3.3.6.jar b/lib/zookeeper-3.3.6.jar deleted file mode 100644 index 1c140efb5..000000000 Binary files a/lib/zookeeper-3.3.6.jar and /dev/null differ diff --git a/lib/zookeeper-3.4.5.jar b/lib/zookeeper-3.4.5.jar new file mode 100644 index 000000000..a7966bbbc Binary files /dev/null and b/lib/zookeeper-3.4.5.jar differ diff --git a/source/net/yacy/cora/federate/solr/SolrServlet.java b/source/net/yacy/cora/federate/solr/SolrServlet.java index f6f661bfd..41f9b657a 100644 --- a/source/net/yacy/cora/federate/solr/SolrServlet.java +++ b/source/net/yacy/cora/federate/solr/SolrServlet.java @@ -45,8 +45,8 @@ import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector; import org.apache.lucene.document.Document; import org.apache.solr.common.SolrException; +import org.apache.solr.common.params.MultiMapSolrParams; import org.apache.solr.core.SolrCore; -import org.apache.solr.request.ServletSolrParams; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.QueryResponseWriter; @@ -55,6 +55,7 @@ import org.apache.solr.response.XMLResponseWriter; import org.apache.solr.search.DocIterator; import org.apache.solr.search.DocList; import org.apache.solr.search.SolrIndexSearcher; +import org.apache.solr.servlet.SolrRequestParsers; import org.apache.solr.servlet.cache.HttpCacheHeaderUtil; import org.apache.solr.servlet.cache.Method; import org.apache.solr.util.FastWriter; @@ -126,7 +127,8 @@ public class SolrServlet implements Filter { // prepare request to solr hrequest.setAttribute("org.apache.solr.CoreContainer", core); - req = connector.request(new ServletSolrParams(hrequest)); + MultiMapSolrParams mmsp = SolrRequestParsers.parseQueryString(hrequest.getQueryString()); + req = connector.request(mmsp); SolrQueryResponse rsp = connector.query(req); diff --git a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java index 6a204f4c5..25e5946af 100644 --- a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java @@ -24,8 +24,6 @@ package net.yacy.cora.federate.solr.connector; import java.io.File; import java.io.IOException; -import javax.xml.parsers.ParserConfigurationException; - import net.yacy.cora.federate.solr.SolrServlet; import net.yacy.cora.federate.solr.YaCySchema; import net.yacy.kelondro.logging.Log; @@ -50,7 +48,6 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.response.SolrQueryResponse; -import org.xml.sax.SAXException; import com.google.common.io.Files; @@ -97,17 +94,11 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo } } - try { + this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml")); + if (this.cores == null) { + // try again + System.gc(); this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml")); - if (this.cores == null) { - // try again - System.gc(); - this.cores = new CoreContainer(storagePath.getAbsolutePath(), new File(solr_config, "solr.xml")); - } - } catch (ParserConfigurationException e) { - throw new IOException(e.getMessage(), e); - } catch (SAXException e) { - throw new IOException(e.getMessage(), e); } this.defaultCoreName = this.cores.getDefaultCoreName(); this.defaultCore = this.cores.getCore(this.defaultCoreName); // should be "collection1" diff --git a/source/net/yacy/search/index/Fulltext.java b/source/net/yacy/search/index/Fulltext.java index 8b50d2d4b..24fe458de 100644 --- a/source/net/yacy/search/index/Fulltext.java +++ b/source/net/yacy/search/index/Fulltext.java @@ -65,10 +65,10 @@ import net.yacy.kelondro.util.MemoryControl; import net.yacy.search.Switchboard; import org.apache.commons.httpclient.util.DateUtil; -import org.apache.lucene.util.Version; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; +import org.apache.lucene.util.Version; public final class Fulltext { @@ -155,9 +155,10 @@ public final class Fulltext { if (commitWithin >= 0) esc.setCommitWithinMs(commitWithin); Version luceneVersion = esc.getConfig().getLuceneVersion("luceneMatchVersion"); String lvn = luceneVersion.name(); + Log.logInfo("Fulltext", "using lucene version " + lvn); int p = lvn.indexOf('_'); assert SOLR_PATH.endsWith(lvn.substring(p)) : "luceneVersion = " + lvn + ", solrPath = " + SOLR_PATH + ", p = " + p + ", check defaults/solr/solrconfig.xml"; - Log.logInfo("MetadataRepository", "connected solr in " + solrLocation.toString() + ", lucene version " + lvn); + Log.logInfo("Fulltext", "connected solr in " + solrLocation.toString() + ", lucene version " + lvn); this.solr.connect0(esc); }