From 34a0918c926cb192dcf9a29452aeba7fce659d05 Mon Sep 17 00:00:00 2001
From: baka <baka@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 30 Aug 2017 11:30:00 +0000
Subject: [PATCH] Adds a log4j2 configuration. The old one is fully compatible.
 Changes the build-hooks.xml to copy the new configuration into the WEB-INF
 directory, which is the first place log4j2 searches for files.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4961 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/build-hooks.xml                             | 5 ++---
 ccm-core/src/{log4j.properties => log4j2.properties} | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename ccm-core/src/{log4j.properties => log4j2.properties} (97%)

diff --git a/ccm-core/build-hooks.xml b/ccm-core/build-hooks.xml
index c5df19f67..1fdecec2b 100755
--- a/ccm-core/build-hooks.xml
+++ b/ccm-core/build-hooks.xml
@@ -53,9 +53,8 @@
           unless="this.deploy.dir" />
     <!-- deploy the log4j configuration file into the web applications
          document root tree                                                 -->
-    <mkdir dir="${this.deploy.dir}/WEB-INF/conf"/>
-    <copy todir="${this.deploy.dir}/WEB-INF/conf"
-          file="${src.dir}/log4j.properties"/>
+    <copy todir="${this.deploy.dir}/WEB-INF"
+          file="${src.dir}/log4j2.properties"/>
     <!-- project.xml moved to bundle cfg directory where it replaces
          former application.cfg                                            -->
     <xslt style="${ccm.tools.xsl.dir}/build-version.xsl" 
diff --git a/ccm-core/src/log4j.properties b/ccm-core/src/log4j2.properties
similarity index 97%
rename from ccm-core/src/log4j.properties
rename to ccm-core/src/log4j2.properties
index 8a12391ef..2b0f2a12e 100755
--- a/ccm-core/src/log4j.properties
+++ b/ccm-core/src/log4j2.properties
@@ -1,5 +1,5 @@
 # To customize logging, copy this file to
-# $CCM_HOME/WEB-INF/conf/log4j.properties and edit it appropriately.
+# $CCM_HOME/WEB-INF/log4j2.properties and edit it appropriately.
 
 # Choose one of the following lines, or make up your own...
 #log4j.rootCategory=WARN, console, file