Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0

# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js

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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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.webapp.publisher/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java

@@ -17,6 +17,7 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,8 +43,10 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
             for (EnrollmentCertificate enrollmentCertificate : enrollmentCertificates) {
                 certificate = new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
                 certificate.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
-                certificate.setSerial(enrollmentCertificate.getSerial());
+                X509Certificate x509Certificate = certificateService
-                certificate.setCertificate(certificateService.pemToX509Certificate(enrollmentCertificate.getPem()));
+                        .pemToX509Certificate(enrollmentCertificate.getPem());
+                certificate.setSerial(x509Certificate.getSerialNumber().toString());
+                certificate.setCertificate(x509Certificate);
                 certificates.add(certificate);
             }
             certificateService.saveCertificate(certificates);

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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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.push.notification.provider.gcm/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -653,7 +653,14 @@ public interface DeviceManagementService {
                     required = false,
                     defaultValue = "5")
             @QueryParam("limit")
-            int limit);
+            int limit,
+            @ApiParam(
+                    name = "owner",
+                    value = "Provides the owner of the required device.",
+                    required = true,
+                    defaultValue = "")
+            @QueryParam("owner")
+                    String owner);
 
     @GET
     @Path("/{type}/{id}/effective-policy")

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

@@ -383,10 +383,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             @PathParam("id") @Size(max = 45) String id,
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
             @QueryParam("offset") int offset,
-            @QueryParam("limit") int limit) {
+            @QueryParam("limit") int limit,
+            @QueryParam("owner") String owner) {
         OperationList operationsList = new OperationList();
+        RequestValidationUtil.validateOwnerParameter(owner);
         RequestValidationUtil.validatePaginationParameters(offset, limit);
         PaginationRequest request = new PaginationRequest(offset, limit);
+        request.setOwner(owner);
         PaginationResult result;
         DeviceManagementProviderService dms;
         try {

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

@@ -231,8 +231,8 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
                     policyDeleted = false;
                 }
             }
-            if(policyDeleted) {
+            if (policyDeleted) {
-                for(int i : policyIds) {
+                for (int i : policyIds) {
                     Policy policy = pap.getPolicy(i);
                     pap.deletePolicy(policy);
                 }
@@ -244,13 +244,16 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
         }
         if (policyDeleted) {
-            return Response.status(Response.Status.OK).entity("Policies have been successfully deleted").build();
+            return Response.status(Response.Status.OK).entity("Policies have been successfully " +
+                                                              "deleted").build();
         } else {
             //TODO:Check of this logic is correct
-            String ModifiedInvalidPolicyIds = invalidPolicyIds.substring(0, invalidPolicyIds.length()-1);
+            String modifiedInvalidPolicyIds =
-            return Response.status(Response.Status.BAD_REQUEST).entity(
+                    invalidPolicyIds.substring(0, invalidPolicyIds.length() - 1);
-                    new ErrorResponse.ErrorResponseBuilder().setMessage("Policies with the policy ID " +
+            return Response.status(Response.Status.BAD_REQUEST).
-                                                                        ModifiedInvalidPolicyIds + " doesn't exist").build()).build();
+                    entity(new ErrorResponse.ErrorResponseBuilder().
+                            setMessage("Policies with the policy ID " + modifiedInvalidPolicyIds +
+                                       " doesn't exist").build()).build();
         }
     }
 

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

@@ -345,4 +345,12 @@ public class RequestValidationUtil {
 
     }
 
+    public static void validateOwnerParameter(String owner) {
+        if (owner == null || owner.isEmpty()) {
+            throw new InputValidationException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request parameter owner should" +
+                            " be non empty.").build());
+        }
+    }
+
 }

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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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/OperationManagerImpl.java

