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

backmigration from solrj 4.6.0 to 4.5.1. This is necessary because

Browse Source 
solrj.4.6.0 has a bug which prevents the attachment of a remote solr (as
tested with a SolrCloud). See bug report
https://issues.apache.org/jira/browse/SOLR-5532
This bug shall be fixed in Solr 4.6.1.
Fortunately, solrj-4.5.1 works together with solr-4.6.0 thus the current
index does not need to be changed.
pull/1/head
Michael Peter Christen 11 years ago
parent 6e2fe777af
commit 84cf7e8e9f
4 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File

182
.classpath
Unescape View File

@ -1,91 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="source"/>
<classpathentry excluding="api/|env/|processing/domaingraph/applet/|yacy/|api/bookmarks/|api/ymarks/|api/bookmarks/posts/|api/bookmarks/tags/|api/bookmarks/xbel/|solr/|gsa/|solr/collection1/" kind="src" path="htroot"/>
<classpathentry excluding="bookmarks/|ymarks/|bookmarks/posts/|bookmarks/tags/|bookmarks/xbel/" kind="src" path="htroot/api"/>
<classpathentry kind="src" path="htroot/env"/>
<classpathentry kind="src" path="htroot/yacy"/>
<classpathentry excluding="posts/|tags/|xbel/" kind="src" path="htroot/api/bookmarks"/>
<classpathentry kind="src" path="htroot/api/ymarks"/>
<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/J7Zip-modified.jar"/>
<classpathentry kind="lib" path="lib/webcat-0.1-swf.jar"/>
<classpathentry kind="lib" path="lib/activation.jar"/>
<classpathentry kind="lib" path="lib/commons-jxpath-1.3.jar"/>
<classpathentry kind="lib" path="lib/poi-3.9-20121203.jar"/>
<classpathentry kind="lib" path="lib/poi-scratchpad-3.9-20121203.jar"/>
<classpathentry kind="lib" path="lib/bcmail-jdk15-145.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15-145.jar"/>
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.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/json-simple-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/xml-apis.jar"/>
<classpathentry kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.4.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.3.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.5.jar"/>
<classpathentry kind="lib" path="lib/guava-15.0.jar"/>
<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.3.1.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/jcifs-1.3.17.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.8.3.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.8.3.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.8.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.6.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/>
<classpathentry kind="lib" path="lib/jena-2.6.4.jar"/>
<classpathentry kind="lib" path="lib/sax-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/arq-2.8.7.jar"/>
<classpathentry kind="lib" path="lib/iri-0.8.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.6.3.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/servlet-api-3.0.jar"/>
<classpathentry kind="output" path="gen"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="source"/>
<classpathentry excluding="api/|env/|processing/domaingraph/applet/|yacy/|api/bookmarks/|api/ymarks/|api/bookmarks/posts/|api/bookmarks/tags/|api/bookmarks/xbel/|solr/|gsa/|solr/collection1/" kind="src" path="htroot"/>
<classpathentry excluding="bookmarks/|ymarks/|bookmarks/posts/|bookmarks/tags/|bookmarks/xbel/" kind="src" path="htroot/api"/>
<classpathentry kind="src" path="htroot/env"/>
<classpathentry kind="src" path="htroot/yacy"/>
<classpathentry excluding="posts/|tags/|xbel/" kind="src" path="htroot/api/bookmarks"/>
<classpathentry kind="src" path="htroot/api/ymarks"/>
<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/J7Zip-modified.jar"/>
<classpathentry kind="lib" path="lib/webcat-0.1-swf.jar"/>
<classpathentry kind="lib" path="lib/activation.jar"/>
<classpathentry kind="lib" path="lib/commons-jxpath-1.3.jar"/>
<classpathentry kind="lib" path="lib/poi-3.9-20121203.jar"/>
<classpathentry kind="lib" path="lib/poi-scratchpad-3.9-20121203.jar"/>
<classpathentry kind="lib" path="lib/bcmail-jdk15-145.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15-145.jar"/>
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.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/json-simple-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/xml-apis.jar"/>
<classpathentry kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.4.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.3.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.5.jar"/>
<classpathentry kind="lib" path="lib/guava-15.0.jar"/>
<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.3.1.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/jcifs-1.3.17.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.8.3.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.8.3.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.8.3.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.6.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.6.0.jar" sourcepath="/Volumes/Tres/noBackup/Downloads/solr-4.6.0/solr/core/src/java"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.5.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/>
<classpathentry kind="lib" path="lib/jena-2.6.4.jar"/>
<classpathentry kind="lib" path="lib/sax-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/arq-2.8.7.jar"/>
<classpathentry kind="lib" path="lib/iri-0.8.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.6.3.jar"/>
<classpathentry kind="lib" path="lib/jetty-client-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-continuation-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-http-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-io-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-security-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-server-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlet-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-servlets-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-webapp-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/jetty-xml-8.1.14.v20131031.jar"/>
<classpathentry kind="lib" path="lib/servlet-api-3.0.jar"/>
<classpathentry kind="output" path="gen"/>
</classpath>

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

@ -104,7 +104,7 @@
<string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
<string>$JAVAROOT/lib/solr-core-4.6.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.6.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.5.1.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>

2
build.xml
Unescape View File

@ -229,7 +229,7 @@
<pathelement location="${lib}/slf4j-api-1.7.2.jar" />
<pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
<pathelement location="${lib}/solr-core-4.6.0.jar" />
<pathelement location="${lib}/solr-solrj-4.6.0.jar" />
<pathelement location="${lib}/solr-solrj-4.5.1.jar" />
<pathelement location="${lib}/spatial4j-0.3.jar" />
<pathelement location="${lib}/webcat-0.1-swf.jar" />
<pathelement location="${lib}/wstx-asl-3.2.9.jar" />

BIN
lib/solr-solrj-4.6.0.jar → lib/solr-solrj-4.5.1.jar
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save