Migrate to apache common logging

Issue-ID: CLI-249

Change-Id: Id9b0b37c8aa2d0cfd452ebdbe8c09928ed69dbd5
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/deployment/zip/src/main/release/conf/log4j2.properties b/deployment/zip/src/main/release/conf/log4j2.properties
new file mode 100644 (file)
index 0000000..495c5d5
--- /dev/null
+++ b/deployment/zip/src/main/release/conf/log4j2.properties
@@ -0,0 +1,57 @@
+# Copyright 2020 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.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+rootLogger.level=ERROR
+rootLogger.appenderRefs=file
+rootLogger.appenderRef.file.ref=RollingFile
+
+loggers=cli,grpc
+
+logger.cli.name = org.onap.cli
+logger.cli.level=ERROR
+logger.cli.additivity=false
+logger.cli.appenderRef.file.ref=RollingFile
+
+logger.grpc.name = org.open.infc.grpc.server
+logger.grpc.level=INFO
+logger.grpc.additivity=false
+logger.grpc.appenderRef.file.ref=RollingFile
+logger.grpc.appenderRef.stdout.ref=STDOUT
+
+appenders = stdout,file
+
+# Direct log messages to stdout
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.target=SYSTEM_OUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+appender.file.type = RollingFile
+appender.file.name = RollingFile
+appender.file.fileName=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.filePattern=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.append=true
+appender.file.policies.type=Policies
+appender.file.policies.size.type=SizeBasedTriggeringPolicy
+appender.file.policies.size.size=5MB
+appender.file.strategy.type=DefaultRolloverStrategy
+appender.file.strategy.max=10
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+

diff --git a/framework/pom.xml b/framework/pom.xml
index a743a97..080bcab 100644 (file)
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -54,9 +54,15 @@
             <version>1.18</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.16</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.13.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-ext</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/framework/src/main/resources/log4j2.properties b/framework/src/main/resources/log4j2.properties
new file mode 100644 (file)
index 0000000..c8e38ab
--- /dev/null
+++ b/framework/src/main/resources/log4j2.properties
@@ -0,0 +1,56 @@
+# Copyright 2020 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.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+rootLogger.level=ERROR
+rootLogger.appenderRefs=file
+rootLogger.appenderRef.file.ref=RollingFile
+
+loggers=cli,grpc
+
+logger.cli.name = org.onap.cli
+logger.cli.level=ERROR
+logger.cli.additivity=false
+logger.cli.appenderRef.file.ref=RollingFile
+
+logger.grpc.name = org.open.infc.grpc.server
+logger.grpc.level=INFO
+logger.grpc.additivity=false
+logger.grpc.appenderRef.file.ref=RollingFile
+logger.grpc.appenderRef.stdout.ref=STDOUT
+
+appenders = stdout,file
+
+# Direct log messages to stdout
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.target=SYSTEM_OUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+appender.file.type = RollingFile
+appender.file.name = RollingFile
+appender.file.fileName=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.filePattern=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.append=true
+appender.file.policies.type=Policies
+appender.file.policies.size.type=SizeBasedTriggeringPolicy
+appender.file.policies.size.size=5MB
+appender.file.strategy.type=DefaultRolloverStrategy
+appender.file.strategy.max=10
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

diff --git a/grpc/grpc-client/pom.xml b/grpc/grpc-client/pom.xml
index db3ba6f..6a0d933 100644 (file)
--- a/grpc/grpc-client/pom.xml
+++ b/grpc/grpc-client/pom.xml
@@ -40,10 +40,16 @@
           <version>${project.version}</version>
       </dependency>
       <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <version>1.7.16</version>
-      </dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.13.0</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-ext</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
 <dependency>
 <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/grpc/grpc-client/src/main/resources/log4j2.properties b/grpc/grpc-client/src/main/resources/log4j2.properties
