diff --git a/.classpath b/.classpath index 86cfeb077..9e7f328b6 100644 --- a/.classpath +++ b/.classpath @@ -47,11 +47,8 @@ - - - @@ -68,6 +65,8 @@ + + diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 683811722..930c8f981 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -37,7 +37,6 @@ ClassPath $JAVAROOT/htroot - $JAVAROOT/lib/J7Zip-modified.jar $JAVAROOT/lib/activation.jar $JAVAROOT/lib/apache-mime4j-0.6.jar $JAVAROOT/lib/arq-2.8.7.jar @@ -60,6 +59,7 @@ $JAVAROOT/lib/httpmime-4.2.3.jar $JAVAROOT/lib/icu4j-core.jar $JAVAROOT/lib/iri-0.8.jar + $JAVAROOT/lib/J7Zip-modified.jar $JAVAROOT/lib/jakarta-oro-2.0.8.jar $JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar $JAVAROOT/lib/jcifs-1.3.15.jar @@ -68,7 +68,6 @@ $JAVAROOT/lib/jena-2.6.4.jar $JAVAROOT/lib/jsch-0.1.42.jar $JAVAROOT/lib/json-simple-1.1.jar - $JAVAROOT/lib/log4j-1.2.17.jar $JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar $JAVAROOT/lib/lucene-analyzers-common-4.1.0.jar $JAVAROOT/lib/lucene-analyzers-phonetic-4.1.0.jar diff --git a/build.xml b/build.xml index 2023946ab..6eec86ce6 100644 --- a/build.xml +++ b/build.xml @@ -156,7 +156,6 @@ - @@ -179,6 +178,7 @@ + @@ -188,7 +188,6 @@ - diff --git a/defaults/yacy.logging b/defaults/yacy.logging index c9ee986d3..68eaae490 100644 --- a/defaults/yacy.logging +++ b/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.schema.IndexSchema.enabled = FALSE -org.apache.solr.handler.enabled = FALSE -org.apache.solr.update.enabled = TRUE -org.apache.solr.update.level = INFO -org.apache.solr.core.enabled = TRUE -org.apache.solr.core.level = WARNING +org.apache.solr.core.Config.level = INFO +org.apache.solr.core.SolrResourceLoader.level = INFO +org.apache.solr.core.CachingDirectoryFactory.level = OFF +org.apache.solr.util.plugin.AbstractPluginLoader.level = INFO +org.apache.solr.schema.IndexSchema.level = INFO +org.apache.solr.handler.UpdateRequestHandler.level = INFO +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 \ No newline at end of file diff --git a/lib/log4j-1.2.17.jar b/lib/log4j-1.2.17.jar deleted file mode 100644 index 068867ebf..000000000 Binary files a/lib/log4j-1.2.17.jar and /dev/null differ