Merge branch 'master' into HEAD

Conflicts:
	.classpath
	source/net/yacy/cora/federate/solr/SolrServlet.java

2 files changed, 27 insertions, 27 deletions

diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index db0dac042..e30ebf920 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -25,7 +25,7 @@
 	<key>Java</key>
 	<dict>
 		<key>VMOptions</key>
-		<string>-Xmx600m -Xms90m -Dsolr.directoryFactory=solr.MMapDirectoryFactory -Dfile.encoding=UTF-8</string>
+		<string>-server -d64 -Xmx600m -Xms90m -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -Dsolr.directoryFactory=solr.MMapDirectoryFactory</string>
 		<key>WorkingDirectory</key>
 		<string>$APP_PACKAGE/Contents/Resources/Java</string>
 		<key>MainClass</key>
@@ -58,9 +58,9 @@
 			<string>$JAVAROOT/lib/commons-jxpath-1.3.jar</string>
 			<string>$JAVAROOT/lib/commons-lang-2.6.jar</string>
 			<string>$JAVAROOT/lib/commons-logging-1.1.3.jar</string>
-			<string>$JAVAROOT/lib/fontbox-1.8.2.jar</string>
+			<string>$JAVAROOT/lib/fontbox-1.8.3.jar</string>
 			<string>$JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string>
-			<string>$JAVAROOT/lib/guava-13.0.1.jar</string>
+			<string>$JAVAROOT/lib/guava-15.0.jar</string>
 			<string>$JAVAROOT/lib/htmllexer.jar</string>
 			<string>$JAVAROOT/lib/httpclient-4.3.1.jar</string>
 			<string>$JAVAROOT/lib/httpcore-4.3.jar</string>
@@ -72,37 +72,36 @@
 			<string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-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/jempbox-1.8.2.jar</string>
+			<string>$JAVAROOT/lib/jempbox-1.8.3.jar</string>
 			<string>$JAVAROOT/lib/jena-2.6.4.jar</string>
-			<string>$JAVAROOT/lib/jsch-0.1.42.jar</string>
-			<string>$JAVAROOT/lib/json-simple-1.1.jar</string>
+			<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.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-classification-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-codecs-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-core-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-facet-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-grouping-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-highlighter-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-join-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-memory-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-misc-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-queries-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-queryparser-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-spatial-4.5.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-suggest-4.5.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-analyzers-common-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-classification-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-codecs-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-core-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-facet-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-grouping-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-highlighter-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-join-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-memory-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-misc-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-queries-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-queryparser-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-spatial-4.6.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-suggest-4.6.0.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/noggit-0.5.jar</string>
-			<string>$JAVAROOT/lib/pdfbox-1.8.2.jar</string>
+			<string>$JAVAROOT/lib/pdfbox-1.8.3.jar</string>
 			<string>$JAVAROOT/lib/poi-3.6-20091214.jar</string>
 			<string>$JAVAROOT/lib/poi-scratchpad-3.6-20091214.jar</string>
 			<string>$JAVAROOT/lib/sax-2.0.1.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.5.0.jar</string>
-			<string>$JAVAROOT/lib/solr-solrj-4.5.0.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/spatial4j-0.3.jar</string>
 			<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
 			<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>
diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4
index c866781f7..789522c15 100644
--- a/addon/yacyInit.m4
+++ b/addon/yacyInit.m4
@@ -57,12 +57,13 @@ SHUTDOWN_TIMEOUT=50
 # Default niceness if not set in config file
 NICE_VAL=0
 
-JAVA_ARGS="-server -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8"
+JAVA_ARGS="-server -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8"
+
 #check if system supports large memory pages and enable it if possible
 HUGEPAGESTOTAL="$(cat /proc/meminfo | grep HugePages_Total | sed s/[^0-9]//g)"
 if [ -n "$HUGEPAGESTOTAL" ] && [ $HUGEPAGESTOTAL -ne 0 ]
 then 
-  JAVA_ARGS="$JAVA_ARGS -XX:+UseLargePages"
+  JAVA_ARGS="$JAVA_ARGS -XX:+UseLargePages -d64 -Dsolr.directoryFactory=solr.MMapDirectoryFactory"
 fi
 
 ifdef(`openSUSE', `dnl