Add missing dependency

components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java

@@ -48,6 +48,22 @@ public interface EntgraLogger extends Log {
 
     void warn(Object object, Throwable t, LogContext logContext);
 
+    void info(String message, LogContext logContext);
+
+    void debug(String message, LogContext logContext);
+
+    void error(String message, LogContext logContext);
+
+    void error(String message, Throwable t, LogContext logContext);
+
+    void warn(String message, LogContext logContext);
+
+    void warn(String message, Throwable t, LogContext logContext);
+
+    void trace(String message, LogContext logContext);
+
+    void fatal(String message, LogContext logContext);
+
     void clearLogContext();
 
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml

@@ -112,7 +112,9 @@
                             org.wso2.carbon.event.processor.stub,
                             org.wso2.carbon.identity.jwt.client.extension.service,
                             org.apache.commons.codec.binary,
-                            io.entgra.server.bootup.heartbeat.beacon
+                            io.entgra.server.bootup.heartbeat.beacon,
+                            io.entgra.device.mgt.extensions.logger.*,
+                            io.entgra.notification.logger.*
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.core.internal,
@@ -347,6 +349,10 @@
             <artifactId>okhttp</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.notification.logger</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java

@@ -18,8 +18,9 @@
 
 package org.wso2.carbon.device.mgt.core.notification.mgt;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger;
+import io.entgra.notification.logger.DeviceLogContext;
+import io.entgra.notification.logger.impl.EntgraLoggerImpl;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
@@ -45,8 +46,8 @@ import java.util.List;
  */
 public class NotificationManagementServiceImpl implements NotificationManagementService {
 
-    private static final Log log = LogFactory.getLog(NotificationManagementServiceImpl.class);
-
+    private static final EntgraLogger log = new EntgraLoggerImpl(NotificationManagementServiceImpl.class);
+    DeviceLogContext.Builder deviceLogContexBuilder = new DeviceLogContext.Builder();
     private NotificationDAO notificationDAO;
 
     public NotificationManagementServiceImpl() {

components/logger/io.entgra.notification.logger/pom.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+~
+~ Entgra (pvt) Ltd. licenses this file to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>logger</artifactId>
+        <version>5.0.17-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>io.entgra.notification.logger</artifactId>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.device.mgt.extensions.logger</artifactId>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
+                        <Bundle-Description>Device Notification Logger Bundle</Bundle-Description>
+                        <Import-Package>
+                            io.entgra.logger;version="[2.0,3)",
+                            io.entgra.logger.spi;version="[2.0,3)",
+                            org.apache.commons.logging;version="[1.2,2)",
+                            org.apache.log4j;version="[1.2,2)",
+                            org.wso2.carbon.context;version="[4.4,5)
+                        </Import-Package>
+                        <Export-Package>
+                            io.entgra.notification.logger.*
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/DeviceLogContext.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (pvt) Ltd. licenses this file to you 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.
+ */
+
+package io.entgra.notification.logger;
+
+import io.entgra.device.mgt.extensions.logger.LogContext;
+
+public class DeviceLogContext extends LogContext {
+    private final String deviceName;
+    private final String operationCode;
+    private final String deviceType;
+    private final String tenantID;
+
+    private DeviceLogContext(Builder builder) {
+        this.operationCode = builder.operationCode;
+        this.deviceName = builder.deviceName;
+        this.deviceType = builder.deviceType;
+        this.tenantID = builder.tenantID;
+    }
+
+    public String getTenantID() {
+        return tenantID;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public String getOperationCode() {
+        return operationCode;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+
+    public static class Builder {
+        private String deviceName;
+        private String operationCode;
+        private String deviceType;
+        private String tenantID;
+
+        public Builder() {
+        }
+
+        public String getDeviceType() {
+            return deviceType;
+        }
+
+        public Builder setDeviceType(String deviceType) {
+            this.deviceType = deviceType;
+            return this;
+        }
+
+        public String getTenantID() {
+            return tenantID;
+        }
+
+        public Builder setTenantID(String tenantID) {
+            this.tenantID = tenantID;
+            return this;
+        }
+
+        public String getDeviceName() {
+            return deviceName;
+        }
+
+        public Builder setDeviceName(String deviceName) {
+            this.deviceName = deviceName;
+            return this;
+        }
+
+        public String getOperationCode() {
+            return operationCode;
+        }
+
+        public Builder setOperationCode(String operationCode) {
+            this.operationCode = operationCode;
+            return this;
+        }
+
+        public DeviceLogContext build() {
+            return new DeviceLogContext(this);
+        }
+
+    }
+}

components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/impl/EntgraLoggerImpl.java

@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (pvt) Ltd. licenses this file to you 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.
+ */
+package io.entgra.notification.logger.impl;
+
+
+import io.entgra.device.mgt.extensions.logger.LogContext;
+import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger;
+import io.entgra.notification.logger.DeviceLogContext;
+import io.entgra.notification.logger.util.MDCContextUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.MDC;
+
+
+public class EntgraLoggerImpl implements EntgraLogger {
+
+    private static Log log = null;
+
+    public EntgraLoggerImpl(Class<?> clazz) {
+        log = LogFactory.getLog(clazz);
+    }
+
+    @Override
+    public void info(Object object, LogContext logContext) {
+    }
+
+    @Override
+    public void info(Object object, Throwable t, LogContext logContext) {
+    }
+
+    @Override
+    public void debug(Object object, LogContext logContext) {
+    }
+
+    @Override
+    public void debug(Object object, Throwable t, LogContext logContext) {
+    }
+
+    @Override
+    public void error(Object object, LogContext logContext) {
+    }
+
+    @Override
+    public void error(Object object, Throwable t, LogContext logContext) {
+    }
+
+    @Override
+    public void fatal(Object object, LogContext logContext) {
+    }
+
+    @Override
+    public void fatal(Object object, Throwable t, LogContext logContext) {
+    }
+
+    @Override
+    public void trace(Object object, LogContext logContext) {
+
+    }
+
+    @Override
+    public void trace(Object object, Throwable t, LogContext logContext) {
+
+    }
+
+    @Override
+    public void warn(Object object, LogContext logContext) {
+    }
+
+    @Override
+    public void warn(Object object, Throwable t, LogContext logContext) {
+    }
+
+    public void info(String message) {
+    }
+
+    public void info(String message, Throwable t) {
+        log.info(message, t);
+    }
+
+    @Override
+    public void info(String message, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.info(message);
+    }
+
+
+    public void debug(String message) {
+        log.debug(message);
+    }
+
+
+    public void debug(String message, Throwable t) {
+        log.debug(message, t);
+    }
+
+    @Override
+    public void debug(String message, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.debug(message);
+    }
+
+    public void error(String message) {
+        log.error(message);
+    }
+
+
+    public void error(String message, Throwable t) {
+        log.error(message, t);
+    }
+
+    @Override
+    public void error(String message, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.error(message);
+    }
+
+    @Override
+    public void error(String message, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.error(message, t);
+    }
+
+
+    public void warn(String message) {
+        log.warn(message);
+    }
+
+
+    public void warn(String message, Throwable t) {
+        log.warn(message, t);
+    }
+
+    @Override
+    public void warn(String message, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.warn(message);
+    }
+
+    @Override
+    public void warn(String message, Throwable t, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.warn(message, t);
+    }
+
+
+    public void trace(String message) {
+        log.trace(message);
+    }
+
+
+    public void trace(String message, Throwable t) {
+        log.trace(message, t);
+    }
+
+    @Override
+    public void trace(String message, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.trace(message);
+    }
+
+
+    public void fatal(String message) {
+        log.fatal(message);
+    }
+
+
+    public void fatal(String message, Throwable t) {
+        log.fatal(message, t);
+    }
+
+    @Override
+    public void fatal(String message, LogContext logContext) {
+        DeviceLogContext deviceLogContext = (DeviceLogContext) logContext;
+        MDCContextUtil.populateDeviceMDCContext(deviceLogContext);
+        log.fatal(message);
+    }
+
+    @Override
+    public void debug(Object o) {
+        log.debug(o);
+    }
+
+    @Override
+    public void debug(Object o, Throwable throwable) {
+        log.debug(o, throwable);
+    }
+
+    @Override
+    public void error(Object o) {
+        log.error(o);
+    }
+
+    @Override
+    public void error(Object o, Throwable throwable) {
+        log.error(o, throwable);
+    }
+
+    @Override
+    public void fatal(Object o) {
+        log.fatal(0);
+    }
+
+    @Override
+    public void fatal(Object o, Throwable throwable) {
+        log.fatal(0, throwable);
+    }
+
+    @Override
+    public void info(Object o) {
+        log.info(o);
+    }
+
+    @Override
+    public void info(Object o, Throwable throwable) {
+        log.info(o, throwable);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return log.isDebugEnabled();
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    @Override
+    public boolean isFatalEnabled() {
+        return log.isFatalEnabled();
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return log.isInfoEnabled();
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return log.isTraceEnabled();
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return log.isWarnEnabled();
+    }
+
+    @Override
+    public void trace(Object o) {
+        log.trace(o);
+    }
+
+    @Override
+    public void trace(Object o, Throwable throwable) {
+        log.trace(o, throwable);
+    }
+
+    @Override
+    public void warn(Object o) {
+        log.warn(o);
+    }
+
+    @Override
+    public void warn(Object o, Throwable throwable) {
+        log.warn(o, throwable);
+    }
+
+    @Override
+    public void clearLogContext() {
+        MDC.clear();
+    }
+}

components/logger/io.entgra.notification.logger/src/main/java/io/entgra/notification/logger/util/MDCContextUtil.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (pvt) Ltd. licenses this file to you 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.
+ */
+package io.entgra.notification.logger.util;
+
+import io.entgra.notification.logger.DeviceLogContext;
+import org.apache.log4j.MDC;
+
+public final class MDCContextUtil {
+
+    public static void populateDeviceMDCContext(final DeviceLogContext mdcContext) {
+        if (mdcContext.getDeviceName() != null) {
+            MDC.put("DeviceName", mdcContext.getDeviceName());
+        }
+        if (mdcContext.getDeviceType() != null) {
+            MDC.put("DeviceType", mdcContext.getDeviceType());
+        }
+        if (mdcContext.getOperationCode() != null) {
+            MDC.put("OperationCode", mdcContext.getOperationCode());
+        }
+        if (mdcContext.getTenantID() != null) {
+            MDC.put("TenantId", mdcContext.getTenantID());
+        }
+    }
+}
+
+

components/logger/io.entgra.notification.logger/src/test/java/io/entgra/logger/impl/EntgraLoggerImplTest.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (pvt) Ltd. licenses this file to you 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.
+ */
+package io.entgra.logger.impl;
+
+import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger;
+import io.entgra.notification.logger.DeviceLogContext;
+import io.entgra.notification.logger.impl.EntgraLoggerImpl;
+import org.testng.annotations.Test;
+
+public class EntgraLoggerImplTest {
+
+    private final EntgraLogger log = new EntgraLoggerImpl(EntgraLoggerImplTest.class);
+
+    @Test
+    public void logTest() {
+
+        DeviceLogContext.Builder deviceLogContext = new DeviceLogContext.Builder();
+
+        deviceLogContext.setDeviceName("M02S");
+        deviceLogContext.setDeviceType("Android");
+        deviceLogContext.setOperationCode("1222");
+        deviceLogContext.setTenantID("1234");
+
+        log.debug("Test debug message", deviceLogContext.build());
+        log.info("Test info message", deviceLogContext.build());
+        log.error("Test error message", deviceLogContext.build());
+        log.warn("Test warn message", deviceLogContext.build());
+        log.trace("Test trace message", deviceLogContext.build());
+        log.fatal("Test fatal message", deviceLogContext.build());
+        log.error("debug message test", new Throwable("error throw"));
+        log.info("info message test");
+
+//        log.isDebugEnabled();
+//        log.isErrorEnabled();
+//        log.isFatalEnabled();
+//        log.isInfoEnabled();
+//        log.isTraceEnabled();
+//        log.isWarnEnabled();
+
+    }
+
+}

components/logger/io.entgra.notification.logger/src/test/resources/log4j.properties

@@ -0,0 +1,32 @@
+#
+# Copyright 2023 Entgra Pvt. Ltd.. (http://entgra.io)
+#
+# 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.
+#
+
+#
+# This is the log4j configuration file used by Entgra Pvt. Ltd.
+#
+# IMPORTANT : Please do not remove or change the names of any
+# of the Appenders defined here. The layout pattern & log file
+# can be changed using the WSO2 Carbon Management Console, and those
+# settings will override the settings in this file.
+#
+
+log4j.rootLogger=DEBUG, STD_OUT
+ 
+# Redirect log messages to console
+log4j.appender.STD_OUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STD_OUT.Target=System.out
+log4j.appender.STD_OUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STD_OUT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

components/logger/io.entgra.notification.logger/src/test/resources/testng.xml

@@ -0,0 +1,29 @@
+<!--
+  ~ Copyright (c) 2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~
+  ~ Entgra (Pvt) Ltd. licenses this file to you 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.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="EntgraLogger">
+    <parameter name="useDefaultListeners" value="false"/>
+
+    <test name="Entgra Logger Tests" preserve-order="true">
+        <classes>
+            <class name="io.entgra.logger.impl.EntgraLoggerImplTest"/>
+        </classes>
+    </test>
+</suite>

components/logger/pom.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+~
+~ Entgra (pvt) Ltd. licenses this file to you 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>carbon-devicemgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>5.0.17-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>logger</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT - Notification logger</name>
+    <url>http://entgra.io</url>
+
+    <modules>
+        <module>io.entgra.notification.logger</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

features/logger/io.entgra.notification.logger.feature/pom.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+~ Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+~
+~ Entgra (pvt) Ltd. licenses this file to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>logger-feature</artifactId>
+        <version>5.0.17-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>io.entgra.notification.logger.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra - Device Notification logger</name>
+    <url>http://entgra.io</url>
+    <description>
+        This feature bundles for the Entgra Notification logger
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.device.mgt.extensions.logger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.notification.logger</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>io.entgra.notification.logger</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:true</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.notification.logger:${carbon.device.mgt.version}
+                                </bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

features/logger/io.entgra.notification.logger.feature/src/main/resources/build.properties

@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2018 - 2023 Entgra (Pvt) Ltd, Inc - All Rights Reserved.
+#
+# Unauthorised copying/redistribution of this file, via any medium is strictly prohibited.
+#
+# Licensed under the Entgra Commercial License, Version 1.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://entgra.io/licenses/entgra-commercial/1.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.
+#
+
+custom = true

features/logger/io.entgra.notification.logger.feature/src/main/resources/p2.inf

@@ -0,0 +1 @@
+instructions.configure = \

features/logger/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+~ Copyright (c) 2023, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+~
+~ Entgra (pvt) Ltd. licenses this file to you 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>carbon-devicemgt</artifactId>
+        <version>5.0.17-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>logger-feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra - Logger Feature</name>
+    <url>http://entgra.io</url>
+
+    <modules>
+        <module>io.entgra.notification.logger.feature</module>
+    </modules>
+
+</project>

pom.xml

@@ -35,6 +35,7 @@
 
     <modules>
         <module>components/heartbeat-management</module>
+        <module>components/logger</module>
         <module>components/device-mgt</module>
         <module>components/device-mgt-extensions</module>
         <module>components/identity-extensions</module>
@@ -46,6 +47,7 @@
         <module>components/transport-mgt</module>
         <module>components/analytics-mgt</module>
         <module>components/webapp-authenticator-framework</module>
+        <module>features/logger</module>
         <module>features/device-mgt</module>
         <module>features/apimgt-extensions</module>
         <module>features/application-mgt</module>
@@ -348,6 +350,11 @@
                 <artifactId>org.wso2.carbon.apimgt.keymgt.extension.api</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>io.entgra.notification.logger</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
             <!-- Device Management dependencies -->
 
             <!-- Governance dependencies -->