Merge branch 'master' of git@github.com:yacy/yacy_search_server.git

.classpath

@@ -67,26 +67,26 @@
 	<classpathentry kind="lib" path="lib/httpclient-4.5.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.5.jar"/>
 	<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
-	<classpathentry kind="lib" path="lib/solr-core-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/solr-solrj-5.2.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-core-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/solr-solrj-5.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/stax2-api-3.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/woodstox-core-asl-4.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-classification-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-codecs-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-facet-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-grouping-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-join-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-memory-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-misc-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queries-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queryparser-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-spatial-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-suggest-5.2.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.2.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-common-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-classification-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-codecs-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-facet-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-grouping-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-join-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-misc-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queries-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-spatial-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-suggest-5.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-backward-codecs-5.2.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-55_1.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>

build.xml

@@ -205,22 +205,22 @@
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.8.2.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.12.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-common-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-backward-codecs-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-classification-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-codecs-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-core-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-facet-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-grouping-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-highlighter-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-join-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-memory-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-misc-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-queries-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-queryparser-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-spatial-5.2.0.jar" />
-    	<pathelement location="${lib}/lucene-suggest-5.2.0.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-common-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-phonetic-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-backward-codecs-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-classification-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-codecs-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-core-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-facet-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-grouping-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-highlighter-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-join-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-memory-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-misc-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-queries-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-queryparser-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-spatial-5.2.1.jar" />
+    	<pathelement location="${lib}/lucene-suggest-5.2.1.jar" />
     	<pathelement location="${lib}/metadata-extractor-2.8.1.jar" />
     	<pathelement location="${lib}/noggit-0.5.jar" />
     	<pathelement location="${lib}/org.restlet.jar" />
@@ -229,8 +229,8 @@
     	<pathelement location="${lib}/poi-scratchpad-3.12-20150511.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.12.jar" />
         <pathelement location="${lib}/slf4j-jdk14-1.7.12.jar" />
-        <pathelement location="${lib}/solr-core-5.2.0.jar" />
-        <pathelement location="${lib}/solr-solrj-5.2.0.jar" />
+        <pathelement location="${lib}/solr-core-5.2.1.jar" />
+        <pathelement location="${lib}/solr-solrj-5.2.1.jar" />
     	<pathelement location="${lib}/spatial4j-0.4.1.jar" />
     	<pathelement location="${lib}/webcat-0.1-swf.jar" />
     	<pathelement location="${lib}/weupnp-0.1.3.jar" />

nbproject/project.xml

@@ -83,7 +83,7 @@
             <compilation-unit>
                 <package-root>source</package-root>
                 <package-root>htroot</package-root>
-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.9.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.5.jar;lib/icu4j-55_1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.12.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.11.v20150529.jar;lib/jetty-continuation-9.2.11.v20150529.jar;lib/jetty-deploy-9.2.11.v20150529.jar;lib/jetty-http-9.2.11.v20150529.jar;lib/jetty-io-9.2.11.v20150529.jar;lib/jetty-jmx-9.2.11.v20150529.jar;lib/jetty-proxy-9.2.11.v20150529.jar;lib/jetty-security-9.2.11.v20150529.jar;lib/jetty-server-9.2.11.v20150529.jar;lib/jetty-servlet-9.2.11.v20150529.jar;lib/jetty-servlets-9.2.11.v20150529.jar;lib/jetty-util-9.2.11.v20150529.jar;lib/jetty-webapp-9.2.11.v20150529.jar;lib/jetty-xml-9.2.11.v20150529.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.2.0.jar;lib/lucene-analyzers-phonetic-5.2.0.jar;lib/lucene-backward-codecs-5.2.0.jar;lib/lucene-classification-5.2.0.jar;lib/lucene-codecs-5.2.0.jar;lib/lucene-core-5.2.0.jar;lib/lucene-facet-5.2.0.jar;lib/lucene-grouping-5.2.0.jar;lib/lucene-highlighter-5.2.0.jar;lib/lucene-join-5.2.0.jar;lib/lucene-memory-5.2.0.jar;lib/lucene-misc-5.2.0.jar;lib/lucene-queries-5.2.0.jar;lib/lucene-queryparser-5.2.0.jar;lib/lucene-spatial-5.2.0.jar;lib/lucene-suggest-5.2.0.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.12-20150511.jar;lib/poi-scratchpad-3.12-20150511.jar;lib/slf4j-api-1.7.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.2.0.jar;lib/solr-solrj-5.2.0.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.10.jar;lib/commons-compress-1.9.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.5.jar;lib/icu4j-55_1.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.12.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.11.v20150529.jar;lib/jetty-continuation-9.2.11.v20150529.jar;lib/jetty-deploy-9.2.11.v20150529.jar;lib/jetty-http-9.2.11.v20150529.jar;lib/jetty-io-9.2.11.v20150529.jar;lib/jetty-jmx-9.2.11.v20150529.jar;lib/jetty-proxy-9.2.11.v20150529.jar;lib/jetty-security-9.2.11.v20150529.jar;lib/jetty-server-9.2.11.v20150529.jar;lib/jetty-servlet-9.2.11.v20150529.jar;lib/jetty-servlets-9.2.11.v20150529.jar;lib/jetty-util-9.2.11.v20150529.jar;lib/jetty-webapp-9.2.11.v20150529.jar;lib/jetty-xml-9.2.11.v20150529.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.2.1.jar;lib/lucene-analyzers-phonetic-5.2.1.jar;lib/lucene-backward-codecs-5.2.1.jar;lib/lucene-classification-5.2.1.jar;lib/lucene-codecs-5.2.1.jar;lib/lucene-core-5.2.1.jar;lib/lucene-facet-5.2.1.jar;lib/lucene-grouping-5.2.1.jar;lib/lucene-highlighter-5.2.1.jar;lib/lucene-join-5.2.1.jar;lib/lucene-memory-5.2.1.jar;lib/lucene-misc-5.2.1.jar;lib/lucene-queries-5.2.1.jar;lib/lucene-queryparser-5.2.1.jar;lib/lucene-spatial-5.2.1.jar;lib/lucene-suggest-5.2.1.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.12-20150511.jar;lib/poi-scratchpad-3.12-20150511.jar;lib/slf4j-api-1.7.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.2.1.jar;lib/solr-solrj-5.2.1.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>
                 <built-to>lib/yacycore.jar</built-to>
                 <source-level>1.7</source-level>
             </compilation-unit>

