diff --git a/.classpath b/.classpath index 1e42ce759..a26f288eb 100644 --- a/.classpath +++ b/.classpath @@ -25,7 +25,6 @@ - @@ -52,25 +51,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 47d3bb6c7..284f1506e 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -61,28 +61,28 @@ $JAVAROOT/lib/J7Zip-modified.jar $JAVAROOT/lib/jakarta-oro-2.0.8.jar $JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar - $JAVAROOT/lib/jcifs-1.3.15.jar + $JAVAROOT/lib/jcifs-1.3.17.jar $JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar $JAVAROOT/lib/jempbox-1.8.1.jar $JAVAROOT/lib/jena-2.6.4.jar $JAVAROOT/lib/jsch-0.1.42.jar $JAVAROOT/lib/json-simple-1.1.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar - $JAVAROOT/lib/lucene-analyzers-common-4.3.0.jar - $JAVAROOT/lib/lucene-analyzers-phonetic-4.3.0.jar - $JAVAROOT/lib/lucene-classification-4.3.0.jar - $JAVAROOT/lib/lucene-codecs-4.3.0.jar - $JAVAROOT/lib/lucene-core-4.3.0.jar - $JAVAROOT/lib/lucene-facet-4.3.0.jar - $JAVAROOT/lib/lucene-grouping-4.3.0.jar - $JAVAROOT/lib/lucene-highlighter-4.3.0.jar - $JAVAROOT/lib/lucene-join-4.3.0.jar - $JAVAROOT/lib/lucene-memory-4.3.0.jar - $JAVAROOT/lib/lucene-misc-4.3.0.jar - $JAVAROOT/lib/lucene-queries-4.3.0.jar - $JAVAROOT/lib/lucene-queryparser-4.3.0.jar - $JAVAROOT/lib/lucene-spatial-4.3.0.jar - $JAVAROOT/lib/lucene-suggest-4.3.0.jar + $JAVAROOT/lib/lucene-analyzers-common-4.4.0.jar + $JAVAROOT/lib/lucene-analyzers-phonetic-4.4.0.jar + $JAVAROOT/lib/lucene-classification-4.4.0.jar + $JAVAROOT/lib/lucene-codecs-4.4.0.jar + $JAVAROOT/lib/lucene-core-4.4.0.jar + $JAVAROOT/lib/lucene-facet-4.4.0.jar + $JAVAROOT/lib/lucene-grouping-4.4.0.jar + $JAVAROOT/lib/lucene-highlighter-4.4.0.jar + $JAVAROOT/lib/lucene-join-4.4.0.jar + $JAVAROOT/lib/lucene-memory-4.4.0.jar + $JAVAROOT/lib/lucene-misc-4.4.0.jar + $JAVAROOT/lib/lucene-queries-4.4.0.jar + $JAVAROOT/lib/lucene-queryparser-4.4.0.jar + $JAVAROOT/lib/lucene-spatial-4.4.0.jar + $JAVAROOT/lib/lucene-suggest-4.4.0.jar $JAVAROOT/lib/metadata-extractor-2.6.2.jar $JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar $JAVAROOT/lib/noggit-0.5.jar @@ -93,8 +93,8 @@ $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.3.0.jar - $JAVAROOT/lib/solr-solrj-4.3.0.jar + $JAVAROOT/lib/solr-core-4.4.0.jar + $JAVAROOT/lib/solr-solrj-4.4.0.jar $JAVAROOT/lib/spatial4j-0.3.jar $JAVAROOT/lib/webcat-0.1-swf.jar $JAVAROOT/lib/wstx-asl-3.2.9.jar diff --git a/build.xml b/build.xml index c0e01449a..8c2904048 100644 --- a/build.xml +++ b/build.xml @@ -179,7 +179,7 @@ - + @@ -187,21 +187,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -212,8 +212,8 @@ - - + + diff --git a/lib/jcifs-1.3.15.jar b/lib/jcifs-1.3.15.jar deleted file mode 100644 index dddb1bfb6..000000000 Binary files a/lib/jcifs-1.3.15.jar and /dev/null differ diff --git a/lib/jcifs-1.3.15-LICENSE.txt b/lib/jcifs-1.3.17-LICENSE.txt similarity index 100% rename from lib/jcifs-1.3.15-LICENSE.txt rename to lib/jcifs-1.3.17-LICENSE.txt diff --git a/lib/jcifs-1.3.17.jar b/lib/jcifs-1.3.17.jar new file mode 100644 index 000000000..ae4c8d86b Binary files /dev/null and b/lib/jcifs-1.3.17.jar differ diff --git a/lib/lucene-analyzers-common-4.3.0.jar b/lib/lucene-analyzers-common-4.4.0.jar similarity index 88% rename from lib/lucene-analyzers-common-4.3.0.jar rename to lib/lucene-analyzers-common-4.4.0.jar index f75c9f143..1784e5704 100644 Binary files a/lib/lucene-analyzers-common-4.3.0.jar and b/lib/lucene-analyzers-common-4.4.0.jar differ diff --git a/lib/lucene-analyzers-phonetic-4.3.0.jar b/lib/lucene-analyzers-phonetic-4.4.0.jar similarity index 68% rename from lib/lucene-analyzers-phonetic-4.3.0.jar rename to lib/lucene-analyzers-phonetic-4.4.0.jar index a19bde23a..dacf818a1 100644 Binary files a/lib/lucene-analyzers-phonetic-4.3.0.jar and b/lib/lucene-analyzers-phonetic-4.4.0.jar differ diff --git a/lib/lucene-classification-4.3.0.jar b/lib/lucene-classification-4.4.0.jar similarity index 59% rename from lib/lucene-classification-4.3.0.jar rename to lib/lucene-classification-4.4.0.jar index cbb852b80..5aa7e6982 100644 Binary files a/lib/lucene-classification-4.3.0.jar and b/lib/lucene-classification-4.4.0.jar differ diff --git a/lib/lucene-codecs-4.3.0.jar b/lib/lucene-codecs-4.4.0.jar similarity index 79% rename from lib/lucene-codecs-4.3.0.jar rename to lib/lucene-codecs-4.4.0.jar index c987ea0e5..844444167 100644 Binary files a/lib/lucene-codecs-4.3.0.jar and b/lib/lucene-codecs-4.4.0.jar differ diff --git a/lib/lucene-core-4.3.0.jar b/lib/lucene-core-4.4.0.jar similarity index 68% rename from lib/lucene-core-4.3.0.jar rename to lib/lucene-core-4.4.0.jar index cf67a6ffc..df4eae6da 100644 Binary files a/lib/lucene-core-4.3.0.jar and b/lib/lucene-core-4.4.0.jar differ diff --git a/lib/lucene-facet-4.3.0.jar b/lib/lucene-facet-4.4.0.jar similarity index 67% rename from lib/lucene-facet-4.3.0.jar rename to lib/lucene-facet-4.4.0.jar index 2e5e0841e..17ac873fd 100644 Binary files a/lib/lucene-facet-4.3.0.jar and b/lib/lucene-facet-4.4.0.jar differ diff --git a/lib/lucene-grouping-4.3.0.jar b/lib/lucene-grouping-4.4.0.jar similarity index 88% rename from lib/lucene-grouping-4.3.0.jar rename to lib/lucene-grouping-4.4.0.jar index a0e077eeb..de433151b 100644 Binary files a/lib/lucene-grouping-4.3.0.jar and b/lib/lucene-grouping-4.4.0.jar differ diff --git a/lib/lucene-highlighter-4.3.0.jar b/lib/lucene-highlighter-4.4.0.jar similarity index 68% rename from lib/lucene-highlighter-4.3.0.jar rename to lib/lucene-highlighter-4.4.0.jar index 5490be70c..69d342337 100644 Binary files a/lib/lucene-highlighter-4.3.0.jar and b/lib/lucene-highlighter-4.4.0.jar differ diff --git a/lib/lucene-join-4.3.0.jar b/lib/lucene-join-4.3.0.jar deleted file mode 100644 index 08919dd4d..000000000 Binary files a/lib/lucene-join-4.3.0.jar and /dev/null differ diff --git a/lib/lucene-join-4.4.0.jar b/lib/lucene-join-4.4.0.jar new file mode 100644 index 000000000..aed5e4b03 Binary files /dev/null and b/lib/lucene-join-4.4.0.jar differ diff --git a/lib/lucene-memory-4.3.0.jar b/lib/lucene-memory-4.3.0.jar deleted file mode 100644 index 05065b77a..000000000 Binary files a/lib/lucene-memory-4.3.0.jar and /dev/null differ diff --git a/lib/lucene-memory-4.4.0.jar b/lib/lucene-memory-4.4.0.jar new file mode 100644 index 000000000..74b547eea Binary files /dev/null and b/lib/lucene-memory-4.4.0.jar differ diff --git a/lib/lucene-misc-4.3.0.jar b/lib/lucene-misc-4.4.0.jar similarity index 63% rename from lib/lucene-misc-4.3.0.jar rename to lib/lucene-misc-4.4.0.jar index b9587c6e8..874a5f0f9 100644 Binary files a/lib/lucene-misc-4.3.0.jar and b/lib/lucene-misc-4.4.0.jar differ diff --git a/lib/lucene-queries-4.3.0.jar b/lib/lucene-queries-4.4.0.jar similarity index 79% rename from lib/lucene-queries-4.3.0.jar rename to lib/lucene-queries-4.4.0.jar index 5712bffa6..07f36be02 100644 Binary files a/lib/lucene-queries-4.3.0.jar and b/lib/lucene-queries-4.4.0.jar differ diff --git a/lib/lucene-queryparser-4.3.0.jar b/lib/lucene-queryparser-4.4.0.jar similarity index 82% rename from lib/lucene-queryparser-4.3.0.jar rename to lib/lucene-queryparser-4.4.0.jar index 454b73cef..b28364806 100644 Binary files a/lib/lucene-queryparser-4.3.0.jar and b/lib/lucene-queryparser-4.4.0.jar differ diff --git a/lib/lucene-spatial-4.3.0.jar b/lib/lucene-spatial-4.4.0.jar similarity index 79% rename from lib/lucene-spatial-4.3.0.jar rename to lib/lucene-spatial-4.4.0.jar index c272f0f7a..b49473634 100644 Binary files a/lib/lucene-spatial-4.3.0.jar and b/lib/lucene-spatial-4.4.0.jar differ diff --git a/lib/lucene-suggest-4.3.0.jar b/lib/lucene-suggest-4.4.0.jar similarity index 67% rename from lib/lucene-suggest-4.3.0.jar rename to lib/lucene-suggest-4.4.0.jar index c8b6853f2..1f4a9cf50 100644 Binary files a/lib/lucene-suggest-4.3.0.jar and b/lib/lucene-suggest-4.4.0.jar differ diff --git a/lib/solr-core-4.3.0.jar b/lib/solr-core-4.4.0.jar similarity index 50% rename from lib/solr-core-4.3.0.jar rename to lib/solr-core-4.4.0.jar index bfcf9ad7f..54ae931d9 100644 Binary files a/lib/solr-core-4.3.0.jar and b/lib/solr-core-4.4.0.jar differ diff --git a/lib/solr-solrj-4.3.0.License b/lib/solr-solrj-4.4.0.License similarity index 100% rename from lib/solr-solrj-4.3.0.License rename to lib/solr-solrj-4.4.0.License diff --git a/lib/solr-solrj-4.3.0.jar b/lib/solr-solrj-4.4.0.jar similarity index 67% rename from lib/solr-solrj-4.3.0.jar rename to lib/solr-solrj-4.4.0.jar index e4ae546fd..e8bc1e45e 100644 Binary files a/lib/solr-solrj-4.3.0.jar and b/lib/solr-solrj-4.4.0.jar differ diff --git a/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java b/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java index 04baa2649..897a4c640 100644 --- a/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java @@ -79,7 +79,7 @@ public class EmbeddedInstance implements SolrInstance { // initialize the coreContainer String containerDir = this.containerPath.getAbsolutePath(); // the home directory of all resources. File configFile = new File(solr_config, "solr.xml"); // the configuration file for all cores - this.coreContainer = new CoreContainer(containerDir, configFile); // this may take indefinitely long if solr files are broken + this.coreContainer = CoreContainer.createAndLoad(containerDir, configFile); // this may take indefinitely long if solr files are broken if (this.coreContainer == null) throw new IOException("cannot create core container dir = " + containerDir + ", configFile = " + configFile); // get the default core from the coreContainer