From c9c6e0653304ca133368ae964f4364ec2277c2ca Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 3 Feb 2018 08:49:14 +0000
Subject: [PATCH] Removed outdated log4j configuration from web.xml.

git-svn-id: https://svn.libreccm.org/ccm/trunk@5243 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/web/WEB-INF/web.xml                      | 9 ---------
 ccm-lcs-bundle/bundles/base/cfg/libre-web.xml     | 7 -------
 ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml     | 7 -------
 ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml    | 7 -------
 ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml | 7 -------
 ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml | 7 -------
 ccm-ldn-aplaws/bundles/base/cfg/web.xml           | 7 -------
 ccm-ldn-aplaws/bundles/compatible/cfg/web.xml     | 7 -------
 ccm-ldn-aplaws/bundles/complete/cfg/web.xml       | 7 -------
 ccm-ldn-aplaws/bundles/demo/cfg/web.xml           | 7 -------
 ccm-ldn-aplaws/bundles/devel/cfg/web.xml          | 7 -------
 ccm-ldn-aplaws/bundles/standard/cfg/web.xml       | 7 -------
 ccm-sci-bundle/bundles/base/cfg/web-sci.xml       | 7 -------
 ccm-sci-bundle/bundles/demo/cfg/web-sci.xml       | 7 -------
 ccm-sci-bundle/bundles/devel/cfg/sci-web.xml      | 7 -------
 ccm-sci-bundle/bundles/standard/cfg/web-sci.xml   | 7 -------
 16 files changed, 114 deletions(-)

diff --git a/ccm-core/web/WEB-INF/web.xml b/ccm-core/web/WEB-INF/web.xml
index 98687e8f9..9fbc7cbf2 100644
--- a/ccm-core/web/WEB-INF/web.xml
+++ b/ccm-core/web/WEB-INF/web.xml
@@ -15,15 +15,6 @@
     <display-name>CCM</display-name>
     <description>Content and Collaboration Management</description>
 
-    <!--
-        path and filename of the log4j user accessible config file
-        WEB-INF/conf/log4j.properties is the built-in default value
-    -->
-    <context-param>
-        <param-name>log4j-conf-file</param-name>
-        <param-value>WEB-INF/conf/log4j.properties</param-value>
-    </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
index 570c328e9..56d9efbda 100644
--- a/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/base/cfg/libre-web.xml
@@ -7,13 +7,6 @@
   <display-name>LibreCMS BASE Site</display-name> 
   <description>Community and Content Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
index def87b614..dca9b2adf 100644
--- a/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/demo/cfg/libre-web.xml
@@ -7,13 +7,6 @@
   <display-name>LibreCMS DEMO Site</display-name> 
   <description>Community and Content Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
index b7a8fee62..423206cad 100644
--- a/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/devel/cfg/libre-web.xml
@@ -7,13 +7,6 @@
   <display-name>LibreCMS OpenCCM Site</display-name> 
   <description>Community and Content Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml
index c3b4a21b5..a89489151 100644
--- a/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/slimline/cfg/libre-web.xml
@@ -7,13 +7,6 @@
   <display-name>LibreCMS Standard Site</display-name> 
   <description>Community and Content Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml b/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
index 3cb486e47..0991a607e 100644
--- a/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
+++ b/ccm-lcs-bundle/bundles/standard/cfg/libre-web.xml
@@ -7,13 +7,6 @@
   <display-name>LibreCMS Slimeline Site</display-name> 
   <description>Community and Content Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-ldn-aplaws/bundles/base/cfg/web.xml b/ccm-ldn-aplaws/bundles/base/cfg/web.xml
index 45ad9f01e..53440f15f 100755
--- a/ccm-ldn-aplaws/bundles/base/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/base/cfg/web.xml
@@ -7,13 +7,6 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-ldn-aplaws/bundles/compatible/cfg/web.xml b/ccm-ldn-aplaws/bundles/compatible/cfg/web.xml
index 45ad9f01e..53440f15f 100644
--- a/ccm-ldn-aplaws/bundles/compatible/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/compatible/cfg/web.xml
@@ -7,13 +7,6 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
index 45ad9f01e..53440f15f 100755
--- a/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/web.xml
@@ -7,13 +7,6 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index 45ad9f01e..53440f15f 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -7,13 +7,6 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index 45ad9f01e..53440f15f 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -7,13 +7,6 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index 45ad9f01e..53440f15f 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -7,13 +7,6 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-sci-bundle/bundles/base/cfg/web-sci.xml b/ccm-sci-bundle/bundles/base/cfg/web-sci.xml
index 07aec2f11..5fda33994 100644
--- a/ccm-sci-bundle/bundles/base/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/base/cfg/web-sci.xml
@@ -7,13 +7,6 @@
   <display-name>Scientific CMS</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
index 07aec2f11..5fda33994 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
@@ -7,13 +7,6 @@
   <display-name>Scientific CMS</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml b/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
index e8635b70a..1603fc777 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/sci-web.xml
@@ -7,13 +7,6 @@
   <display-name>Scientific CMS</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
diff --git a/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml b/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
index 2263f4d99..47e0fa0da 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
@@ -7,13 +7,6 @@
   <display-name>Scientific CMS</display-name> 
   <description>Content and Collaboration Management for Scientific Institutions</description>
 
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server