pom.xml

@@ -421,7 +421,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.9</version>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
@@ -451,7 +451,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.9</version>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
@@ -536,12 +536,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.9</version>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.9</version>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>

source/net/yacy/yacy.java

@@ -598,8 +598,6 @@ public final class yacy {
     public static void main(String args[]) {
 
     	try {
-    	    System.setProperty("jsse.enableSNIExtension", "false"); // fix a ssl problem in Java 1.7, see http://teknosrc.com/javax-net-ssl-sslprotocolexception-handshake-alert-unrecognized_name-solved/
-
 	        // check assertion status
 	        //ClassLoader.getSystemClassLoader().setDefaultAssertionStatus(true);
 	        boolean assertionenabled = false;

startYACY.bat

@@ -18,7 +18,9 @@ if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
 if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
 
 :STARTJAVA
-set javacmd=%javacmd% -Djava.awt.headless=true -Dsolr.directoryFactory=solr.MMapDirectoryFactory -Dfile.encoding=UTF-8
+set javacmd=%javacmd% -Djava.awt.headless=true -Dsolr.directoryFactory=solr.MMapDirectoryFactory -Dfile.encoding=UTF-8 -Djsse.enableSNIExtension=false
+Rem    -Djsse.enableSNIExtension=false  fix a ssl problem in Java 1.7, see http://teknosrc.com/javax-net-ssl-sslprotocolexception-handshake-alert-unrecognized_name-solved/
+
 Rem Starting YaCy
 Echo Generated classpath:%CLASSPATH%
 Echo JRE Parameters:%javacmd%

startYACY.sh

@@ -6,7 +6,9 @@ PIDFILE="yacy.pid"
 OS="`uname`"
 
 #get javastart args
-JAVA_ARGS="-server -Djava.awt.headless=true -Dfile.encoding=UTF-8";
+JAVA_ARGS="-server -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djsse.enableSNIExtension=false";
+#rem    -Djsse.enableSNIExtension=false  fix a ssl problem in Java 1.7, see http://teknosrc.com/javax-net-ssl-sslprotocolexception-handshake-alert-unrecognized_name-solved/
+
 #JAVA_ARGS="-verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails $JAVA_ARGS";
 
 #check if OS is Sun Solaris or one of the OpenSolaris distributions and use different version of id if necessary

startYACY_debug.bat

@@ -17,7 +17,9 @@ if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
 if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
 
 :STARTJAVA
-set javacmd=%javacmd% -XX:-UseGCOverheadLimit -Djava.awt.headless=true -Dfile.encoding=UTF-8
+set javacmd=%javacmd% -XX:-UseGCOverheadLimit -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djsse.enableSNIExtension=false
+Rem    -Djsse.enableSNIExtension=false  fix a ssl problem in Java 1.7, see http://teknosrc.com/javax-net-ssl-sslprotocolexception-handshake-alert-unrecognized_name-solved/
+
 Rem Starting YaCy
 Echo Generated classpath:%CLASSPATH%
 Echo JRE Parameters:%javacmd%