diff --git a/ccm-core/lib/log4j-1.2-api-2.11.1.jar b/ccm-core/lib/log4j-1.2-api-2.11.1.jar new file mode 100644 index 000000000..fc728a4be Binary files /dev/null and b/ccm-core/lib/log4j-1.2-api-2.11.1.jar differ diff --git a/ccm-core/lib/log4j-1.2-api-2.8.2.jar b/ccm-core/lib/log4j-1.2-api-2.8.2.jar deleted file mode 100644 index a9c13b2f3..000000000 Binary files a/ccm-core/lib/log4j-1.2-api-2.8.2.jar and /dev/null differ diff --git a/ccm-core/lib/log4j-api-2.11.1.jar b/ccm-core/lib/log4j-api-2.11.1.jar new file mode 100644 index 000000000..e6955f9a1 Binary files /dev/null and b/ccm-core/lib/log4j-api-2.11.1.jar differ diff --git a/ccm-core/lib/log4j-api-2.8.2.jar b/ccm-core/lib/log4j-api-2.8.2.jar deleted file mode 100644 index 9694c29f0..000000000 Binary files a/ccm-core/lib/log4j-api-2.8.2.jar and /dev/null differ diff --git a/ccm-core/lib/log4j-core-2.11.1.jar b/ccm-core/lib/log4j-core-2.11.1.jar new file mode 100644 index 000000000..9fd06dd0e Binary files /dev/null and b/ccm-core/lib/log4j-core-2.11.1.jar differ diff --git a/ccm-core/lib/log4j-core-2.8.2.jar b/ccm-core/lib/log4j-core-2.8.2.jar deleted file mode 100644 index eb658af8b..000000000 Binary files a/ccm-core/lib/log4j-core-2.8.2.jar and /dev/null differ diff --git a/ccm-core/lib/log4j-web-2.11.1.jar b/ccm-core/lib/log4j-web-2.11.1.jar new file mode 100644 index 000000000..e506908c8 Binary files /dev/null and b/ccm-core/lib/log4j-web-2.11.1.jar differ diff --git a/ccm-core/lib/log4j-web-2.8.2.jar b/ccm-core/lib/log4j-web-2.8.2.jar deleted file mode 100644 index cb20edae5..000000000 Binary files a/ccm-core/lib/log4j-web-2.8.2.jar and /dev/null differ diff --git a/ccm-core/src/log4j2.xml b/ccm-core/src/log4j2.xml index f71b9c829..e7efe2609 100644 --- a/ccm-core/src/log4j2.xml +++ b/ccm-core/src/log4j2.xml @@ -1,19 +1,22 @@ - + - - - + + + + + - @@ -40,16 +43,19 @@ + 43,1 40% + + diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml index c6d7119ed..c58ec8b9a 100644 --- a/tools-ng/netbeans/project.xml +++ b/tools-ng/netbeans/project.xml @@ -1330,7 +1330,7 @@ ccm-sci-types-institute/src ccm-sci-types-member/src ccm-sci-types-project/src - ccm-core/lib/log4j-1.2-api-2.8.2.jar:ccm-core/lib/log4j-api-2.8.2.jar: ccm-core/lib/log4j-core-2.8.2.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon9h2.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:ccm-themedirector/lib/jlessc-1.6.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar:ccm-themedirector/lib/jlessc-1.5.jar + ccm-core/lib/log4j-1.2-api-2.11.1.jar:ccm-core/lib/log4j-api-2.11.1.jar:ccm-core/lib/log4j-core-2.11.1.jar:ccm-core/lib/log4j-web-2.11.1.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon9h2.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:ccm-themedirector/lib/jlessc-1.6.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar:ccm-themedirector/lib/jlessc-1.5.jar 1.8