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

replaced solr 4.6.1 with solr 4.7.1 and added index migration to

Browse Source 
lucene_47
pull/1/head
Michael Peter Christen 11 years ago
parent 0f3fbae438
commit ebd44a7080
32 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File

36
.classpath
Unescape View File

@ -33,7 +33,6 @@
<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"/>
@ -46,27 +45,28 @@
<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/lucene-analyzers-common-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.6.1.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.8.4.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.8.4.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.8.4.jar"/>
<classpathentry kind="lib" path="lib/guava-16.0.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.7.1.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.4.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"/>

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

@ -76,21 +76,21 @@
<string>$JAVAROOT/lib/jsch-0.1.50.jar</string>
<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.6.1.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.7.1.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.7.1.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string>
<string>$JAVAROOT/lib/noggit-0.5.jar</string>
<string>$JAVAROOT/lib/pdfbox-1.8.4.jar</string>
@ -99,9 +99,9 @@
<string>$JAVAROOT/lib/servlet-api-3.0.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/solr-core-4.6.1.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.6.1.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
<string>$JAVAROOT/lib/solr-core-4.7.1.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.7.1.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.4.1.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>
<string>$JAVAROOT/lib/xercesImpl.jar</string>

36
build.xml
Unescape View File

@ -201,21 +201,21 @@
<pathelement location="${lib}/json-simple-1.1.1.jar" />
<pathelement location="${lib}/jsoup-1.6.3.jar" />
<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.6.1.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.6.1.jar" />
<pathelement location="${lib}/lucene-classification-4.6.1.jar" />
<pathelement location="${lib}/lucene-codecs-4.6.1.jar" />
<pathelement location="${lib}/lucene-core-4.6.1.jar" />
<pathelement location="${lib}/lucene-facet-4.6.1.jar" />
<pathelement location="${lib}/lucene-grouping-4.6.1.jar" />
<pathelement location="${lib}/lucene-highlighter-4.6.1.jar" />
<pathelement location="${lib}/lucene-join-4.6.1.jar" />
<pathelement location="${lib}/lucene-memory-4.6.1.jar" />
<pathelement location="${lib}/lucene-misc-4.6.1.jar" />
<pathelement location="${lib}/lucene-queries-4.6.1.jar" />
<pathelement location="${lib}/lucene-queryparser-4.6.1.jar" />
<pathelement location="${lib}/lucene-spatial-4.6.1.jar" />
<pathelement location="${lib}/lucene-suggest-4.6.1.jar" />
<pathelement location="${lib}/lucene-analyzers-common-4.7.1.jar" />
<pathelement location="${lib}/lucene-analyzers-phonetic-4.7.1.jar" />
<pathelement location="${lib}/lucene-classification-4.7.1.jar" />
<pathelement location="${lib}/lucene-codecs-4.7.1.jar" />
<pathelement location="${lib}/lucene-core-4.7.1.jar" />
<pathelement location="${lib}/lucene-facet-4.7.1.jar" />
<pathelement location="${lib}/lucene-grouping-4.7.1.jar" />
<pathelement location="${lib}/lucene-highlighter-4.7.1.jar" />
<pathelement location="${lib}/lucene-join-4.7.1.jar" />
<pathelement location="${lib}/lucene-memory-4.7.1.jar" />
<pathelement location="${lib}/lucene-misc-4.7.1.jar" />
<pathelement location="${lib}/lucene-queries-4.7.1.jar" />
<pathelement location="${lib}/lucene-queryparser-4.7.1.jar" />
<pathelement location="${lib}/lucene-spatial-4.7.1.jar" />
<pathelement location="${lib}/lucene-suggest-4.7.1.jar" />
<pathelement location="${lib}/metadata-extractor-2.6.2.jar" />
<pathelement location="${lib}/noggit-0.5.jar" />
<pathelement location="${lib}/pdfbox-1.8.4.jar" />
@ -224,9 +224,9 @@
<pathelement location="${lib}/servlet-api-3.0.jar" />
<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.1.jar" />
<pathelement location="${lib}/solr-solrj-4.6.1.jar" />
<pathelement location="${lib}/spatial4j-0.3.jar" />
<pathelement location="${lib}/solr-core-4.7.1.jar" />
<pathelement location="${lib}/solr-solrj-4.7.1.jar" />
<pathelement location="${lib}/spatial4j-0.4.1.jar" />
<pathelement location="${lib}/webcat-0.1-swf.jar" />
<pathelement location="${lib}/wstx-asl-3.2.9.jar" />
<pathelement location="${lib}/xercesImpl.jar" />

2
defaults/solr/solrconfig.xml
Unescape View File

@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>4.6</luceneMatchVersion>
<luceneMatchVersion>4.7</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in

BIN
lib/lucene-analyzers-common-4.6.1.jar → lib/lucene-analyzers-common-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-analyzers-phonetic-4.6.1.jar → lib/lucene-analyzers-phonetic-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-classification-4.6.1.jar
View File

Binary file not shown.

BIN
lib/lucene-classification-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-codecs-4.6.1.jar → lib/lucene-codecs-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-core-4.6.1.jar → lib/lucene-core-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-facet-4.6.1.jar
View File

Binary file not shown.

BIN
lib/lucene-facet-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-grouping-4.6.1.jar → lib/lucene-grouping-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-highlighter-4.6.1.jar → lib/lucene-highlighter-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-join-4.6.1.jar → lib/lucene-join-4.7.1.jar
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
lib/lucene-misc-4.6.1.jar → lib/lucene-misc-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-queries-4.6.1.jar → lib/lucene-queries-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-queryparser-4.6.1.jar → lib/lucene-queryparser-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-spatial-4.6.1.jar → lib/lucene-spatial-4.7.1.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.6.1.jar
View File

Binary file not shown.

BIN
lib/lucene-suggest-4.7.1.jar
View File

Binary file not shown.

BIN
lib/solr-core-4.6.1.jar
View File

Binary file not shown.

BIN
lib/solr-core-4.7.1.jar
View File

Binary file not shown.

0
lib/solr-solr-4.6.1.License → lib/solr-solr-4.7.1.License
Unescape View File

BIN
lib/solr-solrj-4.6.1.jar
View File

Binary file not shown.

0
lib/solr-solrj-4.6.1.License → lib/solr-solrj-4.7.1.License
Unescape View File

BIN
lib/solr-solrj-4.7.1.jar
View File

Binary file not shown.

BIN
lib/spatial4j-0.3.jar
View File

Binary file not shown.

BIN
lib/spatial4j-0.4.1.jar
View File

Binary file not shown.

4
source/net/yacy/search/index/Fulltext.java
Unescape View File

@ -78,8 +78,8 @@ import org.apache.lucene.util.Version;
public final class Fulltext {
private static final String SOLR_PATH = "solr_46"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml
private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44", "solr_45"};
private static final String SOLR_PATH = "solr_47"; // the number should be identical to the number in the property luceneMatchVersion in solrconfig.xml
private static final String SOLR_OLD_PATH[] = new String[]{"solr_36", "solr_40", "solr_44", "solr_45", "solr_46"};
// class objects
private final File segmentPath;

Write Preview
Loading…
Cancel
Save