new file mode 100644 (file)
index 0000000..b6d0194
--- /dev/null
+++ b/grpc/grpc-client/src/main/resources/log4j2.properties
@@ -0,0 +1,55 @@
+# Copyright 2020 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.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+rootLogger.level=ERROR
+rootLogger.appenderRefs=file
+rootLogger.appenderRef.file.ref=RollingFile
+
+loggers=cli,infc
+
+logger.cli.name = org.onap.cli
+logger.cli.level=DEBUG
+logger.cli.additivity=false
+logger.cli.appenderRef.file.ref=RollingFile
+
+logger.infc.name = org.open.infc
+logger.infc.level=DEBUG
+logger.infc.additivity=false
+logger.infc.appenderRef.file.ref=RollingFile
+
+appenders = stdout,file
+
+# Direct log messages to stdout
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.target=SYSTEM_OUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+appender.file.type = RollingFile
+appender.file.name = RollingFile
+appender.file.fileName=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.filePattern=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.append=true
+appender.file.policies.type=Policies
+appender.file.policies.size.type=SizeBasedTriggeringPolicy
+appender.file.policies.size.size=5MB
+appender.file.strategy.type=DefaultRolloverStrategy
+appender.file.strategy.max=10
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

diff --git a/grpc/grpc-server/src/main/resources/log4j2.properties b/grpc/grpc-server/src/main/resources/log4j2.properties
new file mode 100644 (file)
index 0000000..a0c2af9
--- /dev/null
+++ b/grpc/grpc-server/src/main/resources/log4j2.properties
@@ -0,0 +1,57 @@
+# Copyright 2020 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.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+rootLogger.level=ERROR
+rootLogger.appenderRefs=file
+rootLogger.appenderRef.file.ref=RollingFile
+
+loggers=cli,infc
+
+logger.cli.name = org.onap.cli
+logger.cli.level=DEBUG
+logger.cli.additivity=false
+logger.cli.appenderRef.file.ref=RollingFile
+logger.cli.appenderRef.stdout.ref=STDOUT
+
+logger.infc.name = org.open.infc
+logger.infc.level=DEBUG
+logger.infc.additivity=false
+logger.infc.appenderRef.file.ref=RollingFile
+logger.infc.appenderRef.stdout.ref=STDOUT
+
+appenders = stdout,file
+
+# Direct log messages to stdout
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.target=SYSTEM_OUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+appender.file.type = RollingFile
+appender.file.name = RollingFile
+appender.file.fileName=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.filePattern=${env:OPEN_CLI_HOME}/logs/open-cli.log
+appender.file.append=true
+appender.file.policies.type=Policies
+appender.file.policies.size.type=SizeBasedTriggeringPolicy
+appender.file.policies.size.size=5MB
+appender.file.strategy.type=DefaultRolloverStrategy
+appender.file.strategy.max=10
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

diff --git a/profiles/snmp/pom.xml b/profiles/snmp/pom.xml
index 293230f..2c48346 100644 (file)
--- a/profiles/snmp/pom.xml
+++ b/profiles/snmp/pom.xml
@@ -43,6 +43,23 @@
             <groupId>org.snmp4j</groupId>
             <artifactId>snmp4j</artifactId>
             <version>2.5.6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+      <dependency>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+          <version>2.13.0</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-ext</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/profiles/snmp/src/test/resources/log4j2.properties b/profiles/snmp/src/test/resources/log4j2.properties
new file mode 100644 (file)
index 0000000..a00c3c5
--- /dev/null
+++ b/profiles/snmp/src/test/resources/log4j2.properties
@@ -0,0 +1,35 @@
+# Copyright 2020 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.
+
+# By default, log4j2 will look for a configuration file named log4j2.xml on the classpath.
+# reference: https://logging.apache.org/log4j/2.x/faq.html#troubleshooting
+
+appenders =stdout
+
+rootLogger.level=ERROR
+rootLogger.appenderRefs=stdout
+rootLogger.appenderRef.stdout.ref=STDOUT
+
+loggers=cli
+
+logger.cli.name = org.onap.cli
+logger.cli.level=DEBUG
+logger.cli.appenderRef.stdout.ref=STDOUT
+
+# Direct log messages to stdout
+appender.stdout.type=Console
+appender.stdout.name=STDOUT
+appender.stdout.target=SYSTEM_OUT
+appender.stdout.layout.type=PatternLayout
+appender.stdout.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n