Merge branch 'wso2-master'

# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java

components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Annotations</name>
     <description>WSO2 Carbon - API Management Custom Annotation Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml

@@ -21,12 +21,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Application Management API</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml

@@ -22,12 +22,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Application Management</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Security Handler Component</name>
     <description>WSO2 Carbon - API Management Security Handler Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<artifactId>apimgt-extensions</artifactId>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<version>3.0.82-SNAPSHOT</version>
+		<version>3.0.95-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>
-	<version>3.0.82-SNAPSHOT</version>
+	<version>3.0.95-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - API Management Integration Client</name>
 	<description>WSO2 Carbon - API Management Integration Client</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<artifactId>apimgt-extensions</artifactId>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<version>3.0.82-SNAPSHOT</version>
+		<version>3.0.95-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>
-	<version>3.0.82-SNAPSHOT</version>
+	<version>3.0.95-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - API Management Integration Generated Client</name>
 	<description>WSO2 Carbon - API Management Integration Client</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>

components/apimgt-extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Component</name>
     <url>http://wso2.org</url>

components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>

components/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Component</name>
     <url>http://wso2.org</url>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -367,6 +367,11 @@
 			<artifactId>org.wso2.carbon.event.stream.persistence.stub</artifactId>
 			<scope>provided</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -562,7 +562,12 @@ public class UserManagementServiceImpl implements UserManagementService {
             }
         } catch (DeviceManagementException e) {
             String msg = "Error occurred while inviting user to enrol their device";
+            if (e.getMessage() != null && !e.getMessage().isEmpty()) {
+                msg = e.getMessage();
+            }
             log.error(msg, e);
+            return Response.serverError().entity(
+                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
         } catch (UserStoreException e) {
             String msg = "Error occurred while getting claim values to invite user";
             log.error(msg, e);

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

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/GroupPaginationRequest.java

@@ -65,4 +65,10 @@ public class GroupPaginationRequest {
         this.groupName = groupName;
     }
 
+    @Override
+    public String toString() {
+        return "Group Name '" + this.groupName + "' num of rows: " + this.rowCount + " start index: " + this.startIndex
+                + " owner' " + this.owner + "'";
+    }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/PaginationRequest.java

@@ -129,4 +129,12 @@ public class PaginationRequest {
     public void setOwnerPattern(String ownerPattern) {
         this.ownerPattern = ownerPattern;
     }
+
+    @Override
+    public String toString() {
+        return "Device type '" + this.deviceType + "' Device Name '" + this.deviceName + "' row count: " + this.rowCount
+                + " Owner role '" + this.ownerRole + "' owner pattern '" + this.ownerPattern + "' ownership "
+                + this.ownership + "' Status '" + this.status + "' owner '" + this.owner + "' groupId: " + this.groupId
+                + " start index: " + this.startIndex;
+    }
 }

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java

@@ -182,16 +182,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
             stmt.setString(3, Operation.Status.PENDING.toString());
             // This will return only one result always.
             rs = stmt.executeQuery();
-            int id = 0;
             if (rs.next()) {
-                id = rs.getInt("ID");
-            }
-            if (id != 0) {
-                stmt = connection.prepareStatement(
-                        "UPDATE DM_ENROLMENT_OP_MAPPING SET UPDATED_TIMESTAMP = ?  " + "WHERE ID = ?");
-                stmt.setLong(1, System.currentTimeMillis() / 1000);
-                stmt.setInt(2, id);
-                stmt.executeUpdate();
                 result = true;
             }
         } catch (SQLException e) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java

@@ -65,6 +65,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public void createGroup(DeviceGroup deviceGroup, String defaultRole, String[] defaultPermissions)
             throws GroupManagementException, GroupAlreadyExistException {
+        if (deviceGroup == null) {
+            String msg = "Received incomplete data for createGroup";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Creating group '" + deviceGroup.getName() + "'");
+        }
         if (deviceGroup == null) {
             throw new GroupManagementException("DeviceGroup cannot be null.", new NullPointerException());
         }
@@ -80,10 +88,17 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             }
         } catch (GroupManagementDAOException e) {
             GroupManagementDAOFactory.rollbackTransaction();
-            throw new GroupManagementException("Error occurred while adding deviceGroup " +
+            String msg = "Error occurred while adding deviceGroup '" + deviceGroup.getName() + "' to database.";
-                    "'" + deviceGroup.getName() + "' to database.", e);
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (TransactionManagementException e) {
-            throw new GroupManagementException("Error occurred while initiating transaction.", e);
+            String msg = "Error occurred while initiating transaction.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in creating group '" + deviceGroup.getName() + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -99,6 +114,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public void updateGroup(DeviceGroup deviceGroup, int groupId)
             throws GroupManagementException, GroupAlreadyExistException {
+        if (deviceGroup == null) {
+            String msg = "Received incomplete data for updateGroup";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("update group '" + deviceGroup.getName() + "'");
+        }
         if (deviceGroup == null) {
             throw new GroupManagementException("DeviceGroup cannot be null.", new NullPointerException());
         }
@@ -114,10 +137,17 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             }
         } catch (GroupManagementDAOException e) {
             GroupManagementDAOFactory.rollbackTransaction();
-            throw new GroupManagementException("Error occurred while modifying deviceGroup " +
+            String msg = "Error occurred while modifying deviceGroup '" + deviceGroup.getName() + "'.";
-                    "'" + deviceGroup.getName() + "'.", e);
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (TransactionManagementException e) {
-            throw new GroupManagementException("Error occurred while initiating transaction.", e);
+            String msg = "Error occurred while initiating transaction.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in updating group '" + deviceGroup.getName() + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -128,6 +158,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public boolean deleteGroup(int groupId) throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Delete group: " + groupId);
+        }
         DeviceGroup deviceGroup = getGroup(groupId);
         if (deviceGroup == null) {
             return false;
@@ -142,9 +175,17 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             return true;
         } catch (GroupManagementDAOException e) {
             GroupManagementDAOFactory.rollbackTransaction();
-            throw new GroupManagementException("Error occurred while removing group data.", e);
+            String msg = "Error occurred while removing group data.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (TransactionManagementException e) {
-            throw new GroupManagementException("Error occurred while initiating transaction.", e);
+            String msg = "Error occurred while initiating transaction.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in deleting group: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -155,14 +196,25 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public DeviceGroup getGroup(int groupId) throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Get group by id: " + groupId);
+        }
         DeviceGroup deviceGroup;
         try {
             GroupManagementDAOFactory.openConnection();
             deviceGroup = this.groupDAO.getGroup(groupId, CarbonContext.getThreadLocalCarbonContext().getTenantId());
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while obtaining group '" + groupId + "'", e);
+            String msg = "Error occurred while obtaining group '" + groupId + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroup for groupId: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -174,14 +226,30 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public DeviceGroup getGroup(String groupName) throws GroupManagementException {
+        if (groupName == null) {
+            String msg = "Received empty groupName for getGroup";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get group by name '" + groupName + "'");
+        }
         DeviceGroup deviceGroup;
         try {
             GroupManagementDAOFactory.openConnection();
             deviceGroup = this.groupDAO.getGroup(groupName, CarbonContext.getThreadLocalCarbonContext().getTenantId());
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while obtaining group with name: '" + groupName + "'", e);
+            String msg = "Error occurred while obtaining group with name: '" + groupName + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroup with name " + groupName;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -190,15 +258,26 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
 
     @Override
     public List<DeviceGroup> getGroups() throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups");
+        }
         List<DeviceGroup> deviceGroups = new ArrayList<>();
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             GroupManagementDAOFactory.openConnection();
             deviceGroups = this.groupDAO.getGroups(tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -207,6 +286,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
 
     @Override
     public PaginationResult getGroups(GroupPaginationRequest request) throws GroupManagementException {
+        if (request == null) {
+            String msg = "Received incomplete data for getGroup";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups with pagination " + request.toString());
+        }
         request = DeviceManagerUtil.validateGroupListPageSize(request);
         List<DeviceGroup> deviceGroups = new ArrayList<>();
         try {
@@ -214,9 +301,17 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             GroupManagementDAOFactory.openConnection();
             deviceGroups = this.groupDAO.getGroups(request, tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -228,6 +323,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
 
     @Override
     public List<DeviceGroup> getGroups(String username) throws GroupManagementException {
+        if (username == null || username.isEmpty()) {
+            String msg = "Received null user name for getGroups";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups of owner '" + username + "'");
+        }
         Map<Integer, DeviceGroup> groups = new HashMap<>();
         UserStoreManager userStoreManager;
         try {
@@ -245,11 +348,20 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
                 groups.put(deviceGroup.getGroupId(), deviceGroup);
             }
         } catch (UserStoreException e) {
-            throw new GroupManagementException("Error occurred while getting user store manager.", e);
+            String msg = "Error occurred while getting user store manager.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups accessible to user.", e);
+            String msg = "Error occurred while retrieving all groups accessible to user.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (GroupManagementDAOException e) {
+            log.error(e);
             throw new GroupManagementException(e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups for " + username;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -257,6 +369,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     }
 
     private List<Integer> getGroupIds(String username) throws GroupManagementException {
+        if (username == null || username.isEmpty()) {
+            String msg = "Received empty user name for getGroupIds";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups Ids of owner '" + username + "'");
+        }
         UserStoreManager userStoreManager;
         List<Integer> deviceGroupIds = new ArrayList<>();
         try {
@@ -268,11 +388,20 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             deviceGroupIds = this.groupDAO.getOwnGroupIds(username, tenantId);
             deviceGroupIds.addAll(this.groupDAO.getGroupIds(roleList, tenantId));
         } catch (UserStoreException e) {
-            throw new GroupManagementException("Error occurred while getting user store manager.", e);
+            String msg = "Error occurred while getting user store manager.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups accessible to user.", e);
+            String msg = "Error occurred while retrieving all groups accessible to user.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (GroupManagementDAOException e) {
+            log.error(e);
             throw new GroupManagementException(e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups for username '" + username + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -282,6 +411,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public PaginationResult getGroups(String currentUser, GroupPaginationRequest request)
             throws GroupManagementException {
+        if (currentUser == null || request == null) {
+            String msg = "Received incomplete date for getGroups";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get all groups of user '" + currentUser + "' pagination request " + request.toString());
+        }
         request = DeviceManagerUtil.validateGroupListPageSize(request);
         List<Integer> allDeviceGroupIdsOfUser = getGroupIds(currentUser);
         List<DeviceGroup> allMatchingGroups = new ArrayList<>();
@@ -290,9 +427,17 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             GroupManagementDAOFactory.openConnection();
             allMatchingGroups = this.groupDAO.getGroups(request, allDeviceGroupIdsOfUser, tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -304,28 +449,55 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
 
     @Override
     public int getGroupCount() throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups count");
+        }
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             GroupManagementDAOFactory.openConnection();
             return groupDAO.getGroupCount(tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
     }
 
     private int getGroupCount(GroupPaginationRequest request) throws GroupManagementException {
+        if (request == null) {
+            String msg = "Received empty request for getGroupCount";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups count, pagination request " + request.toString());
+        }
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             GroupManagementDAOFactory.openConnection();
             return groupDAO.getGroupCount(request, tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroupCount";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -336,6 +508,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public int getGroupCount(String username) throws GroupManagementException {
+        if (username == null || username.isEmpty()) {
+            String msg = "Received empty user name for getGroupCount";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups count of '" + username + "'");
+        }
         UserStoreManager userStoreManager;
         int count;
         try {
@@ -348,11 +528,21 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             count += groupDAO.getGroupsCount(roleList, tenantId);
             return count;
         } catch (UserStoreException e) {
-            throw new GroupManagementException("Error occurred while getting user store manager.", e);
+            String msg = "Error occurred while getting user store manager.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving group count of user '" + username + "'", e);
+            String msg = "Error occurred while retrieving group count of user '" + username + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroupCount for username '" + username + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -364,41 +554,52 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public void manageGroupSharing(int groupId, List<String> newRoles)
             throws GroupManagementException, RoleDoesNotExistException {
-            int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+        if (log.isDebugEnabled()) {
-            UserStoreManager userStoreManager;
+            log.debug("Manage group sharing for group: " + groupId);
-            try {
+        }
-                userStoreManager =
+        int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-                        DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(
+        UserStoreManager userStoreManager;
-                                tenantId).getUserStoreManager();
+        try {
-                List<String> currentUserRoles = getRoles(groupId);
+            userStoreManager =
-                GroupManagementDAOFactory.beginTransaction();
+                    DeviceManagementDataHolder.getInstance().getRealmService().getTenantUserRealm(
-                if (newRoles != null) {
+                            tenantId).getUserStoreManager();
-                    for (String role : newRoles) {
+            List<String> currentUserRoles = getRoles(groupId);
-                        if (!userStoreManager.isExistingRole(role)) {
+            GroupManagementDAOFactory.beginTransaction();
-                            throw new RoleDoesNotExistException("Role '" + role + "' does not exists in the user store.");
+            if (newRoles != null) {
-                        }
+                for (String role : newRoles) {
-                        // Removing role from current user roles of the group will return true if role exist.
+                    if (!userStoreManager.isExistingRole(role)) {
-                        // So we don't need to add it to the db again.
+                        throw new RoleDoesNotExistException("Role '" + role + "' does not exists in the user store.");
-                        if (!currentUserRoles.remove(role)) {
+                    }
-                            // If group doesn't have the role, it is adding to the db.
+                    // Removing role from current user roles of the group will return true if role exist.
-                            groupDAO.addRole(groupId, role, tenantId);
+                    // So we don't need to add it to the db again.
-                        }
+                    if (!currentUserRoles.remove(role)) {
+                        // If group doesn't have the role, it is adding to the db.
+                        groupDAO.addRole(groupId, role, tenantId);
                     }
                 }
-                for (String role : currentUserRoles) {
+            }
-                    // Removing old roles from db which are not available in the new roles list.
+            for (String role : currentUserRoles) {
-                    groupDAO.removeRole(groupId, role, tenantId);
+                // Removing old roles from db which are not available in the new roles list.
-                }
+                groupDAO.removeRole(groupId, role, tenantId);
-                GroupManagementDAOFactory.commitTransaction();
+            }
-            } catch (GroupManagementDAOException e) {
+            GroupManagementDAOFactory.commitTransaction();
-                GroupManagementDAOFactory.rollbackTransaction();
+        } catch (GroupManagementDAOException e) {
-                throw new GroupManagementException(e);
+            GroupManagementDAOFactory.rollbackTransaction();
-            } catch (UserStoreException e) {
+            log.error(e);
-                throw new GroupManagementException("User store error in updating sharing roles.", e);
+            throw new GroupManagementException(e);
-            } catch (TransactionManagementException e) {
+        } catch (UserStoreException e) {
-                throw new GroupManagementException(e);
+            String msg = "User store error in updating sharing roles.";
-            } finally {
+            log.error(msg, e);
-                GroupManagementDAOFactory.closeConnection();
+            throw new GroupManagementException(msg, e);
+        } catch (TransactionManagementException e) {
+            log.error(e);
+            throw new GroupManagementException(e);
+        } catch (Exception e) {
+            String msg = "Error occurred in manageGroupSharing for groupId: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } finally {
+            GroupManagementDAOFactory.closeConnection();
         }
     }
 
@@ -407,14 +608,25 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public List<String> getRoles(int groupId) throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Group roles for group: " + groupId);
+        }
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             GroupManagementDAOFactory.openConnection();
             return groupDAO.getRoles(groupId, tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getRoles for groupId: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -426,6 +638,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public List<Device> getDevices(int groupId, int startIndex, int rowCount)
             throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Group devices of group: " + groupId + " start index " + startIndex + " row count " + rowCount);
+        }
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
         List<Device> devices;
         try {
@@ -433,11 +648,21 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             GroupManagementDAOFactory.openConnection();
             devices = this.groupDAO.getDevices(groupId, startIndex, rowCount, tenantId);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while getting devices in group.", e);
+            String msg = "Error occurred while getting devices in group.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (DeviceManagementException e) {
-            throw new GroupManagementException("Error occurred while validating the limit of the devices to be returned", e);
+            String msg = "Error occurred while validating the limit of the devices to be returned";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getDevices for groupId: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -449,13 +674,24 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public int getDeviceCount(int groupId) throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Group devices count of group: " + groupId);
+        }
         try {
             GroupManagementDAOFactory.openConnection();
             return groupDAO.getDeviceCount(groupId, CarbonContext.getThreadLocalCarbonContext().getTenantId());
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving all groups in tenant", e);
+            String msg = "Error occurred while retrieving all groups in tenant";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening a connection to the data source.", e);
+            String msg = "Error occurred while opening a connection to the data source.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getDeviceCount for groupId: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -467,6 +703,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public void addDevices(int groupId, List<DeviceIdentifier> deviceIdentifiers)
             throws GroupManagementException, DeviceNotFoundException {
+        if (log.isDebugEnabled()) {
+            log.debug("Group devices to the group: " + groupId);
+        }
         Device device;
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
@@ -483,12 +722,22 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             }
             GroupManagementDAOFactory.commitTransaction();
         } catch (DeviceManagementException e) {
-            throw new GroupManagementException("Error occurred while retrieving device.", e);
+            String msg = "Error occurred while retrieving device.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (GroupManagementDAOException e) {
             GroupManagementDAOFactory.rollbackTransaction();
-            throw new GroupManagementException("Error occurred while adding device to group.", e);
+            String msg = "Error occurred while adding device to group.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (TransactionManagementException e) {
-            throw new GroupManagementException("Error occurred while initiating transaction.", e);
+            String msg = "Error occurred while initiating transaction.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in addDevices for groupId " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -500,6 +749,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     @Override
     public void removeDevice(int groupId, List<DeviceIdentifier> deviceIdentifiers)
             throws GroupManagementException, DeviceNotFoundException {
+        if (log.isDebugEnabled()) {
+            log.debug("Remove devices from the group: " + groupId);
+        }
         Device device;
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
@@ -514,12 +766,22 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             }
             GroupManagementDAOFactory.commitTransaction();
         } catch (DeviceManagementException e) {
-            throw new GroupManagementException("Error occurred while retrieving device.", e);
+            String msg = "Error occurred while retrieving device.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (TransactionManagementException e) {
-            throw new GroupManagementException("Error occurred while initiating transaction.", e);
+            String msg = "Error occurred while initiating transaction.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (GroupManagementDAOException e) {
             GroupManagementDAOFactory.rollbackTransaction();
-            throw new GroupManagementException("Error occurred while adding device to group.", e);
+            String msg = "Error occurred while adding device to group.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in removeDevice for groupId: " + groupId;
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -530,6 +792,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public List<DeviceGroup> getGroups(String username, String permission) throws GroupManagementException {
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups of user '" + username + "'");
+        }
         List<DeviceGroup> deviceGroups = getGroups(username);
         Map<Integer, DeviceGroup> permittedDeviceGroups = new HashMap<>();
         UserRealm userRealm;
@@ -546,13 +811,27 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
                 }
             }
         } catch (UserStoreException e) {
-            throw new GroupManagementException("Error occurred while getting user realm.", e);
+            String msg = "Error occurred while getting user realm.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups for username '" + username + "'";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         }
         return new ArrayList<>(permittedDeviceGroups.values());
     }
 
     @Override
     public List<DeviceGroup> getGroups(DeviceIdentifier deviceIdentifier) throws GroupManagementException {
+        if (deviceIdentifier == null) {
+            String msg = "Received empty device identifier for getGroups";
+            log.error(msg);
+            throw new GroupManagementException(msg);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Get groups of device " + deviceIdentifier.getId());
+        }
         DeviceManagementProviderService managementProviderService = new DeviceManagementProviderServiceImpl();
         try {
             Device device = managementProviderService.getDevice(deviceIdentifier, false);
@@ -560,11 +839,21 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             return groupDAO.getGroups(device.getId(),
                     PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
         } catch (DeviceManagementException e) {
-            throw new GroupManagementException("Error occurred while retrieving the device details.", e);
+            String msg = "Error occurred while retrieving the device details.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (GroupManagementDAOException e) {
-            throw new GroupManagementException("Error occurred while retrieving device groups.", e);
+            String msg = "Error occurred while retrieving device groups.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } catch (SQLException e) {
-            throw new GroupManagementException("Error occurred while opening database connection.", e);
+            String msg = "Error occurred while opening database connection.";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
+        } catch (Exception e) {
+            String msg = "Error occurred in getGroups";
+            log.error(msg, e);
+            throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
         }
@@ -575,7 +864,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      */
     @Override
     public DeviceGroup createDefaultGroup(String groupName) throws GroupManagementException {
-
+        if (log.isDebugEnabled()) {
+            log.debug("Create default group " + groupName);
+        }
         DeviceGroup defaultGroup = this.getGroup(groupName);
         if (defaultGroup == null) {
             defaultGroup = new DeviceGroup(groupName);
@@ -586,10 +877,13 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
                 this.createGroup(defaultGroup, DeviceGroupConstants.Roles.DEFAULT_ADMIN_ROLE,
                         DeviceGroupConstants.Permissions.DEFAULT_ADMIN_PERMISSIONS);
             } catch (GroupAlreadyExistException e) {
-                if (log.isDebugEnabled()) {
+                String msg = "Default group: " + defaultGroup.getName() + " already exists. Skipping group creation.";
-                    log.debug("Default group: " + defaultGroup.getName() + " already exists. Skipping group creation.",
+                log.error(msg, e);
-                            e);
+                throw new GroupManagementException(msg, e);
-                }
+            } catch (Exception e) {
+                String msg = "Error occurred in createDefaultGroup for groupName '" + groupName + "'";
+                log.error(msg, e);
+                throw new GroupManagementException(msg, e);
             }
             return this.getGroup(groupName);
         } else {

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs

@@ -73,18 +73,7 @@
             <div class="wr-form">
                 <p class="page-sub-title">Group was created successfully.</p>
 
-                <br>Please click <b>"Add Another Group"</b>, if you wish to add another group or click
+                <br>You will be redirected to the Group Listing page in a moment.
-                <b>"View Group List"</b> to complete the process and go back to the group list.
-                <hr/>
-                <button class="wr-btn" onclick="window.location.href='{{@app.context}}/groups'">View Group List
-                </button>
-                <a href="{{@app.context}}/group/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                    Add Another Group
-                </a>
             </div>
         </div>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js

@@ -47,6 +47,9 @@ $(function () {
                 if (resp.status == 201) {
                     $("#group-create-form").addClass("hidden");
                     $("#group-created-msg").removeClass("hidden");
+                    setTimeout(function() {
+                        window.location.href = "/devicemgt/groups";
+                    }, 1000);
                 } else {
                     displayErrors(resp.status);
                 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs

@@ -87,7 +87,7 @@
                             <h3 class="text-muted">
                                 <i class="fw fw-group fw-3x"></i>
                             </h3>
-                            <h3 class="text-muted">You don't have any device group. Let's add a new device group!</h3>
+                            <h3 class="text-muted">You don't have any device groups. Let's add a new device group!</h3>
                             {{#if permissions.ADD_GROUP}}
                                 <h3>
                                     <!--suppress HtmlUnknownTarget -->
@@ -236,7 +236,7 @@
                     <div class="content">
                         <div class="row">
                             <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Do you really want to remove this group from your Group List?</h3>
+                                <h3>Do you really want to remove this group?</h3>
 
                                 <div class="buttons">
                                     <a href="#" id="remove-group-yes-link" class="btn-operations">
@@ -257,7 +257,7 @@
                     <div class="content">
                         <div class="row">
                             <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Group was successfully removed.</h3>
+                                <h3>Successfully removed the group.</h3>
                             </div>
                         </div>
                     </div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs

@@ -237,10 +237,12 @@
                         data-search="{{status}}"
                         data-display="{{status}}">
                     </td>
-                    <td class="text-right content-fill text-left-on-grid-view no-wrap">
+                    <td class="text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix">
                         <!--suppress HtmlUnknownTarget -->
                         <a href="{{@app.context}}/policy/edit?id={{id}}&deviceType={{platform}}"
                            data-id="{{id}}"
+                           data-toggle="tooltip"
+                           data-original-title="Edit"
                            data-click-event="remove-form"
                            class="btn padding-reduce-on-grid-view policy-update-link">
                                 <span class="fw-stack">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js

@@ -385,4 +385,7 @@ $(document).ready(function () {
         $("#policy-listing-status").removeClass("hidden");
     }
     $("#policy-grid").removeClass("hidden");
+
+    $('[data-toggle="tooltip"]').tooltip();
+
 });

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.view/view.hbs

@@ -37,6 +37,14 @@
     </li>
 {{/zone}}
 
+{{#zone "navbarActions"}}
+    {{#if canEdit}}
+        <li id="policy-edit">
+
+        </li>
+    {{/if}}
+{{/zone}}
+
 {{#zone "content"}}
     {{unit "cdmf.unit.device.operation-mod"}}
     {{unit "cdmf.unit.policy.view"}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.view/view.js

@@ -17,7 +17,14 @@
  */
 
 function onRequest(context) {
+    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var utility = require("/app/modules/utility.js")["utility"];
     var deviceType = request.getParameter("type");
-    return {"deviceTypePolicyView": utility.getTenantedDeviceUnitName(deviceType, "policy-view")};
+
+    var canEdit = false;
+    if(userModule.isAuthorized("/permission/admin/device-mgt/policy/manage")) {
+        canEdit = true;
+    }
+
+    return {"deviceTypePolicyView": utility.getTenantedDeviceUnitName(deviceType, "policy-view"), "canEdit": canEdit};
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js

@@ -140,7 +140,7 @@ function loadRoles() {
             }
         },
         {
-            class: "text-right content-fill text-left-on-grid-view no-wrap",
+            class: "text-right content-fill text-left-on-grid-view no-wrap tooltip-overflow-fix",
             data: null,
             render: function (data, type, row, meta) {
                 var isCloud = false;
@@ -153,7 +153,9 @@ function loadRoles() {
                 var editLink = '<a onclick="javascript:loadRoleBasedActionURL(\'edit\', \'' + data.name + '\')" ' +
                     'data-role="' + data.name + '" ' +
                     'data-click-event="edit-form" ' +
-                    'class="btn padding-reduce-on-grid-view edit-role-link">' +
+                    'data-toggle="tooltip" ' +
+                    'data-original-title="Edit Role"' +
+                    'class="btn padding-reduce-on-grid-view edit-role-link"> ' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
                     '<i class="fw fw-bookmark fw-stack-1x"></i>' +
@@ -167,7 +169,9 @@ function loadRoles() {
 
                 var editPermissionLink = '<a onclick="javascript:loadRoleBasedActionURL(\'edit-permission\', \'' + data.name + '\')" ' +
                     'data-role="' + data.name + '" ' +
-                    'data-click-event="edit-form" ' +
+                    'data-click-event="edit-form " ' +
+                    'data-toggle="tooltip" ' +
+                    'data-original-title="Edit Permission"' +
                     'class="btn padding-reduce-on-grid-view edit-permission-link">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
@@ -182,6 +186,8 @@ function loadRoles() {
 
                 var removeLink = '<a data-role="' + data.name + '" ' +
                     'data-click-event="remove-form" ' +
+                    'data-toggle="tooltip" ' +
+                    'data-original-title="Remove"' +
                     'class="btn padding-reduce-on-grid-view remove-role-link">' +
                     '<span class="fw-stack">' +
                     '<i class="fw fw-circle-outline fw-stack-2x"></i>' +
@@ -272,4 +278,7 @@ $("#role-grid").on("click", ".remove-role-link", function () {
 
 $(document).ready(function () {
     loadRoles();
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
 });

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs

@@ -16,7 +16,7 @@
   under the License.
 }}
 {{unit "cdmf.unit.ui.title" pageTitle="User Management | Add User"}}
-
+{{unit "cdmf.unit.ui.modal"}}
 {{#zone "breadcrumbs"}}
     <li>
         <a href="{{@app.context}}/">
@@ -122,26 +122,14 @@
                         <button id="add-user-btn" class="wr-btn">Add User</button>
                     </div>
                 </div>
-                <div id="user-created-msg" class="container col-centered wr-content hidden">
-                    <div class="wr-form">
-                        <p class="page-sub-title">User was added successfully.</p>
-                        <p>
-                            An invitation mail will be sent to this user to initiate device enrollment.
-                        </p>
 
-                        <br>Please click <b>"Add Another User"</b>, if you wish to add another user or click
+                <div id="modal-content-user-created" class="hide">
-                        <b>"View User List"</b> to complete the process and go back to the user list.
+                    <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
-                        <hr/>
+                        <i class="icon fw fw-error"></i><span></span>
-                        <button class="wr-btn" onclick="window.location.href='{{@app.context}}/users'">View User List
-                        </button>
-                        <a href="{{@app.context}}/user/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                            Add Another User
-                        </a>
                     </div>
+                    <h4>
+                        An invitation mail will be sent to this user to initiate device enrollment.
+                    </h4>
                 </div>
                 <!-- /content -->
             </div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js

@@ -226,7 +226,7 @@ $(document).ready(function () {
         var firstname = firstnameInput.val();
         var lastname = lastnameInput.val();
         var emailAddress = $("input#emailAddress").val();
-        var roles ;
+        var roles;
         if ($("#roles").length > 0) {
             roles = $("select#roles").val();
         }
@@ -282,7 +282,13 @@ $(document).ready(function () {
                         }
                         // Refreshing with success message
                         $("#user-create-form").addClass("hidden");
-                        $("#user-created-msg").removeClass("hidden");
+                        modalDialog.header('<span class="fw-stack">' +
+                            '<i class="fw fw-info fw-stack-1x"></i> </span> User was added successfully');
+                        modalDialog.content($("#modal-content-user-created").html());
+                        modalDialog.footer('<div class="buttons"> ' +
+                            '<a href="/devicemgt/users" id="reset-password-yes-link" class="btn-operations"> OK' +
+                            '</a></div>');
+                        modalDialog.show();
                         generateQRCode("#user-created-msg .qr-code");
 
                     }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/edit.hbs

@@ -123,18 +123,7 @@
                     <div class="wr-form">
                         <p class="page-sub-title">User was updated successfully.</p>
 
-                        <br>Please click <b>"View Updated User"</b>, if you wish to view the updated user or click
+                        <br>You will be redirected to User Listing Page in a moment.
-                        <b>"View User List"</b> to complete the process and go back to the user list.
-                        <hr/>
-                        <button class="wr-btn" onclick="window.location.href='{{@app.context}}/users'">View User List
-                        </button>
-                        <a href="{{@app.context}}/user/view?username={{editUser.username}}" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-view fw-stack-1x"></i>
-                        </span>
-                            View Updated User
-                        </a>
                     </div>
                 </div>
                 <!-- /content -->

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.edit/public/js/bottomJs.js

@@ -248,6 +248,10 @@ $(document).ready(function () {
                         // Refreshing with success message
                         $("#user-create-form").addClass("hidden");
                         $("#user-created-msg").removeClass("hidden");
+                        setTimeout(function () {
+                            window.location.href = "/devicemgt/users"
+                        }, 1000);
+
                     }
                 }, function (jqXHR) {
                     var payload = JSON.parse(jqXHR.responseText);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs

@@ -35,6 +35,21 @@
     </li>
 {{/zone}}
 
+{{#zone "navbarActions"}}
+    {{#if canEdit}}
+        <li>
+            <a href="{{@app.context}}/user/edit?username={{user.username}}" data-username="{{user.username}}"
+               data-click-event="edit-form" class="btn padding-reduce-on-grid-view edit-user-link">
+                <span class="fw-stack">
+                    <i class="fw fw-circle-outline fw-stack-2x"></i>
+                    <i class="fw fw-edit fw-stack-1x"></i>
+                </span>
+                Edit
+            </a>
+        </li>
+    {{/if}}
+{{/zone}}
+
 {{#zone "content"}}
     {{#if canView}}
         {{#if exists}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.js

@@ -48,7 +48,13 @@ function onRequest(context) {
         canView = true;
     }
 
+    var canEdit = false;
+    if (userModule.isAuthorized("/permission/admin/device-mgt/users/edit")) {
+        canEdit = true;
+    }
+
     var isCloud =  deviceMgtProps.isCloud;
 
-    return {"exists": isExsistingUser, "user": user, "userRoles": userRoles, "devices": devices, "canView": canView, "isCloud" : isCloud};
+    return {"exists": isExsistingUser, "user": user, "userRoles": userRoles, "devices": devices, "canEdit": canEdit,
+            "canView": canView, "isCloud" : isCloud};
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js

@@ -89,10 +89,11 @@ $("a#invite-user-link").click(function () {
                     modalDialog.hide();
                 });
             },
-            function () {
+            function (data) {
+                var msg = JSON.parse(data.responseText);
                 modalDialog.header('<span class="fw-stack"> <i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw ' +
                     'fw-error fw-stack-1x"></i> </span> Unexpected Error !');
-                modalDialog.content('An unexpected error occurred. Try again later.');
+                modalDialog.content(msg.message);
                 modalDialog.footer('<div class="buttons"><a href="#" id="invite-user-error-link" ' +
                     'class="btn-operations">Ok </a></div>');
                 $("a#invite-user-error-link").click(function () {
@@ -293,7 +294,10 @@ function loadUsers() {
 
     //noinspection JSUnusedLocalSymbols
     var fnCreatedRow = function (nRow, aData, iDataIndex) {
-        $(nRow).attr('data-type', 'selectable');
+        var adminUser = $("#user-table").data("user");
+        if (adminUser !== aData["filter"]) {
+            $(nRow).attr('data-type', 'selectable');
+        }
         $(nRow).attr('data-username', aData["filter"]);
     };
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs

@@ -38,23 +38,10 @@
 
                 <div class="col-centered policy-message hidden">
                     <div class="wr-form">
-                        <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy creation is
+                        <h1 id="policy-message-page-wizard-title" class="page-sub-title">
-                            successful.</h1>
+                            Policy creation is successful.</h1>
-                        <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
+                        <br>You will be redirected to Policy Listing Page in a moment.
-                        <b>"View policy list"</b> to complete the process and go back to the policy list.
                         <hr>
-                        <button class="wr-btn wizard-stepper" data-current="policy-message"
-                                data-direct="{{@app.context}}/policies/">
-                            View policy list
-                        </button>
-                        <!--suppress HtmlUnknownTarget -->
-                        <a href="{{@app.context}}/policy/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                            Add another policy
-                        </a>
                     </div>
                 </div>
 
@@ -82,9 +69,7 @@
                                             <!--suppress HtmlFormInputWithoutLabel -->
                                             <input id="policy-name-input" class="form-control" type="text" value=""/>
                                             <label class="error nameEmpty hidden" for="summary">Policy name is required
-                                                &
+                                                and should be 1-to-30 characters long.</label>
-                                                Should be be 1-to-30
-                                                characters long.</label>
                                         </div>
                                         <br class="c-both"/>
                                     </div>
@@ -285,7 +270,7 @@
                                 </div>
                                 {{#unless types}}
                                     <h3><i class="icon fw fw-warning"></i> No compatible device types have been installed.
-                                        Install device types to add policies.</h3>
+                                                                           Install device types to add policies.</h3>
                                 {{/unless}}
                                 <div class="row wr-tile-buttons-list">
                                     <div class="wr-input-control">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js

@@ -428,6 +428,10 @@ var savePolicy = function (policy, isActive, serviceURL) {
             $(".add-policy").addClass("hidden");
             $(".policy-naming").addClass("hidden");
             $(".policy-message").removeClass("hidden");
+            setTimeout(function() {
+                window.location.href = "/devicemgt/policies";
+            }, 1000);
+
         },
         function (data) {
         }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs

@@ -35,20 +35,8 @@
                     <div class="wr-form">
                         <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy is successfully
                             re-configured.</h1>
-                        <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
+                        <br>You will be redirected to Policy Listing page in a moment.
-                        <b>"View policy list"</b> to complete the process and go back to the policy list.
+                    </div>
-                        <hr>
-                        <button class="wr-btn wizard-stepper" data-current="policy-message"
-                                data-direct="{{@app.context}}/policies/">
-                            View policy list
-                        </button>
-                        <a href="{{@app.context}}/policies/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                            Add another policy
-                        </a>
                     </div>
                 </div>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js

@@ -495,6 +495,9 @@ var updatePolicy = function (policy, state) {
                             if (jqXHR.status == 200) {
                                 $(".add-policy").addClass("hidden");
                                 $(".policy-message").removeClass("hidden");
+                                setTimeout(function() {
+                                    window.location.href = "/devicemgt/policies";
+                                }, 1000);
                             }
                         },
                         // on error
@@ -513,6 +516,9 @@ var updatePolicy = function (policy, state) {
                                 $(".add-policy").addClass("hidden");
                                 $(".policy-naming").addClass("hidden");
                                 $(".policy-message").removeClass("hidden");
+                                setTimeout(function() {
+                                    window.location.href = "/devicemgt/policies";
+                                }, 1000);
                             }
                         },
                         // on error

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js

@@ -66,6 +66,7 @@ var displayPolicy = function (policyPayloadObj) {
         $("#roles-row").addClass("hidden");
     }
 
+    var policyId = policyPayloadObj["id"];
     var deviceType = policy["platform"];
     var policyOperations = $("#policy-operations");
     var policyViewTemplateSrc = $(policyOperations).data("template");
@@ -110,6 +111,23 @@ var displayPolicy = function (policyPayloadObj) {
     if (!hasPolicyProfileScript) {
         populateGenericProfileOperations(policyPayloadObj["profile"]["profileFeaturesList"]);
     }
+
+    var policyEditContent =
+        "<a href=" + context + "/policy/edit?id=" + policyId + "&deviceType=" + deviceType + "\n" +
+            "data-id=" + policyId +
+            "data-toggle=\"tooltip\"\n" +
+            "data-original-title=\"Edit\"\n" +
+            "data-click-event=\"remove-form\"\n" +
+            "class=\"btn remove-margin padding-reduce-on-grid-view policy-update-link\">" +
+            "<span class=\"fw-stack\">" +
+                "<i class=\"fw fw-circle-outline fw-stack-2x\"></i>" +
+                "<i class=\"fw fw-edit fw-stack-1x\"></i>" +
+            "</span>" +
+            " Edit" +
+        "</a>";
+
+    $("#policy-edit").html(policyEditContent);
+
 };
 
 /**

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/permission.hbs

@@ -69,19 +69,8 @@
         <div id="role-created-msg" class="container col-centered wr-content hidden">
             <div class="wr-form">
                 <p class="page-sub-title">Permissions were assigned to the role successfully.</p>
-                <br>Please click <b>"Add Another Role"</b>, if you wish to add another role or click
+                <br>You will be redirected to Roles Listing Page in a moment.
-                <b>"View Role List"</b> to complete the process and go back to the role list.
                 <hr />
-                <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
-                    View Role List
-                </button>
-                <a href="{{@app.context}}/role/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                    Add Another Role
-                </a>
             </div>
         </div>
         <!-- /content -->

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js

@@ -184,6 +184,9 @@ $(document).ready(function () {
                     // Refreshing with success message
                     $("#role-create-form").addClass("hidden");
                     $("#role-created-msg").removeClass("hidden");
+                    setTimeout(function() {
+                        window.location.href = "/devicemgt/roles";
+                    }, 1000);
                 }
             }, function (data) {
                 var payload = JSON.parse(data.responseText);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/edit.hbs

@@ -73,20 +73,7 @@
             <div id="role-created-msg" class="container col-centered wr-content hidden">
                 <div class="wr-form">
                     <p class="page-sub-title">Role was updated successfully.</p>
-                    <br>Please click <b>"View Updated Role"</b>, if you wish to view the updated role or click
+                    <br>You will be redirected to Roles Listing Page in a moment.
-                    <b>"View Role List"</b> to complete the process and go back to the role list.
-                    <hr/>
-                    <button class="wr-btn" onclick="window.location.href='{{@app.context}}/roles'">
-                        View Role List
-                    </button>
-                    <a href="{{@app.context}}/roles/edit-role/{{role.roleName}}"
-                       class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                        View Updated Role
-                    </a>
                 </div>
             </div>
             <!-- /content -->

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit/public/js/bottomJs.js

@@ -210,6 +210,9 @@ $(document).ready(function () {
                         // Refreshing with success message
                         $("#role-create-form").addClass("hidden");
                         $("#role-created-msg").removeClass("hidden");
+                        setTimeout(function() {
+                            window.location.href = "/devicemgt/roles";
+                        }, 1000);
                     }
                 }, function (data) {
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.user-menu/public/js/user-menu.js

@@ -86,7 +86,9 @@ $(document).ready(function () {
                             $("#change-password-success-link").click(function () {
                                 hidePopup();
                             });
-                            window.location.href = "/devicemgt/logout";
+                            setTimeout(function(){
+                                window.location.href = "/devicemgt/logout";
+                            },10000);
                         }
                     }, function (jqXHR) {
                         if (jqXHR.status == 400) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.user-menu/user-menu.hbs

@@ -104,7 +104,7 @@
                     <hr>
                     <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
                         <h5 class="text-center">
-                            You can now try to login using your new password.
+                            You will be logged out automatically, Please login using your new password.
                         </h5>
                     </div>
                     <div class="modal-footer">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css

@@ -294,3 +294,19 @@ ul#noty_topRight_layout_container li{
 a.new-notification {
     text-transform: capitalize;
 }
+
+/**
+* This is to fix the issue https://github.com/wso2/product-iots/issues/1354.
+* Proper fix should be given for this.
+*/
+.modal {
+    z-index: 1000;
+}
+
+.modal-backdrop {
+    z-index: 999;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+    color: #0f0f0f;
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css

@@ -4186,7 +4186,7 @@ a.wr-side-panel-toggle-btn.selected {
 
 .wr-help-tip {
     font-size: 14px;
-    padding: 0 10px;
+    padding-left: 10px;
     color: #666;
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/email-sender/org.wso2.carbon.email.sender.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java

@@ -65,8 +65,13 @@ public class EmailSenderServiceImpl implements EmailSenderService {
         for (String recipient : emailCtx.getRecipients()) {
             ContentProviderInfo info = emailCtx.getContentProviderInfo();
             EmailData emailData;
+            String transportSenderName = "mailto";
             try {
                 emailData = contentProvider.getContent(info.getTemplate(), info.getParams());
+                if(EmailSenderDataHolder.getInstance().getConfigurationContextService()
+                        .getServerConfigContext().getAxisConfiguration().getTransportOut(transportSenderName) == null){
+                    throw new EmailSendingFailedException("Email transport is not configured.");
+                }
             } catch (ContentProcessingInterruptedException e) {
                 throw new EmailSendingFailedException("Error occurred while retrieving email content to be " +
                         "sent for recipient '" + recipient + "'", e);

components/email-sender/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - OAuth Extensions</name>
     <url>http://wso2.org</url>

components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.complex.policy.decision.point</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml

@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.information.point</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Information Point</name>
     <description>WSO2 Carbon - Policy Information Point</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Common</name>
     <description>WSO2 Carbon - Policy Management Common</description>

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

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>

components/policy-mgt/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Component</name>
     <url>http://wso2.org</url>

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>webapp-authenticator-framework</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.webapp.authenticator.framework</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Web Application Authenticator Framework Bundle</name>
     <description>WSO2 Carbon - Web Application Authenticator Framework Bundle</description>

components/webapp-authenticator-framework/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Webapp Authenticator Framework</name>
     <url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.application.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Application Extension Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a api application registration, which takes care of subscription

features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handler.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - APIM handler Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the handler for the api authentications

features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml

@@ -21,13 +21,13 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
 		<artifactId>apimgt-extensions-feature</artifactId>
-		<version>3.0.82-SNAPSHOT</version>
+		<version>3.0.95-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client.feature</artifactId>
-	<version>3.0.82-SNAPSHOT</version>
+	<version>3.0.95-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>WSO2 Carbon - APIM Integration Client Feature</name>
 	<url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Webapp Publisher Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing

features/apimgt-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Feature</name>
     <url>http://wso2.org</url>

features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - Certificate Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for back-end Certificate Management functionality

features/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt-feature</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Feature</name>
     <url>http://wso2.org</url>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Type Deployer Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - Device Type Deployer Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - FCM Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - XMPP Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - XMPP Based Push Notification Provider Feature</description>

features/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.device.mgt.analytics.dashboard.feature</artifactId>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Dashboard Analytics Feature</name>
     <description>WSO2 Carbon - Device Management Dashboard Analytics Feature</description>

features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains bundles related to device analytics data publisher</description>

features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains common extensions used by key device management functionalities

features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.82-SNAPSHOT</version>
+    <version>3.0.95-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.82-SNAPSHOT</version>
+        <version>3.0.95-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>