boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

migration to solr 4.4.0

Browse Source
pull/1/head
Michael Peter Christen 11 years ago
parent dc1002e511
commit f13df9dbb6
27 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File

36
.classpath
Unescape View File

@ -25,7 +25,6 @@
<classpathentry kind="lib" path="lib/jsch-0.1.42.jar"/> <classpathentry kind="lib" path="lib/jsch-0.1.42.jar"/>
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/> <classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.12-bin.jar"/> <classpathentry kind="lib" path="lib/mysql-connector-java-5.1.12-bin.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.15.jar"/>
<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/> <classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.2.jar"/> <classpathentry kind="lib" path="lib/commons-fileupload-1.2.2.jar"/>
<classpathentry kind="lib" path="lib/json-simple-1.1.jar"/> <classpathentry kind="lib" path="lib/json-simple-1.1.jar"/>
@ -52,25 +51,26 @@
<classpathentry kind="lib" path="lib/httpclient-4.2.5.jar"/> <classpathentry kind="lib" path="lib/httpclient-4.2.5.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.2.4.jar"/> <classpathentry kind="lib" path="lib/httpcore-4.2.4.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.2.5.jar"/> <classpathentry kind="lib" path="lib/httpmime-4.2.5.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.3.0.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.5.jar"/> <classpathentry kind="lib" path="lib/noggit-0.5.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/> <classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/> <classpathentry kind="lib" path="lib/icu4j-core.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/> <classpathentry kind="lib" path="lib/htmllexer.jar"/>

36
addon/YaCy.app/Contents/Info.plist
Unescape View File

@ -61,28 +61,28 @@
<string>$JAVAROOT/lib/J7Zip-modified.jar</string> <string>$JAVAROOT/lib/J7Zip-modified.jar</string>
<string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string> <string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string>
<string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar</string> <string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar</string>
<string>$JAVAROOT/lib/jcifs-1.3.15.jar</string> <string>$JAVAROOT/lib/jcifs-1.3.17.jar</string>
<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string> <string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/jempbox-1.8.1.jar</string> <string>$JAVAROOT/lib/jempbox-1.8.1.jar</string>
<string>$JAVAROOT/lib/jena-2.6.4.jar</string> <string>$JAVAROOT/lib/jena-2.6.4.jar</string>
<string>$JAVAROOT/lib/jsch-0.1.42.jar</string> <string>$JAVAROOT/lib/jsch-0.1.42.jar</string>
<string>$JAVAROOT/lib/json-simple-1.1.jar</string> <string>$JAVAROOT/lib/json-simple-1.1.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string> <string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-common-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-classification-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-codecs-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-core-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-facet-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-grouping-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-highlighter-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-join-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-memory-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-misc-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-queries-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-queryparser-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-spatial-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.3.0.jar</string> <string>$JAVAROOT/lib/lucene-suggest-4.4.0.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string> <string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string>
<string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string> <string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string>
<string>$JAVAROOT/lib/noggit-0.5.jar</string> <string>$JAVAROOT/lib/noggit-0.5.jar</string>
@ -93,8 +93,8 @@
<string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string> <string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string> <string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
<string>$JAVAROOT/lib/solr-core-4.3.0.jar</string> <string>$JAVAROOT/lib/solr-core-4.4.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.3.0.jar</string> <string>$JAVAROOT/lib/solr-solrj-4.4.0.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.3.jar</string> <string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string> <string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string> <string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>

36
build.xml
Unescape View File