@@ -307,14 +307,14 @@ public class OperationManagerImpl implements OperationManager {
             throws OperationManagementException {
         PaginationResult paginationResult = null;
         List<Operation> operations = new ArrayList<>();
-
+        String owner = request.getOwner();
         if (!isActionAuthorized(deviceId)) {
             throw new OperationManagementException("User '" + getUser() + "' is not authorized to access the '" +
                                                    deviceId.getType() + "' device, which carries the identifier '" +
-                                                   deviceId.getId() + "'");
+                                                   deviceId.getId() + "' of owner '" + owner + "'" );
         }
 
-        EnrolmentInfo enrolmentInfo = this.getEnrolmentInfo(deviceId);
+        EnrolmentInfo enrolmentInfo = this.getEnrolmentInfo(deviceId, owner);
         if (enrolmentInfo == null) {
             throw new OperationManagementException("Device not found for given device " +
                                                    "Identifier:" + deviceId.getId() + " and given type" +
@@ -923,31 +923,33 @@ public class OperationManagerImpl implements OperationManager {
         return enrolmentId;
     }
 
-    private EnrolmentInfo getEnrolmentInfo(DeviceIdentifier deviceId) throws OperationManagementException {
+    private EnrolmentInfo getEnrolmentInfo(DeviceIdentifier deviceId, String owner) throws OperationManagementException {
-        EnrolmentInfo enrolmentInfo;
+        EnrolmentInfo enrolmentInfo = null;
         try {
-            DeviceManagementDAOFactory.openConnection();
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             String user = this.getUser();
-            enrolmentInfo = deviceDAO.getEnrolment(deviceId, user, tenantId);
+            DeviceManagementDAOFactory.openConnection();
-            if (enrolmentInfo == null) {
+            if (this.isSameUser(user, owner)) {
+                enrolmentInfo = deviceDAO.getEnrolment(deviceId, owner, tenantId);
+            } else {
                 boolean isAdminUser = DeviceManagementDataHolder.getInstance().getDeviceAccessAuthorizationService().
                         isDeviceAdminUser();
                 if (isAdminUser) {
-                    enrolmentInfo = deviceDAO.getEnrolment(deviceId, tenantId);
+                    enrolmentInfo = deviceDAO.getEnrolment(deviceId, owner, tenantId);
                 }
+                //TODO : Add a check for group admin if this fails
             }
         } catch (DeviceManagementDAOException e) {
             throw new OperationManagementException("Error occurred while retrieving enrollment data of '" +
                                                    deviceId.getType() + "' device carrying the identifier '" +
-                                                   deviceId.getId() + "'", e);
+                                                   deviceId.getId() + "' of owner '" + owner + "'", e);
         } catch (SQLException e) {
             throw new OperationManagementException(
                     "Error occurred while opening a connection to the data source", e);
         } catch (DeviceAccessAuthorizationException e) {
             throw new OperationManagementException("Error occurred while checking the device access permissions for '" +
                                                    deviceId.getType() + "' device carrying the identifier '" +
-                                                   deviceId.getId() + "'", e);
+                                                   deviceId.getId() + "' of owner '" + owner + "'", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -1021,4 +1023,8 @@ public class OperationManagerImpl implements OperationManager {
         }
         return false;
     }
+
+    private boolean isSameUser(String user, String owner) {
+        return user.equalsIgnoreCase(owner);
+    }
 }

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

@@ -76,7 +76,7 @@ public class CommandOperationDAOImpl extends GenericOperationDAOImpl {
         try {
             super.deleteOperation(id);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("DELETE DM_COMMAND_OPERATION WHERE OPERATION_ID = ?");
+            stmt = connection.prepareStatement("DELETE FROM DM_COMMAND_OPERATION WHERE OPERATION_ID = ?");
             stmt.setInt(1, id);
             stmt.executeUpdate();
         } catch (SQLException e) {

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

@@ -64,7 +64,7 @@ public class ConfigOperationDAOImpl extends GenericOperationDAOImpl {
         try {
             super.deleteOperation(id);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("DELETE DM_CONFIG_OPERATION WHERE OPERATION_ID = ?") ;
+            stmt = connection.prepareStatement("DELETE FROM DM_CONFIG_OPERATION WHERE OPERATION_ID = ?") ;
             stmt.setInt(1, id);
             stmt.executeUpdate();
         } catch (SQLException e) {
@@ -82,7 +82,7 @@ public class ConfigOperationDAOImpl extends GenericOperationDAOImpl {
         try {
             super.updateOperation(operation);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_CONFIG_OPERATION SET OPERATION_CONFIG = ? " +
+            stmt = connection.prepareStatement("UPDATE FROM DM_CONFIG_OPERATION SET OPERATION_CONFIG = ? " +
                     "WHERE OPERATION_ID = ?");
             bao = new ByteArrayOutputStream();
             oos = new ObjectOutputStream(bao);

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

@@ -620,7 +620,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
         PreparedStatement stmt = null;
         try {
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("DELETE DM_OPERATION WHERE ID = ?");
+            stmt = connection.prepareStatement("DELETE FROM DM_OPERATION WHERE ID = ?");
             stmt.setInt(1, id);
             stmt.executeUpdate();
         } catch (SQLException e) {
@@ -867,12 +867,9 @@ public class GenericOperationDAOImpl implements OperationDAO {
             String sql = "SELECT o.ID, TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, " +
                     "OPERATION_CODE, om.STATUS, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
                     "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
-                    "WHERE dm.ENROLMENT_ID = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP DESC"
+                    "WHERE dm.ENROLMENT_ID = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP DESC";
-                    + "LIMIT ?,?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, enrolmentId);
-            /*stmt.setInt(2, request.getStartIndex());
-            stmt.setInt(3, request.getRowCount());*/
             rs = stmt.executeQuery();
 
             while (rs.next()) {
@@ -880,11 +877,6 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 operation.setId(rs.getInt("ID"));
                 operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
                 operation.setCreatedTimeStamp(rs.getTimestamp("CREATED_TIMESTAMP").toString());
-//                if (rs.getTimestamp("RECEIVED_TIMESTAMP") == null) {
-//                    operation.setReceivedTimeStamp("");
-//                } else {
-//                    operation.setReceivedTimeStamp(rs.getTimestamp("RECEIVED_TIMESTAMP").toString());
-//                }
                 if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
                     operation.setReceivedTimeStamp("");
                 } else {
@@ -893,7 +885,6 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 }
                 operation.setCode(rs.getString("OPERATION_CODE"));
                 operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
-//                this.setActivityId(operation, rs.getInt("OM_MAPPING_ID"));
                 operations.add(operation);
             }
         } catch (SQLException e) {
@@ -929,11 +920,6 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 operation.setId(rs.getInt("ID"));
                 operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
                 operation.setCreatedTimeStamp(rs.getTimestamp("CREATED_TIMESTAMP").toString());
-//                if (rs.getTimestamp("RECEIVED_TIMESTAMP") == null) {
-//                    operation.setReceivedTimeStamp("");
-//                } else {
-//                    operation.setReceivedTimeStamp(rs.getTimestamp("RECEIVED_TIMESTAMP").toString());
-//                }
                 if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
                     operation.setReceivedTimeStamp("");
                 } else {

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

@@ -128,7 +128,7 @@ public class PolicyOperationDAOImpl extends GenericOperationDAOImpl {
         try {
             super.deleteOperation(operationId);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("DELETE DM_POLICY_OPERATION WHERE OPERATION_ID=?");
+            stmt = connection.prepareStatement("DELETE FROM DM_POLICY_OPERATION WHERE OPERATION_ID=?");
             stmt.setInt(1, operationId);
             stmt.executeUpdate();
         } catch (SQLException e) {

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

@@ -129,7 +129,7 @@ public class ProfileOperationDAOImpl extends GenericOperationDAOImpl {
         try {
             super.deleteOperation(id);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("DELETE DM_PROFILE_OPERATION WHERE OPERATION_ID=?");
+            stmt = connection.prepareStatement("DELETE FROM DM_PROFILE_OPERATION WHERE OPERATION_ID=?");
             stmt.setInt(1, id);
             stmt.executeUpdate();
         } catch (SQLException e) {

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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js

@@ -118,13 +118,18 @@ deviceModule = function () {
                             if (properties["DEVICE_INFO"]) {
                                 var initialDeviceInfoList = parse(properties["DEVICE_INFO"]);
                                 var initialDeviceInfo = {};
-                                for (var j = 0; j < initialDeviceInfoList.length; j++) {
+                                if (Array.isArray(initialDeviceInfoList)) {
-                                    if (initialDeviceInfoList[j]["value"]) {
+                                    for (var j = 0; j < initialDeviceInfoList.length; j++) {
-                                        initialDeviceInfo[initialDeviceInfoList[j]["name"]] =
+                                        if (initialDeviceInfoList[j]["value"]) {
-                                            initialDeviceInfoList[j]["value"];
+                                            initialDeviceInfo[initialDeviceInfoList[j]["name"]] =
+                                                initialDeviceInfoList[j]["value"];
+                                        }
                                     }
+                                } else {
+                                    initialDeviceInfo = initialDeviceInfoList;
                                 }
 
+
                                 filteredDeviceData["initialDeviceInfo"]["DEVICE_INFO"] = initialDeviceInfo;
                             }
                         }

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

@@ -51,14 +51,6 @@
                                 <div id="certificate-create-error-msg" class="alert alert-danger hidden" role="alert">
                                     <i class="icon fw fw-error"></i><span></span>
                                 </div>
-
-                                <label class="wr-input-label ">
-                                    Serial Number *
-                                </label>
-                                <br>
-                                <div id="serialNoInputField" class="form-group wr-input-control">
-                                    <input type="text" id="serialNo" class="form-control"/>
-                                </div>
                                 <label class="wr-input-label">Certificate *</label>
                                 <div id="certificateField" class="form-group wr-input-control">
                                     <input type="file" id="certificate" class="form-control"/>

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

@@ -92,17 +92,11 @@ $(document).ready(function () {
      * when a user clicks on "Add Certificate" button.
      */
     $("button#add-certificate-btn").click(function () {
-        var serialNoInput = $("input#serialNo");
+        if (!pemContent) {
-        var serialNo = serialNoInput.val();
-        if (!serialNo) {
-            $(errorMsg).text("Serial Number is a required field. It cannot be empty.");
-            $(errorMsgWrapper).removeClass("hidden");
-        } else if (!pemContent) {
             $(errorMsg).text(" .pem file must contains certificate information.");
             $(errorMsgWrapper).removeClass("hidden");
         } else {
             var addCertificateFormData = {};
-            addCertificateFormData.serial = serialNo;
             addCertificateFormData.pem = pemContent;
             var certificateList = [];
             certificateList.push(addCertificateFormData);

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

@@ -16,6 +16,7 @@
   under the License.
 }}
 {{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
+{{unit "cdmf.unit.ui.modal"}}
 
 {{#zone "breadcrumbs"}}
     <li>
@@ -110,73 +111,6 @@
             <a href="#">By Serial Number</a>
         </div>
     </div>
-
-    <div id="remove-certificate-modal-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Do you really want to remove this certificate ?</h3>
-
-                    <div class="buttons">
-                        <a href="#" id="remove-certificate-yes-link" class="btn-operations">
-                            Remove
-                        </a>
-                        <a href="#" id="remove-certificate-cancel-link" class="btn-operations btn-default">
-                            Cancel
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-certificate-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. Certificate was successfully removed.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-certificate-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-            </div>
-        </div>
-    </div>
-
-    <div id="errorCertificateView" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                    <i class="fw fw-ring fw-stack-2x"></i>
-                    <i class="fw fw-error fw-stack-1x"></i>
-                </span>
-                Unauthorized action!
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-            </div>
-        </div>
-    </div>
 {{/zone}}
 
 {{#zone "bottomJs"}}

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

@@ -54,8 +54,11 @@ function hidePopup() {
  */
 function removeCertificate(serialNumber) {
     var serviceUrl = base_api_url + "/admin/certificates/" + serialNumber;
-    $(modalPopupContent).html($('#remove-certificate-modal-content').html());
+    modalDialog.header('Do you really want to remove this certificate ?');
-    showPopup();
+    modalDialog.footer('<div class="buttons"><a href="#" id="remove-certificate-yes-link" class="btn-operations">' +
+        'Remove</a><a href="#" id="remove-certificate-cancel-link" class="btn-operations btn-default">Cancel</a>' +
+        '</div>');
+    modalDialog.show();
 
     $("a#remove-certificate-yes-link").click(function () {
         invokerUtil.delete(
@@ -63,23 +66,29 @@ function removeCertificate(serialNumber) {
             function () {
                 $("#" + serialNumber).remove();
                 var newCertificateListCount = $(".user-list > span").length;
-                $("#certificate-listing-status-msg").text("Total number of Certificates found : " + newCertificateListCount);
+                $("#certificate-listing-status-msg").text("Total number of Certificates found : " +
-                $(modalPopupContent).html($('#remove-certificate-success-content').html());
+                    newCertificateListCount);
+                modalDialog.header('Done. Certificate was successfully removed.');
+                modalDialog.footer('<div class="buttons"><a href="#" id="remove-certificate-success-link" ' +
+                    'class="btn-operations">Ok</a></div>');
                 $("a#remove-certificate-success-link").click(function () {
-                    hidePopup();
+                    modalDialog.hide();
                 });
             },
             function () {
-                $(modalPopupContent).html($('#remove-certificate-error-content').html());
+                modalDialog.header('An unexpected error occurred. Please try again later.');
+                modalDialog.footer('<div class="buttons"><a href="#" id="remove-certificate-error-link" ' +
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsError();
                 $("a#remove-certificate-error-link").click(function () {
-                    hidePopup();
+                    modalDialog.hide();
                 });
             }
         );
     });
 
     $("a#remove-certificate-cancel-link").click(function () {
-        hidePopup();
+        modalDialog.hide();
     });
 }
 
@@ -103,8 +112,9 @@ function InitiateViewOption() {
     if ($("#can-view").val()) {
         $(location).attr('href', $(this).data("url"));
     } else {
-        $(modalPopupContent).html($('#errorCertificateView').html());
+        modalDialog.header('Unauthorized action!');
-        showPopup();
+        modalDialog.content('You do not have permission to view this certificate.');
+        modalDialog.showAsAWarning();
     }
 }
 

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

@@ -1,4 +1,5 @@
 {{unit "cdmf.unit.ui.title" pageTitle="Group Management"}}
+{{unit "cdmf.unit.ui.modal"}}
 
 {{#zone "breadcrumbs"}}
     <li>
@@ -55,22 +56,6 @@
             </div>
         </div>
     </div>
-
-    <div id="group-error-content" class="hide">
-        <div class="modal-content">
-            <div class="row">
-                <div class="col-md-7 col-centered center-container">
-                    <h4 id="error-msg">Unexpected error occurred!</h4>
-                    <br/>
-                    <div class="buttons">
-                        <a href="#" id="group-unexpected-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 {{/zone}}
 {{#zone "bottomJs"}}
     {{js "js/group-add.js"}}

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

@@ -70,10 +70,13 @@ $(function () {
 });
 
 function displayErrors(message) {
-    showPopup();
     $('#error-msg').html(message.responseText);
-    $(modalPopupContent).html($('#group-error-content').html());
+    modalDialog.header('Unexpected error occurred!');
+    modalDialog.content('<h4 id="error-msg"></h4>');
+    modalDialog.footer('<div class="buttons"><a href="#" id="group-unexpected-error-link" class="btn-operations">Ok' +
+        '</a></div>');
+    modalDialog.showAsError();
     $("a#group-unexpected-error-link").click(function () {
-        hidePopup();
+        modalDialog.hide();
     });
 }

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

@@ -17,8 +17,8 @@
 }}
 {{unit "cdmf.unit.ui.title" pageTitle="Group Management"}}
 {{unit "cdmf.unit.ui.content.title" pageHeader="Groups"}}
-
+{{unit "cdmf.unit.lib.data-table"}}
-{{unit "cdmf.unit.data-tables-extended"}}
+{{unit "cdmf.unit.ui.modal"}}
 
 {{#zone "breadcrumbs"}}
     <li>
@@ -93,213 +93,6 @@
                         </div>
                     </div>
                 {{/if}}
-
-                <div id="share-group-w1-modal-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Enter user name to manage group sharing</h3>
-                                <div id="user-names">
-                                    <br />
-                                    <input type="text" id="share-user-selector" style="color:#3f3f3f;padding:5px;width:250px;">
-                                    </input>
-                                </div>
-                                <div class="buttons">
-                                    <a href="#" id="share-group-next-link" class="btn-operations">
-                                        Next
-                                    </a>
-
-                                    <a href="#" id="share-group-w1-cancel-link" class="btn-operations btn-default">
-                                        Cancel
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="share-group-w2-modal-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Select sharing roles</h3>
-                                <br/>
-                                <div id="user-roles">Loading...</div>
-                                <div class="buttons">
-                                    <a href="#" id="share-group-yes-link" class="btn-operations">
-                                        OK
-                                    </a>
-
-                                    <a href="#" id="share-group-w2-cancel-link" class="btn-operations btn-default">
-                                        Cancel
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="share-group-200-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Group sharing updated successfully.</h3>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="remove-group-modal-content" class="hide">
-                    <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>
-
-                                <div class="buttons">
-                                    <a href="#" id="remove-group-yes-link" class="btn-operations">
-                                        Yes
-                                    </a>
-
-                                    <a href="#" id="remove-group-cancel-link" class="btn-operations btn-default">
-                                        Cancel
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="remove-group-200-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Group was successfully removed.</h3>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="edit-group-modal-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Please enter new name and description for the group</h3>
-                                <br/>
-
-                                <div>
-                                    <input id="edit-group-name" style="color:#3f3f3f;padding:5px" type="text"
-                                           value=""
-                                           placeholder="Group Name" size="60">
-                                </div>
-                                <br/>
-
-                                <div>
-                                    <input id="edit-group-description" style="color:#3f3f3f;padding:5px" type="text"
-                                           value=""
-                                           placeholder="Group Description" size="60">
-                                </div>
-                                <div class="buttons">
-                                    <a href="#" id="edit-group-yes-link" class="btn-operations">
-                                        Update
-                                    </a>
-
-                                    <a href="#" id="edit-group-cancel-link" class="btn-operations btn-default">
-                                        Cancel
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="edit-group-200-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Group was successfully updated.</h3>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="group-400-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3 id="error-msg">Bad Request. Please contact your administrator.</h3>
-                                <div class="buttons">
-                                    <a href="#" id="group-400-link" class="btn-operations">
-                                        Ok
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="group-403-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Operation not permitted.</h3>
-
-                                <div class="buttons">
-                                    <a href="#" id="group-403-link" class="btn-operations">
-                                        Ok
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="group-404-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3 id="group-404-message">Not found.</h3>
-
-                                <div class="buttons">
-                                    <a href="#" id="group-404-link" class="btn-operations">
-                                        Ok
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="group-409-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Group does not exist.</h3>
-
-                                <div class="buttons">
-                                    <a href="#" id="group-409-link" class="btn-operations">
-                                        Ok
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="group-unexpected-error-content" class="hide">
-                    <div class="content">
-                        <div class="row">
-                            <div class="col-lg-5 col-md-6 col-centered">
-                                <h3>Unexpected error occurred!</h3>
-
-                                <div class="buttons">
-                                    <a href="#" id="group-unexpected-error-link" class="btn-operations">
-                                        Ok
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>

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

@@ -17,6 +17,7 @@
 }}
 {{unit "cdmf.unit.ui.title" pageTitle="Policy Management"}}
 {{unit "cdmf.unit.data-tables-extended"}}
+{{unit "cdmf.unit.ui.modal"}}
 
 {{#zone "topCss"}}
     <style>
@@ -254,384 +255,6 @@
             <a href="#">By Status</a>
         </div>
     </div>
-
-    <div id="remove-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Do you really want to remove the selected policy(s)?</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-policy-yes-link" class="btn-operations">
-                    Remove
-                </a>
-
-                <a href="#" id="remove-policy-cancel-link" class="btn-operations btn-default">
-                    Cancel
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. Selected policy was successfully removed.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-policy-error-devices" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Cannot Remove Policies.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>You cannot remove policies that are already applied to devices. Please deselect
-                them and try
-                again.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-policy-error-devices" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="publish-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Do you really want to publish the selected policy(s)?</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a>
-                <a href="#" id="publish-policy-cancel-link" class="btn-operations btn-default">No</a>
-            </div>
-        </div>
-    </div>
-
-    <div id="publish-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. Selected policy was successfully published.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="publish-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="publish-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="publish-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="unpublish-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Do you really want to unpublish the selected policy(s)?</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="unpublish-policy-yes-link" class="btn-operations">
-                    Yes
-                </a>
-
-                <a href="#" id="unpublish-policy-cancel-link" class="btn-operations btn-default">
-                    No
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="unpublish-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. Selected policy was successfully unpublished.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="unpublish-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="unpublish-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="unpublish-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="save-policy-priorities-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. New Policy priorities were successfully updated.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="save-policy-priorities-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="save-policy-priorities-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="save-policy-priorities-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="change-policy-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Do you really want to apply changes to all policies?</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="change-policy-yes-link" class="btn-operations">
-                    Yes
-                </a>
-
-                <a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">
-                    No
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="change-policy-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. Changes applied successfully.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="change-policy-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="change-policy-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="change-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="errorPolicyUnPublish" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Operation cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>Please select a policy or a list of policies to unpublish.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="errorPolicyUnPublishSelection" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Operation cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>You cannot select already inactive policies. Please deselect inactive policies
-                and try again.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="errorPolicyPublishSelection" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Operation cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>You cannot select already active policies. Please deselect active policies and
-                try again.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="errorPolicyPublish" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Operation cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>Please select a policy or a list of policies to publish.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-    <div id="errorPolicy" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">
-                <span class="fw-stack">
-                        <i class="fw fw-ring fw-stack-2x"></i>
-                        <i class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                Operation cannot be performed !
-            </h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h4>Please select a policy or a list of policies to remove.</h4>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:hidePopup()" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
 {{/zone}}
 
 {{#zone "bottomJs"}}

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

@@ -154,8 +154,10 @@ $(document).ready(function () {
 
     $("#appbar-btn-apply-changes").click(function () {
         var applyPolicyChangesAPI = "/devicemgt_admin/policies/apply-changes";
-        $(modalPopupContent).html($('#change-policy-modal-content').html());
+        modalDialog.header('Do you really want to apply changes to all policies?');
-        showPopup();
+        modalDialog.footer('<div class="buttons"><a href="#" id="change-policy-yes-link" class="btn-operations">Yes' +
+            '</a><a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">No</a></div>');
+        modalDialog.show();
 
         $("a#change-policy-yes-link").click(function () {
             invokerUtil.put(
@@ -163,26 +165,29 @@ $(document).ready(function () {
                 null,
                 // on success
                 function () {
-                    $(modalPopupContent).html($('#change-policy-success-content').html());
+                    modalDialog.header('Done. Changes applied successfully.');
-                    showPopup();
+                    modalDialog.footer('<div class="buttons"><a href="#" id="change-policy-success-link" ' +
+                        'class="btn-operations">Ok</a></div>');
                     $("a#change-policy-success-link").click(function () {
-                        hidePopup();
+                        modalDialog.hide();
                         location.reload();
                     });
                 },
                 // on error
                 function () {
-                    $(modalPopupContent).html($('#change-policy-error-content').html());
+                    modalDialog.header('An unexpected error occurred. Please try again later.');
-                    showPopup();
+                    modalDialog.footer('<div class="buttons"><a href="#" id="change-policy-error-link" ' +
+                        'class="btn-operations">Ok</a></div>');
+                    modalDialog.showAsError();
                     $("a#change-policy-error-link").click(function () {
-                        hidePopup();
+                        modalDialog.hide();
                     });
                 }
             );
         });
 
         $("a#change-policy-cancel-link").click(function () {
-            hidePopup();
+            modalDialog.hide();
         });
     });
 
@@ -204,19 +209,22 @@ $(document).ready(function () {
             updatePolicyAPI,
             newPolicyPriorityList,
             function () {
-                $(modalPopupContent).html($('#save-policy-priorities-success-content').html());
+                modalDialog.header('Done. New Policy priorities were successfully updated.');
-                showPopup();
+                modalDialog.footer('<a href="#" id="save-policy-priorities-success-link" class="btn-operations">Ok' +
+                    '</a>');
+                modalDialog.show();
                 $("a#save-policy-priorities-success-link").click(function () {
-                    hidePopup();
+                    modalDialog.hide();
                 });
             },
             function () {
-                $("#save-policy-priorities-error-content").find(".message-from-server").html(
+                modalDialog.header('An unexpected error occurred. Please try again later.');
-                    "Message From Server  :  " + data["statusText"]);
+                modalDialog.content(html("Message From Server  :  " + data["statusText"]));
-                $(modalPopupContent).html($('#save-policy-priorities-error-content').html());
+                modalDialog.footer('<div class="buttons"><a href="#" id="save-policy-priorities-error-link" ' +
-                showPopup();
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsError();
                 $("a#save-policy-priorities-error-link").click(function () {
-                    hidePopup();
+                    modalDialog.hide();
                 });
             }
         );
@@ -227,16 +235,27 @@ $(document).ready(function () {
         var policyList = getSelectedPolicies();
         var statusList = getSelectedPolicyStates();
         if (($.inArray('Inactive/Updated', statusList) > -1) || ($.inArray('Inactive', statusList) > -1)) {
-            $(modalPopupContent).html($("#errorPolicyUnPublishSelection").html());
+            modalDialog.header('Operation cannot be performed !');
-            showPopup();
+            modalDialog.content('You cannot select already inactive policies. Please deselect inactive policies and ' +
+                'try again.');
+            modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" ' +
+                'class="btn-operations">Ok</a></div>');
+            modalDialog.showAsAWarning();
         } else {
             var serviceURL = "/devicemgt_admin/policies/inactivate";
             if (policyList == 0) {
-                $(modalPopupContent).html($("#errorPolicyUnPublish").html());
+                modalDialog.header('Operation cannot be performed !');
+                modalDialog.content('Please select a policy or a list of policies to unpublish.');
+                modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" ' +
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsAWarning();
             } else {
-                $(modalPopupContent).html($('#unpublish-policy-modal-content').html());
+                modalDialog.header('Do you really want to unpublish the selected policy(s)?');
+                modalDialog.footer('<div class="buttons"><a href="#" id="unpublish-policy-yes-link" ' +
+                    'class="btn-operations">Yes</a><a href="#" id="unpublish-policy-cancel-link" ' +
+                    'class="btn-operations btn-default">No</a></div>');
+                modalDialog.show();
             }
-            showPopup();
 
             $("a#unpublish-policy-yes-link").click(function () {
                 invokerUtil.put(
@@ -244,24 +263,29 @@ $(document).ready(function () {
                     policyList,
                     // on success
                     function () {
-                        $(modalPopupContent).html($('#unpublish-policy-success-content').html());
+                        modalDialog.header('Done. Selected policy was successfully unpublished.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="unpublish-policy-success-link" ' +
+                            'class="btn-operations">Ok</a></div>');
                         $("a#unpublish-policy-success-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                             location.reload();
                         });
                     },
                     // on error
                     function () {
-                        $(modalPopupContent).html($('#unpublish-policy-error-content').html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="unpublish-policy-error-link" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#unpublish-policy-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 );
             });
 
             $("a#unpublish-policy-cancel-link").click(function () {
-                hidePopup();
+                modalDialog.hide();
             });
         }
     });
@@ -271,16 +295,27 @@ $(document).ready(function () {
         var policyList = getSelectedPolicies();
         var statusList = getSelectedPolicyStates();
         if (($.inArray('Active/Updated', statusList) > -1) || ($.inArray('Active', statusList) > -1)) {
-            $(modalPopupContent).html($("#errorPolicyPublishSelection").html());
+            modalDialog.header('Operation cannot be performed !');
-            showPopup();
+            modalDialog.content('You cannot select already active policies. Please deselect active policies and try ' +
+                'again.');
+            modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" class="btn-operations">' +
+                'Ok</a></div>');
+            modalDialog.showAsAWarning();
         } else {
             var serviceURL = "/devicemgt_admin/policies/activate";
             if (policyList == 0) {
-                $(modalPopupContent).html($("#errorPolicyPublish").html());
+                modalDialog.header('Operation cannot be performed !');
+                modalDialog.content('Please select a policy or a list of policies to publish.');
+                modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" class="btn-operations">' +
+                    'Ok</a></div>');
+                modalDialog.showAsAWarning();
             } else {
-                $(modalPopupContent).html($('#publish-policy-modal-content').html());
+                modalDialog.header('Do you really want to publish the selected policy(s)?');
+                modalDialog.footer('<div class="buttons"><a href="#" id="publish-policy-yes-link" ' +
+                    'class="btn-operations">Yes</a><a href="#" id="publish-policy-cancel-link" ' +
+                    'class="btn-operations btn-default">No</a></div>');
+                modalDialog.show();
             }
-            showPopup();
 
             $("a#publish-policy-yes-link").click(function () {
                 invokerUtil.put(
@@ -288,24 +323,29 @@ $(document).ready(function () {
                     policyList,
                     // on success
                     function () {
-                        $(modalPopupContent).html($('#publish-policy-success-content').html());
+                        modalDialog.header('Done. Selected policy was successfully published.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="publish-policy-success-link" ' +
+                            'class="btn-operations">Ok</a></div>');
                         $("a#publish-policy-success-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                             location.reload();
                         });
                     },
                     // on error
                     function () {
-                        $(modalPopupContent).html($('#publish-policy-error-content').html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="publish-policy-error-link" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#publish-policy-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 );
             });
 
             $("a#publish-policy-cancel-link").click(function () {
-                hidePopup();
+                modalDialog.hide();
             });
         }
     });
@@ -314,11 +354,18 @@ $(document).ready(function () {
         var policyList = getSelectedPolicies();
         var deletePolicyAPI = "/devicemgt_admin/policies/bulk-remove";
         if (policyList == 0) {
-            $(modalPopupContent).html($("#errorPolicy").html());
+            modalDialog.header('Operation cannot be performed !');
+            modalDialog.content('Please select a policy or a list of policies to remove.');
+            modalDialog.footer('<div class="buttons"><a href="javascript:modalDialog.hide()" class="btn-operations">' +
+                'Ok</a></div>');
+            modalDialog.showAsAWarning();
         } else {
-            $(modalPopupContent).html($('#remove-policy-modal-content').html());
+            modalDialog.header('Do you really want to remove the selected policy(s)?');
+            modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-yes-link" class=' +
+                '"btn-operations">Remove</a> <a href="#" id="remove-policy-cancel-link" ' +
+                'class="btn-operations btn-default">Cancel</a></div>');
+            modalDialog.show();
         }
-        showPopup();
 
         $("a#remove-policy-yes-link").click(function () {
             invokerUtil.post(
@@ -328,30 +375,41 @@ $(document).ready(function () {
                 function (data) {
                     data = JSON.parse(data);
                     if (data.errorMessage) {
-                        $(modalPopupContent).html($('#remove-policy-error-devices').html());
+                        modalDialog.header('Cannot Remove Policies.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-error-devices" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#remove-policy-error-devices").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     } else {
-                        $(modalPopupContent).html($('#remove-policy-success-content').html());
+                        modalDialog.header('Done. Selected policy was successfully removed.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-success-link" ' +
+                            'class="btn-operations">Ok</a></div>');
                         $("a#remove-policy-success-link").click(function () {
                             var thisTable = $(".DTTT_selected").closest('.dataTables_wrapper').find('.dataTable').dataTable();
                             thisTable.api().rows('.DTTT_selected').remove().draw(false);
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 },
                 // on error
                 function (data) {
                     if (JSON.parse(data.responseText).errorMessage) {
-                        $(modalPopupContent).html($('#remove-policy-error-devices').html());
+                        modalDialog.header('Cannot Remove Policies.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-error-devices" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#remove-policy-error-devices").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     } else {
-                        $(modalPopupContent).html($('#remove-policy-error-content').html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
+                        modalDialog.footer('<div class="buttons"><a href="#" id="remove-policy-error-link" ' +
+                            'class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#remove-policy-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 }
@@ -359,7 +417,7 @@ $(document).ready(function () {
         });
 
         $("a#remove-policy-cancel-link").click(function () {
-            hidePopup();
+            modalDialog.hide();
         });
     });
     $("#loading-content").remove();

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

@@ -210,8 +210,10 @@ $("#role-grid").on("click", ".remove-role-link", function () {
     if (userStore) {
         removeRoleAPI += "?user-store=" + encodeURIComponent(userStore);
     }
-    $(modalPopupContent).html($('#remove-role-modal-content').html());
+    modalDialog.header('Do you really want to remove this role ?');
-    showPopup();
+    modalDialog.footer('<div class="buttons"><a href="#" id="remove-role-yes-link" class="btn-operations">Remove</a>' +
+        '<a href="#" id="remove-role-cancel-link" class="btn-operations btn-default">Cancel</a></div>');
+    modalDialog.show();
 
     $("a#remove-role-yes-link").click(function () {
         invokerUtil.delete(
@@ -221,22 +223,28 @@ $("#role-grid").on("click", ".remove-role-link", function () {
                     role = userStore + '/' + role;
                 }
                 $('[id="role-' + role + '"]').remove();
-                $(modalPopupContent).html($('#remove-role-success-content').html());
+                modalDialog.header('Done. Role was successfully removed.');
+                modalDialog.footer('<div class="buttons"><a href="#" id="remove-role-success-link" ' +
+                    'class="btn-operations">Ok</a></div>');
                 $("a#remove-role-success-link").click(function () {
-                    hidePopup();
+                    modalDialog.hide();
                 });
             },
             function () {
-                $(modalPopupContent).html($('#remove-role-error-content').html());
+                // $(modalPopupContent).html($('#remove-role-error-content').html());
+                modalDialog.header('An unexpected error occurred. Please try again later.');
+                modalDialog.footer('<div class="buttons"><a href="#" id="remove-role-error-link" ' +
+                    'class="btn-operations">Ok</a></div>');
+                modalDialog.showAsError();
                 $("a#remove-role-error-link").click(function () {
-                    hidePopup();
+                    modalDialog.hide();
                 });
             }
         );
     });
 
     $("a#remove-role-cancel-link").click(function () {
-        hidePopup();
+        modalDialog.hide();
     });
 });
 

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

@@ -18,6 +18,7 @@
 
 {{unit "cdmf.unit.ui.title" pageTitle="Role Management"}}
 {{unit "cdmf.unit.data-tables-extended"}}
+{{unit "cdmf.unit.ui.modal"}}
 
 {{#zone "breadcrumbs"}}
     <li>
@@ -80,58 +81,6 @@
             <th>By Role name</th>
         </div>
     </div>
-
-
-    <div id="remove-role-modal-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Do you really want to remove this role ?</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-role-yes-link" class="btn-operations">
-                    Remove
-                </a>
-                <a href="#" id="remove-role-cancel-link" class="btn-operations btn-default">
-                    Cancel
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-role-success-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">Done. Role was successfully removed.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-role-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-role-error-content" class="hide">
-        <div class="modal-header">
-            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="#" id="remove-role-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
 {{/zone}}
 
 {{#zone "bottomJs"}}

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

@@ -18,7 +18,7 @@
 {{#zone "footer"}}
     <p>
         <span class="hidden-xs">WSO2 Carbon Device Management Framework v1.1.3</span>
-        <span class="visible-xs-inline">WSO2 CDMF v1.1.3</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
+        <span class="visible-xs-inline">WSO2 CDMF v1.2.6</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
         <a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All Rights Reserved.
     </p>
 {{/zone}}

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

@@ -16,6 +16,8 @@
   under the License.
 }}
 
+{{unit "cdmf.unit.ui.modal"}}
+
 <div class="row wr-device-board">
     <div class="col-lg-12 wr-secondary-bar">
             <span class="page-sub-title">
@@ -88,111 +90,6 @@
             {{/equal}}
         </div>
     </div>
-
-    <div id="apply-changes-modal-content" class="hide">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-            </button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h3>Do you really want to apply changes to all policies?</h3>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:void(0)" id="apply-changes-yes-link" class="btn-operations">
-                    Yes
-                </a>
-                <a href="javascript:void(0)" id="apply-changes-cancel-link" class="btn-operations">
-                    No
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="apply-changes-success-content" class="hide">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-            </button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h3>Done. Changes applied successfully.</h3>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:void(0)" id="apply-changes-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="apply-changes-error-content" class="hide">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-            </button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h3>An unexpected error occurred. Please try again later.</h3>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:void(0)" id="apply-changes-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="remove-policy-error-content" class="hide">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-            </button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h3>An unexpected error occurred. Please try again later.</h3>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:void(0)" id="remove-policy-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="save-policy-priorities-success-content" class="hide">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-            </button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h3>Done. New Policy priorities were successfully updated.</h3>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:void(0)" id="save-policy-priorities-success-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
-
-    <div id="save-policy-priorities-error-content" class="hide">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-            </button>
-        </div>
-        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-            <h3>An unexpected error occurred. Please try again later.</h3>
-        </div>
-        <div class="modal-footer">
-            <div class="buttons">
-                <a href="javascript:void(0)" id="save-policy-priorities-error-link" class="btn-operations">
-                    Ok
-                </a>
-            </div>
-        </div>
-    </div>
 </div>
 
 {{#zone "bottomJs"}}

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

@@ -87,10 +87,12 @@ $(document).ready(function () {
             // on success
             function (data, textStatus, jqXHR) {
                 if (jqXHR.status == 200) {
-                    $(modalPopupContent).html($('#save-policy-priorities-success-content').html());
+                    modalDialog.header('Done. New Policy priorities were successfully updated.');
-                    showPopup();
+                    modalDialog.footer('<div class="buttons"><a href="javascript:void(0)" ' +
+                        'id="save-policy-priorities-success-link" class="btn-operations">Ok</a></div>');
+                    modalDialog.show();
                     $("a#save-policy-priorities-success-link").click(function () {
-                        hidePopup();
+                        modalDialog.hide();
                     });
                     $(applyChangesBtn).prop("disabled", false);
                 }
@@ -98,10 +100,12 @@ $(document).ready(function () {
             // on error
             function (jqXHR) {
                 if (jqXHR.status == 400 || jqXHR.status == 500) {
-                    $(modalPopupContent).html($("#save-policy-priorities-error-content").html());
+                    modalDialog.header('An unexpected error occurred. Please try again later.');
-                    showPopup();
+                    modalDialog.footer('<div class="buttons"><a href="javascript:void(0)" ' +
+                        'id="save-policy-priorities-error-link" class="btn-operations">Ok</a></div>');
+                    modalDialog.showAsError();                    
                     $("a#save-policy-priorities-error-link").click(function () {
-                        hidePopup();
+                        modalDialog.hide();
                     });
                 }
             }
@@ -110,8 +114,11 @@ $(document).ready(function () {
 
     $(applyChangesBtn).click(function () {
         var applyPolicyChangesAPI = "/api/device-mgt/v1.0/policies/apply-changes";
-        $(modalPopupContent).html($("#apply-changes-modal-content").html());
+        modalDialog.header('Do you really want to apply changes to all policies?');
-        showPopup();
+        modalDialog.footer('<div class="buttons"><a href="javascript:void(0)" id="apply-changes-yes-link" ' +
+            'class="btn-operations">Yes</a><a href="javascript:void(0)" id="apply-changes-cancel-link" ' +
+            'class="btn-operations">No</a></div>');
+        modalDialog.show();
 
         $("a#apply-changes-yes-link").click(function () {
             invokerUtil.put(
@@ -120,20 +127,24 @@ $(document).ready(function () {
                 // on success
                 function (data, textStatus, jqXHR) {
                     if (jqXHR.status == 200) {
-                        $(modalPopupContent).html($("#apply-changes-success-content").html());
+                        modalDialog.header('Done. Changes applied successfully.');
-                        showPopup();
+                        modalDialog.footer('<div class="buttons"><a href="javascript:void(0)" ' +
+                            'id="apply-changes-success-link" class="btn-operations">Ok</a></div>');
+                        modalDialog.show();
                         $("a#apply-changes-success-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 },
                 // on error
                 function (jqXHR) {
                     if (jqXHR.status == 500) {
-                        $(modalPopupContent).html($("#apply-changes-error-content").html());
+                        modalDialog.header('An unexpected error occurred. Please try again later.');
-                        showPopup();
+                        modalDialog.footer('<div class="buttons"><a href="javascript:void(0)" ' +
+                            'id="apply-changes-error-link" class="btn-operations">Ok</a></div>');
+                        modalDialog.showAsError();
                         $("a#apply-changes-error-link").click(function () {
-                            hidePopup();
+                            modalDialog.hide();
                         });
                     }
                 }
@@ -141,7 +152,7 @@ $(document).ready(function () {
         });
 
         $("a#apply-changes-cancel-link").click(function () {
-            hidePopup();
+            modalDialog.hide();
         });
     });
 

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

@@ -16,6 +16,9 @@
   under the License.
 }}
 <!-- content/body -->
+
+{{unit "cdmf.unit.ui.modal"}}
+
 <div class="row">
     <div class="col-md-12">
         <!-- content -->
@@ -81,22 +84,6 @@
                 </a>
             </div>
         </div>
-        <div id="child-deselect-error-content" class="hide">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i>
-                </button>
-            </div>
-            <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-                <h3>Can't deselect child permissions when parent permission is selected.</h3>
-            </div>
-            <div class="modal-footer">
-                <div class="buttons">
-                    <a href="#" id="child-deselect-error-link" class="btn-operations">
-                        Ok
-                    </a>
-                </div>
-            </div>
-        </div>
         <!-- /content -->
     </div>
 </div>

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

@@ -132,10 +132,14 @@ $(document).ready(function () {
                     $("#permissionList li input").click(function(){
                         var parentInput = $(this).parents("ul:eq(1) > li").find('input:eq(0)');
                         if(parentInput && parentInput.is(':checked')){
-                            $(modalPopupContent).html($('#child-deselect-error-content').html());
+                            modalDialog.header('');
-                            showPopup();
+                            modalDialog.content('Can\'t deselect child permissions when parent permission is ' +
+                                'selected.');
+                            modalDialog.footer('<div class="buttons"><a href="#" id="child-deselect-error-link" ' +
+                                'class="btn-operations">Ok</a></div>');
+                            modalDialog.showAsAWarning();
                             $("a#child-deselect-error-link").click(function () {
-                                hidePopup();
+                                modalDialog.hide();
                             });
                             return false;
                         }

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

@@ -6506,3 +6506,8 @@ select > option:hover {
 .label-bold{
     font-weight:400;
 }
+
+/* Adding style for required fields */
+.required:before {
+  content: "*";
+}

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/email-sender/pom.xml

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

components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.mdm</groupId>
     <artifactId>dynamic-client-web-proxy</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - Proxy endpoint of Dynamic Client Registration Web Service</name>
     <description>WSO2 Carbon - Dynamic Client Registration Web Proxy</description>
     <packaging>war</packaging>

components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.mdm</groupId>
     <artifactId>dynamic-client-web</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - Dynamic Client Registration Web Service</name>
     <description>WSO2 Carbon - Dynamic Client Registration Web</description>
     <packaging>war</packaging>

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client registration service</name>
     <description>WSO2 Carbon - Dynamic Client Registration Service</description>

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.web.app.registration</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client web app registration</name>
     <description>WSO2 Carbon - Dynamic Client Web-app Registration Service</description>

components/identity-extensions/dynamic-client-registration/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic client registration</name>
     <url>http://wso2.org</url>

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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>

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

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

components/policy-mgt/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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.webapp.publisher.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt-feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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.push.notification.provider.gcm.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - GCM 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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.device.mgt.analytics.dashboard.feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-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>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>dynamic-client-registration-feature</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - Dynamic Client Registration Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains dynamic client registration features</description>

features/dynamic-client-registration/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration-feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender-feature</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.email.sender.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for email sender related functionality

features/email-sender/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>email-sender-feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>

features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>jwt-client-feature</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.jwt.client.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - JWT Client Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains jwt client implementation from which we can get a access token using the jwt

features/jwt-client/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-client-feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

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

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>oauth-extensions-feature</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Mgt OAuth Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains devicemgt related OAuth extensions</description>

features/oauth-extensions/pom.xml

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

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

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

features/policy-mgt/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>1.2.6-SNAPSHOT</version>
+        <version>1.2.7-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>policy-mgt-feature</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Feature</name>
     <url>http://wso2.org</url>

features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml

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

features/webapp-authenticator-framework/pom.xml

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