- Removed log4j from libraries. This can be removed because the package

log4j-over-slf4j is there. From slf4j all loggings are routed to the jdk
logger. Now all loggings are consistently done to the jdk logger.
- added some lines to the logging properties to suppress many solr
logging statements. The number of the logging entries had already become
a performance issue, therefore removing these from the log should
increase performance.

.classpath

@@ -47,11 +47,8 @@
 	<classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/fontbox-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/jempbox-1.7.1.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>
 	<classpathentry kind="lib" path="lib/zookeeper-3.4.5.jar"/>
 	<classpathentry kind="lib" path="lib/solr-core-4.1.0.jar" sourcepath="/Users/admin/Development/sourcecode/solr-4.1.0/src/java"/>
 	<classpathentry kind="lib" path="lib/solr-solrj-4.1.0.jar" sourcepath="/Users/admin/Development/sourcecode/solr-4.1.0/src/java"/>
@@ -68,6 +65,8 @@
 	<classpathentry kind="lib" path="lib/lucene-suggest-4.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/guava-13.0.1.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="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>

addon/YaCy.app/Contents/Info.plist

@@ -37,7 +37,6 @@
 		<key>ClassPath</key>
 			<array>
 			<string>$JAVAROOT/htroot</string>
-			<string>$JAVAROOT/lib/J7Zip-modified.jar</string>
 			<string>$JAVAROOT/lib/activation.jar</string>
 			<string>$JAVAROOT/lib/apache-mime4j-0.6.jar</string>
 			<string>$JAVAROOT/lib/arq-2.8.7.jar</string>
@@ -60,6 +59,7 @@
 			<string>$JAVAROOT/lib/httpmime-4.2.3.jar</string>
 			<string>$JAVAROOT/lib/icu4j-core.jar</string>
 			<string>$JAVAROOT/lib/iri-0.8.jar</string>
+			<string>$JAVAROOT/lib/J7Zip-modified.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/jcifs-1.3.15.jar</string>
@@ -68,7 +68,6 @@
 			<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/log4j-1.2.17.jar</string>
 			<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
 			<string>$JAVAROOT/lib/lucene-analyzers-common-4.1.0.jar</string>
 			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.1.0.jar</string>

build.xml

@@ -156,7 +156,6 @@
     <path id="project.class.path">
         <pathelement location="${build}" />
         <pathelement location="${htroot}" />
-        <pathelement location="${lib}/J7Zip-modified.jar" />
     	<pathelement location="${lib}/activation.jar" />
         <pathelement location="${lib}/apache-mime4j-0.6.jar" />
         <pathelement location="${lib}/arq-2.8.7.jar" />
@@ -179,6 +178,7 @@
         <pathelement location="${lib}/httpmime-4.2.3.jar" />
         <pathelement location="${lib}/icu4j-core.jar" />
         <pathelement location="${lib}/iri-0.8.jar" />
+        <pathelement location="${lib}/J7Zip-modified.jar" />
         <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
     	<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
     	<pathelement location="${lib}/jcifs-1.3.15.jar" />
@@ -188,7 +188,6 @@
     	<pathelement location="${lib}/jsch-0.1.42.jar" />
     	<pathelement location="${lib}/json-simple-1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.6.3.jar" />
-    	<pathelement location="${lib}/log4j-1.2.17.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
     	<pathelement location="${lib}/lucene-analyzers-common-4.1.0.jar" />
     	<pathelement location="${lib}/lucene-analyzers-phonetic-4.1.0.jar" />

defaults/yacy.logging

@@ -79,12 +79,13 @@ httpclient.wire.level = OFF
 org.apache.pdfbox.level = INFO
 
 # Properties for solr
-org.apache.solr.util.plugin.AbstractPluginLoader.enabled = FALSE
+org.apache.solr.core.Config.level = INFO
-org.apache.solr.schema.IndexSchema.enabled = FALSE
+org.apache.solr.core.SolrResourceLoader.level = INFO
-org.apache.solr.handler.enabled = FALSE
+org.apache.solr.core.CachingDirectoryFactory.level = OFF
-org.apache.solr.update.enabled = TRUE
+org.apache.solr.util.plugin.AbstractPluginLoader.level = INFO
-org.apache.solr.update.level = INFO
+org.apache.solr.schema.IndexSchema.level = INFO
-org.apache.solr.core.enabled = TRUE
+org.apache.solr.handler.UpdateRequestHandler.level = INFO
-org.apache.solr.core.level = WARNING
+org.apache.solr.handler.loader.XMLLoader.level = INFO
+org.apache.solr.search.SolrIndexSearcher.level = INFO
+org.apache.solr.update.processor.LogUpdateProcessor.level = OFF
 javax.management.mbeanserver.level = INFO
-javax.management.mbeanserver.enabled = FALSE