@ -179,7 +179,7 @@
<pathelement location="${lib}/J7Zip-modified.jar" /> <pathelement location="${lib}/J7Zip-modified.jar" />
<pathelement location="${lib}/jakarta-oro-2.0.8.jar" /> <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" /> <pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
<pathelement location="${lib}/jcifs-1.3.15.jar" /> <pathelement location="${lib}/jcifs-1.3.17.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" /> <pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/jempbox-1.8.1" /> <pathelement location="${lib}/jempbox-1.8.1" />
<pathelement location="${lib}/jena-2.6.4.jar" /> <pathelement location="${lib}/jena-2.6.4.jar" />
@ -187,21 +187,21 @@
<pathelement location="${lib}/json-simple-1.1.jar" /> <pathelement location="${lib}/json-simple-1.1.jar" />
<pathelement location="${lib}/jsoup-1.6.3.jar" /> <pathelement location="${lib}/jsoup-1.6.3.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" /> <pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.3.0.jar" /> <pathelement location="${lib}/lucene-analyzers-common-4.4.0.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.3.0.jar" /> <pathelement location="${lib}/lucene-analyzers-phonetic-4.4.0.jar" />
<pathelement location="${lib}/lucene-classification-4.3.0.jar" /> <pathelement location="${lib}/lucene-classification-4.4.0.jar" />
<pathelement location="${lib}/lucene-codecs-4.3.0.jar" /> <pathelement location="${lib}/lucene-codecs-4.4.0.jar" />
<pathelement location="${lib}/lucene-core-4.3.0.jar" /> <pathelement location="${lib}/lucene-core-4.4.0.jar" />
<pathelement location="${lib}/lucene-facet-4.3.0.jar" /> <pathelement location="${lib}/lucene-facet-4.4.0.jar" />
<pathelement location="${lib}/lucene-grouping-4.3.0.jar" /> <pathelement location="${lib}/lucene-grouping-4.4.0.jar" />
<pathelement location="${lib}/lucene-highlighter-4.3.0.jar" /> <pathelement location="${lib}/lucene-highlighter-4.4.0.jar" />
<pathelement location="${lib}/lucene-join-4.3.0.jar" /> <pathelement location="${lib}/lucene-join-4.4.0.jar" />
<pathelement location="${lib}/lucene-memory-4.3.0.jar" /> <pathelement location="${lib}/lucene-memory-4.4.0.jar" />
<pathelement location="${lib}/lucene-misc-4.3.0.jar" /> <pathelement location="${lib}/lucene-misc-4.4.0.jar" />
<pathelement location="${lib}/lucene-queries-4.3.0.jar" /> <pathelement location="${lib}/lucene-queries-4.4.0.jar" />
<pathelement location="${lib}/lucene-queryparser-4.3.0.jar" /> <pathelement location="${lib}/lucene-queryparser-4.4.0.jar" />
<pathelement location="${lib}/lucene-spatial-4.3.0.jar" /> <pathelement location="${lib}/lucene-spatial-4.4.0.jar" />
<pathelement location="${lib}/lucene-suggest-4.3.0.jar" /> <pathelement location="${lib}/lucene-suggest-4.4.0.jar" />
<pathelement location="${lib}/metadata-extractor-2.6.2.jar" /> <pathelement location="${lib}/metadata-extractor-2.6.2.jar" />
<pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" /> <pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" />
<pathelement location="${lib}/noggit-0.5.jar" /> <pathelement location="${lib}/noggit-0.5.jar" />
@ -212,8 +212,8 @@
<pathelement location="${lib}/servlet-api-2.5-20081211.jar" /> <pathelement location="${lib}/servlet-api-2.5-20081211.jar" />
<pathelement location="${lib}/slf4j-api-1.7.2.jar" /> <pathelement location="${lib}/slf4j-api-1.7.2.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" /> <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
<pathelement location="${lib}/solr-core-4.3.0.jar" /> <pathelement location="${lib}/solr-core-4.4.0.jar" />
<pathelement location="${lib}/solr-solrj-4.3.0.jar" /> <pathelement location="${lib}/solr-solrj-4.4.0.jar" />
<pathelement location="${lib}/spatial4j-0.3.jar" /> <pathelement location="${lib}/spatial4j-0.3.jar" />
<pathelement location="${lib}/webcat-0.1-swf.jar" /> <pathelement location="${lib}/webcat-0.1-swf.jar" />
<pathelement location="${lib}/wstx-asl-3.2.9.jar" /> <pathelement location="${lib}/wstx-asl-3.2.9.jar" />

BIN
lib/jcifs-1.3.15.jar
View File

Binary file not shown.

0
lib/jcifs-1.3.15-LICENSE.txt → lib/jcifs-1.3.17-LICENSE.txt
Unescape View File

BIN
lib/jcifs-1.3.17.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-common-4.3.0.jar → lib/lucene-analyzers-common-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-phonetic-4.3.0.jar → lib/lucene-analyzers-phonetic-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-classification-4.3.0.jar → lib/lucene-classification-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-codecs-4.3.0.jar → lib/lucene-codecs-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-core-4.3.0.jar → lib/lucene-core-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-facet-4.3.0.jar → lib/lucene-facet-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-grouping-4.3.0.jar → lib/lucene-grouping-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-highlighter-4.3.0.jar → lib/lucene-highlighter-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-join-4.3.0.jar
View File

Binary file not shown.

BIN
lib/lucene-join-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.3.0.jar
View File

Binary file not shown.

BIN
lib/lucene-memory-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-misc-4.3.0.jar → lib/lucene-misc-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queries-4.3.0.jar → lib/lucene-queries-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-queryparser-4.3.0.jar → lib/lucene-queryparser-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-spatial-4.3.0.jar → lib/lucene-spatial-4.4.0.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.3.0.jar → lib/lucene-suggest-4.4.0.jar
View File

Binary file not shown.

BIN
lib/solr-core-4.3.0.jar → lib/solr-core-4.4.0.jar
View File

Binary file not shown.

0
lib/solr-solrj-4.3.0.License → lib/solr-solrj-4.4.0.License
Unescape View File

BIN
lib/solr-solrj-4.3.0.jar → lib/solr-solrj-4.4.0.jar
View File

Binary file not shown.

2
source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java
Unescape View File

@ -79,7 +79,7 @@ public class EmbeddedInstance implements SolrInstance {
// initialize the coreContainer // initialize the coreContainer
String containerDir = this.containerPath.getAbsolutePath(); // the home directory of all resources. 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 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); if (this.coreContainer == null) throw new IOException("cannot create core container dir = " + containerDir + ", configFile = " + configFile);
// get the default core from the coreContainer // get the default core from the coreContainer

Write Preview
Loading…
Cancel
Save