log4j vulnerability fix

Reverted back log4j fix changes and merged with
actual fix by upgrading the version

Change-Id: Ica392c7f8307a1ecaeac57bf55a45b215ae9840c
Issue-ID: VFC-1598
Signed-off-by: Prakash.E <prakash.e@huawei.com>

2 files changed, 13 insertions, 33 deletions

diff --git a/service/src/main/resources/log4j.properties b/service/src/main/resources/log4j.properties
deleted file mode 100644
index a9e8557..0000000
--- a/service/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright 2016, Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###############################################################################
-log4j.rootLogger=INFO,root
-log4j.appender.root.Append=true
-log4j.appender.root.File=${catalina.base}/logs/multivimproxy.log
-log4j.appender.root.layout.ConversionPattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n
-log4j.appender.root.layout=org.apache.log4j.PatternLayout
-log4j.appender.root.MaxBackupIndex=50
-log4j.appender.root.MaxFileSize=20MB
-log4j.appender.root=org.apache.log4j.RollingFileAppender
\ No newline at end of file
diff --git a/service/src/main/resources/log4j2.properties b/service/src/main/resources/log4j2.properties
index 644ed92..0f08db7 100644
--- a/service/src/main/resources/log4j2.properties
+++ b/service/src/main/resources/log4j2.properties
@@ -13,14 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ###############################################################################
-appenders = root
+#log4j.rootLogger=INFO,root
+rootLogger.level=INFO
+rootLogger.appenderRefs=file
+rootLogger.appenderRef.root.ref=RollingFile
+
+#Log Directory
+property.logDir=/var/log/onap
+property.componentName=vfc
+property.subComponentName=huaweivnfmdriver
 
-# Redirect log messages to a log file, support file rolling.
 appender.root.type = RollingFile
-appender.root.name = root
-appender.root.Append=true
-appender.root.fileName=${catalina.base}/logs/multivimproxy.log
-appender.root.filePattern=${catalina.base}/logs/multivimproxy.log
+appender.root.name = RollingFile
+appender.root.append=true
+appender.root.fileName=${logDir}/${componentName}/${subComponentName}/vnfmadapterservice.log
+appender.root.filePattern=${logDir}/${componentName}/${subComponentName}/vnfmadapterservice.%d{dd-MMM}.log
 appender.root.policies.type=Policies
 appender.root.policies.size.type=SizeBasedTriggeringPolicy
 appender.root.policies.size.size=20MB
@@ -29,7 +36,3 @@ appender.root.strategy.max=50
 appender.root.layout.type=PatternLayout
 appender.root.layout.pattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n
 
-#log4j.rootLogger=INFO, root
-rootLogger.level=INFO
-rootLogger.appenderRefs=file
-rootLogger.appenderRef.file.ref=root
\ No newline at end of file