Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/filter/ApiPermissionFilter.java

@@ -119,7 +119,7 @@ public class ApiPermissionFilter implements Filter {
                                 .getThreadLocalCarbonContext().getTenantId());
             return userRealm.getAuthorizationManager().isUserAuthorized(username, permission, action);
         } catch (UserStoreException e) {
-            String errorMsg = String.format("Unable to authorize the user : %s", username, e);
+            String errorMsg = String.format("Unable to authorize the user : %s", username);
             log.error(errorMsg, e);
             return false;
         }

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java

@@ -29,7 +29,10 @@ import org.wso2.carbon.apimgt.webapp.publisher.config.APIResource;
 import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
 import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
 import org.wso2.carbon.base.MultitenantConstants;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.core.util.Utils;
+import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import javax.servlet.ServletContext;
 import java.util.*;
@@ -42,7 +45,6 @@ public class APIPublisherUtil {
     private static final String DEFAULT_API_VERSION = "1.0.0";
     private static final String API_CONFIG_DEFAULT_VERSION = "1.0.0";
     private static final String PARAM_MANAGED_API_ENDPOINT = "managed-api-endpoint";
-    private static final String PARAM_MANAGED_API_OWNER = "managed-api-owner";
     private static final String PARAM_MANAGED_API_TRANSPORTS = "managed-api-transports";
     private static final String PARAM_MANAGED_API_POLICY = "managed-api-policy";
     private static final String PARAM_MANAGED_API_IS_SECURED = "managed-api-isSecured";
@@ -75,7 +77,7 @@ public class APIPublisherUtil {
 
         api.setUrl(config.getEndpoint());
         api.addAvailableTiers(provider.getTiers());
-        api.setEndpointSecured(true);
+        api.setEndpointSecured(false);
         api.setStatus(APIStatus.CREATED);
         api.setTransports(config.getTransports());
         api.setApiLevelPolicy(config.getPolicy());
@@ -193,7 +195,8 @@ public class APIPublisherUtil {
      * @param apiDef
      * @return
      */
-    public static APIConfig buildApiConfig(ServletContext servletContext, APIResourceConfiguration apiDef) {
+    public static APIConfig buildApiConfig(ServletContext servletContext, APIResourceConfiguration apiDef)
+            throws UserStoreException {
         APIConfig apiConfig = new APIConfig();
 
         String name = apiDef.getName();
@@ -233,7 +236,8 @@ public class APIPublisherUtil {
             apiConfig.setTags(tags);
         }
 
-        String tenantDomain = servletContext.getInitParameter(PARAM_PROVIDER_TENANT_DOMAIN);
+        String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
+        servletContext.setAttribute(PARAM_PROVIDER_TENANT_DOMAIN, tenantDomain);
         tenantDomain = (tenantDomain != null && !tenantDomain.isEmpty()) ? tenantDomain :
                 MultitenantConstants.SUPER_TENANT_DOMAIN_NAME;
         apiConfig.setTenantDomain(tenantDomain);
@@ -253,7 +257,11 @@ public class APIPublisherUtil {
         }
         apiConfig.setEndpoint(endpoint);
 
-        String owner = servletContext.getInitParameter(PARAM_MANAGED_API_OWNER);
+        String owner = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm().getRealmConfiguration()
+                .getAdminUserName();
+        if (!MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(tenantDomain)) {
+            owner = owner + "@" + tenantDomain;
+        }
         if (owner == null || owner.isEmpty()) {
             if (log.isDebugEnabled()) {
                 log.debug("'managed-api-owner' attribute is not configured");
@@ -280,12 +288,15 @@ public class APIPublisherUtil {
                 log.debug("'managed-api-transports' attribute is not configured. Therefore using the default, " +
                         "which is 'https'");
             }
-            transports = "https";
+            transports = "https,http";
         }
         apiConfig.setTransports(transports);
 
         String sharingValueParam = servletContext.getInitParameter(PARAM_SHARED_WITH_ALL_TENANTS);
         boolean isSharedWithAllTenants = Boolean.parseBoolean(sharingValueParam);
+        if (isSharedWithAllTenants && !MultitenantConstants.SUPER_TENANT_DOMAIN_NAME.equals(tenantDomain)) {
+            isSharedWithAllTenants = false;
+        }
         apiConfig.setSharedWithAllTenants(isSharedWithAllTenants);
 
         Set<URITemplate> uriTemplates = new LinkedHashSet<>();

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java

@@ -32,6 +32,8 @@ import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
 import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
 import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
 import org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.user.api.UserStoreException;
 
 import javax.servlet.ServletContext;
 import java.io.IOException;
@@ -106,6 +108,9 @@ public class APIPublisherLifecycleListener implements LifecycleListener {
                     log.error("Error encountered while discovering annotated classes", e);
                 } catch (ClassNotFoundException e) {
                     log.error("Error while scanning class for annotations", e);
+                } catch (UserStoreException e) {
+                    log.error("Error while retrieving tenant admin user for the tenant domain"
+                                      + PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(), e);
                 }
             }
         }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java

@@ -83,11 +83,7 @@ public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, Messag
 
         OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
         try {
-            Type jsonType = null;
+            getGson().toJson(object, type, writer);
-            if (type.equals(type)) {
-                jsonType = type;
-            }
-            getGson().toJson(object, jsonType, writer);
         } finally {
             writer.close();
         }

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

@@ -83,11 +83,7 @@ public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, Messag
 
         OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
         try {
-            Type jsonType = null;
+            getGson().toJson(object, type, writer);
-            if (type.equals(type)) {
-                jsonType = type;
-            }
-            getGson().toJson(object, jsonType, writer);
         } finally {
             writer.close();
         }

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

@@ -66,6 +66,10 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
         </dependency>
+		<dependency>
+			<groupId>org.wso2.carbon</groupId>
+			<artifactId>org.wso2.carbon.application.deployer</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -91,6 +95,7 @@
                         <Import-Package>
                             javax.naming,
                             javax.sql,
+                            javax.xml,
                             javax.xml.bind,
                             javax.xml.bind.annotation,
                             javax.xml.parsers; version="${javax.xml.parsers.import.pkg.version}",
@@ -108,9 +113,13 @@
                             org.wso2.carbon.registry.core,
                             org.wso2.carbon.registry.core.*,
                             org.wso2.carbon.utils.*,
-                            javax.xml.namespace
+                            javax.xml.namespace,
+							org.apache.commons.io,
+							org.wso2.carbon.application.deployer.*,
+							org.apache.axis2.engine
                         </Import-Package>
                         <Axis2Deployer>DeviceTypeDeployer</Axis2Deployer>
+						<!--<WSO2-Application-Deployer>Device Type Capp Deployer</WSO2-Application-Deployer>-->
                     </instructions>
                 </configuration>
             </plugin>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java

@@ -0,0 +1,178 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+
+import org.apache.axis2.deployment.Deployer;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.repository.util.DeploymentFileData;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.application.deployer.AppDeployerConstants;
+import org.wso2.carbon.application.deployer.AppDeployerUtils;
+import org.wso2.carbon.application.deployer.CarbonApplication;
+import org.wso2.carbon.application.deployer.config.Artifact;
+import org.wso2.carbon.application.deployer.config.CappFile;
+import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler;
+import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This is the device deployer that will read and deploy the device type files from
+ * "deployment/server/carbonapps"
+ * directory.
+ */
+public class DeviceTypeCAppDeployer implements AppDeploymentHandler {
+
+
+    private static Log log = LogFactory.getLog(DeviceTypeCAppDeployer.class);
+    private List<Artifact> deviceTypePlugins = new ArrayList<Artifact>();
+    private List<Artifact> deviceTypeUIs = new ArrayList<Artifact>();
+
+    @Override
+    public void deployArtifacts(CarbonApplication carbonApplication, AxisConfiguration axisConfig)
+            throws DeploymentException {
+        List<Artifact.Dependency> artifacts =
+                carbonApplication.getAppConfig().getApplicationArtifact().getDependencies();
+
+        for (Artifact.Dependency dep : artifacts) {
+            Artifact artifact = dep.getArtifact();
+            if (!validateArtifact(artifact)) {
+                continue;
+            }
+            addArtifact(artifact);
+        }
+
+        try {
+            deployTypeSpecifiedArtifacts(deviceTypeUIs, axisConfig, null,
+                                         DeviceTypePluginConstants.CDMF_UI_TYPE_DIR);
+            deployTypeSpecifiedArtifacts(deviceTypePlugins, axisConfig,
+                                         DeviceTypePluginConstants.CDMF_PLUGIN_TYPE_EXTENSION,
+                                         DeviceTypePluginConstants.CDMF_PLUGIN_TYPE_DIR);
+
+        } catch (Exception e) {
+            throw new DeploymentException(e.getMessage(), e);
+        } finally {
+            deviceTypePlugins.clear();
+            deviceTypeUIs.clear();
+        }
+
+    }
+
+    private void deployTypeSpecifiedArtifacts(List<Artifact> artifacts, AxisConfiguration axisConfig,
+                                              String fileType, String directory) throws DeploymentException {
+        for (Artifact artifact : artifacts) {
+            Deployer deployer = AppDeployerUtils.getArtifactDeployer(axisConfig, directory, fileType);
+            if (deployer != null) {
+                deploy(deployer, artifact);
+            }
+        }
+    }
+
+    @Override
+    public void undeployArtifacts(CarbonApplication carbonApplication, AxisConfiguration axisConfig)
+            throws DeploymentException {
+        List<Artifact.Dependency> artifacts =
+                carbonApplication.getAppConfig().getApplicationArtifact().getDependencies();
+
+        deviceTypePlugins.clear();
+        deviceTypeUIs.clear();
+
+        for (Artifact.Dependency dep : artifacts) {
+            Artifact artifact = dep.getArtifact();
+            if (!validateArtifact(artifact)) {
+                continue;
+            }
+            addArtifact(artifact);
+        }
+
+        try {
+            undeployTypeSpecifiedArtifacts(deviceTypeUIs, axisConfig, null,
+                                           DeviceTypePluginConstants.CDMF_UI_TYPE_DIR);
+            undeployTypeSpecifiedArtifacts(deviceTypePlugins, axisConfig,
+                                           DeviceTypePluginConstants.CDMF_PLUGIN_TYPE_EXTENSION,
+                                           DeviceTypePluginConstants.CDMF_PLUGIN_TYPE_DIR);
+        } finally {
+            deviceTypePlugins.clear();
+            deviceTypeUIs.clear();
+        }
+
+    }
+
+    private void undeployTypeSpecifiedArtifacts(List<Artifact> artifacts, AxisConfiguration axisConfig, String fileType
+            , String directory) throws DeploymentException {
+        for (Artifact artifact : artifacts) {
+                Deployer deployer = AppDeployerUtils.getArtifactDeployer(axisConfig, directory, fileType);
+            if (deployer != null &&
+                    AppDeployerConstants.DEPLOYMENT_STATUS_DEPLOYED.equals(artifact.getDeploymentStatus())) {
+                undeploy(deployer, artifact);
+            }
+        }
+    }
+
+    private boolean validateArtifact(Artifact artifact) {
+        if (artifact == null) {
+            return false;
+        }
+        List<CappFile> files = artifact.getFiles();
+        if (files.size() != 1) {
+            log.error("Synapse artifact types must have a single file to " +
+                              "be deployed. But " + files.size() + " files found.");
+            return false;
+        }
+        return true;
+    }
+
+    private void addArtifact(Artifact artifact) {
+        if (DeviceTypePluginConstants.CDMF_PLUGIN_TYPE.equals(artifact.getType())) {
+            deviceTypePlugins.add(artifact);
+        } else if (DeviceTypePluginConstants.CDMF_UI_TYPE.equals(artifact.getType())) {
+            deviceTypeUIs.add(artifact);
+        }
+    }
+
+    void deploy(Deployer deployer, Artifact artifact) throws DeploymentException {
+        String fileName = artifact.getFiles().get(0).getName();
+        String artifactPath = artifact.getExtractedPath() + File.separator + fileName;
+        try {
+            deployer.deploy(new DeploymentFileData(new File(artifactPath)));
+            artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_DEPLOYED);
+        } catch (Exception e) {
+            artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_FAILED);
+            log.error("Deployment is failed due to " + e.getMessage(), e);
+            throw new DeploymentException(e.getMessage(), e);
+        }
+    }
+
+    private void undeploy(Deployer deployer, Artifact artifact) throws DeploymentException {
+        String fileName = artifact.getFiles().get(0).getName();
+        String artifactPath = artifact.getExtractedPath() + File.separator + fileName;
+        try {
+            deployer.undeploy(new DeploymentFileData(new File(artifactPath), deployer).getAbsolutePath());
+            artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_PENDING);
+        } catch (Exception e) {
+            artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_FAILED);
+            log.error("Undeployment is failed due to " + e.getMessage(), e);
+            throw new DeploymentException(e.getMessage(), e);
+        }
+    }
+}

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java

@@ -44,12 +44,12 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * This is the device deployer that will read and deploy the device type files from "deployment/server/devicetypes"
+ * This is the device deployer that will read and deploy the device type plugin files from "deployment/server/devicetypes"
  * directory.
  */
-public class DeviceTypeDeployer extends AbstractDeployer {
+public class DeviceTypePluginDeployer extends AbstractDeployer {
 
-    private static Log log = LogFactory.getLog(DeviceTypeDeployer.class);
+    private static Log log = LogFactory.getLog(DeviceTypePluginDeployer.class);
     private ConfigurationContext configurationContext;
     protected Map<String, ServiceRegistration> deviceTypeServiceRegistrations = new ConcurrentHashMap();
     protected Map<String, DeviceTypeConfigIdentifier> deviceTypeConfigurationDataMap = new ConcurrentHashMap();

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeUIDeployer.java

@@ -0,0 +1,123 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer;
+
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.deployment.AbstractDeployer;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.repository.util.DeploymentFileData;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * This is the device deployer that will read and deploy the device type ui files from
+ * "deployment/server/devicetypes-ui"
+ * directory.
+ */
+public class DeviceTypeUIDeployer extends AbstractDeployer {
+
+    private static Log log = LogFactory.getLog(DeviceTypeUIDeployer.class);
+    protected Map<String, String> deviceTypeDeployedUIMap = new ConcurrentHashMap<String, String>();
+    private static final String DEVICEMGT_JAGGERY_APP_PATH = CarbonUtils.getCarbonRepository() + File.separator
+            + "jaggeryapps" + File.separator + "devicemgt" + File.separator + "app" + File.separator + "units"
+            + File.separator;
+
+    private static final String UNIT_PREFIX = "cdmf.unit.device.type";
+
+    @Override
+    public void init(ConfigurationContext configurationContext) {
+    }
+
+    @Override
+    public void setDirectory(String s) {
+
+    }
+
+    @Override
+    public void setExtension(String s) {
+
+    }
+
+    @Override
+    public void deploy(DeploymentFileData deploymentFileData) throws DeploymentException {
+        if (!deploymentFileData.getFile().isDirectory()) {
+            return;
+        }
+        String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true);
+        if (tenantDomain != null && !tenantDomain.isEmpty()) {
+            File jaggeryAppPath = new File(
+                    DEVICEMGT_JAGGERY_APP_PATH + tenantDomain + "." + deploymentFileData.getName());
+            try {
+                if (!jaggeryAppPath.exists()) {
+                    FileUtils.forceMkdir(jaggeryAppPath);
+                    FileUtils.copyDirectory(deploymentFileData.getFile(), jaggeryAppPath);
+                    File[] listOfFiles = jaggeryAppPath.listFiles();
+
+                    for (int i = 0; i < listOfFiles.length; i++) {
+                        if (listOfFiles[i].isFile()) {
+                            String content = FileUtils.readFileToString(listOfFiles[i]);
+                            FileUtils.writeStringToFile(listOfFiles[i], content.replaceAll(UNIT_PREFIX
+                                    , tenantDomain + "." + UNIT_PREFIX));
+                        }
+                    }
+                } else {
+                    log.debug("units already exists " + deploymentFileData.getName());
+                }
+                this.deviceTypeDeployedUIMap.put(deploymentFileData.getAbsolutePath(),
+                                                 jaggeryAppPath.getAbsolutePath());
+            } catch (IOException e) {
+                if (jaggeryAppPath.exists()) {
+                    try {
+                        FileUtils.deleteDirectory(jaggeryAppPath);
+                    } catch (IOException e1) {
+                        log.error("Failed to delete directory " + jaggeryAppPath.getAbsolutePath());
+                    }
+                }
+                log.error("Cannot deploy deviceType ui : " + deploymentFileData.getName(), e);
+                throw new DeploymentException(
+                        "Device type ui file " + deploymentFileData.getName() + " is not deployed ", e);
+            }
+
+        } else {
+            log.error("Cannot deploy deviceType ui: " + deploymentFileData.getName());
+        }
+
+
+    }
+
+    @Override
+    public void undeploy(String filePath) throws DeploymentException {
+        try {
+            String jaggeryUnitPath = this.deviceTypeDeployedUIMap.remove(filePath);
+            FileUtils.deleteDirectory(new File(jaggeryUnitPath));
+            log.info("Device Type units un deployed successfully.");
+        } catch (IOException e) {
+            throw new DeploymentException("Failed to remove the units: " + filePath);
+        }
+    }
+
+}

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceTypeConfiguration.java

@@ -41,6 +41,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  *         <element name="PushNotificationProvider" type="{}PushNotificationProvider"/>
  *         <element name="License" type="{}License"/>
  *         <element name="DataSource" type="{}DataSource"/>
+ *         <element name="PolicyMonitoring" type="{}PolicyMonitoring"/>
  *         <element name="DeviceAuthorizationConfig" type="{}DeviceAuthorizationConfig"/>
  *       </sequence>
  *       <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -71,6 +72,8 @@ public class DeviceTypeConfiguration {
     protected DeviceAuthorizationConfig deviceAuthorizationConfig;
     @XmlAttribute(name = "name")
     protected String name;
+    @XmlElement(name = "PolicyMonitoring", required = true)
+    protected PolicyMonitoring policyMonitoring;
 
     /**
      * Gets the value of the taskConfiguration property.
@@ -116,6 +119,26 @@ public class DeviceTypeConfiguration {
         this.deviceDetails = value;
     }
 
+    /**
+     * Gets the value of the policyMonitoring property.
+     *
+     * @return possible object is
+     * {@link DeviceDetails }
+     */
+    public PolicyMonitoring getPolicyMonitoring() {
+        return policyMonitoring;
+    }
+
+    /**
+     * Sets the value of the policyMonitoring property.
+     *
+     * @param value allowed object is
+     *              {@link DeviceDetails }
+     */
+    public void setDeviceDetails(PolicyMonitoring value) {
+        this.policyMonitoring = value;
+    }
+
     /**
      * Gets the value of the features property.
      *

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/PolicyMonitoring.java

@@ -0,0 +1,104 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for PolicyMonitoring complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="PolicyMonitoring">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="enabled" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PolicyMonitoring", propOrder = {
+    "value"
+})
+public class PolicyMonitoring {
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "enabled")
+    protected boolean enabled;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the enabled property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Sets the value of the enabled property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEnabled(boolean value) {
+        this.enabled = value;
+    }
+
+}

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java

@@ -21,6 +21,8 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
+import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler;
+import org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.utils.ConfigurationContextService;
 
@@ -45,6 +47,7 @@ public class DeviceTypeManagementServiceComponent {
         if (log.isDebugEnabled()) {
             log.debug("Activating DeviceType Deployer Service Component");
         }
+//        ctx.getBundleContext().registerService(AppDeploymentHandler.class.getName(), new DeviceTypeCAppDeployer(), null);
         DeviceTypeManagementDataHolder.getInstance().setBundleContext(ctx.getBundleContext());
     }
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManagerService.java

@@ -28,12 +28,14 @@ import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Property;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.PushNotificationProvider;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.TaskConfiguration;
+import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.policy.mgt.DefaultPolicyMonitoringManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,6 +56,7 @@ public class DeviceTypeManagerService implements DeviceManagementService {
     private String type;
     private OperationMonitoringTaskConfig operationMonitoringConfigs;
     private List<MonitoringOperation> monitoringOperations;
+    private PolicyMonitoringManager policyMonitoringManager;
 
     public DeviceTypeManagerService(DeviceTypeConfigIdentifier deviceTypeConfigIdentifier,
                                     DeviceTypeConfiguration deviceTypeConfiguration) {
@@ -63,6 +66,10 @@ public class DeviceTypeManagerService implements DeviceManagementService {
         this.populatePushNotificationConfig(deviceTypeConfiguration.getPushNotificationProvider());
         this.operationMonitoringConfigs = new OperationMonitoringTaskConfig();
         this.setOperationMonitoringConfig(deviceTypeConfiguration);
+        if (deviceTypeConfiguration.getPolicyMonitoring() != null && deviceTypeConfiguration.getPolicyMonitoring()
+                .isEnabled()) {
+            this.policyMonitoringManager = new DefaultPolicyMonitoringManager();
+        }
     }
 
     @Override
@@ -145,6 +152,11 @@ public class DeviceTypeManagerService implements DeviceManagementService {
         return pushNotificationConfig;
     }
 
+    @Override
+    public PolicyMonitoringManager getPolicyMonitoringManager() {
+        return policyMonitoringManager;
+    }
+
     private void setProvisioningConfig(String tenantDomain, DeviceTypeConfiguration deviceTypeConfiguration) {
         if (deviceTypeConfiguration.getProvisioningConfig() != null) {
             boolean sharedWithAllTenants = deviceTypeConfiguration.getProvisioningConfig().isSharedWithAllTenants();

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/policy/mgt/DefaultPolicyMonitoringManager.java

@@ -0,0 +1,72 @@
+/*
+ *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.policy.mgt;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.Feature;
+import org.wso2.carbon.device.mgt.common.FeatureManager;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Operation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * This implementation policy monitoring manager.
+ */
+public class DefaultPolicyMonitoringManager implements PolicyMonitoringManager {
+
+    private static Log log = LogFactory.getLog(DefaultPolicyMonitoringManager.class);
+    @Override
+    public NonComplianceData checkPolicyCompliance(DeviceIdentifier deviceIdentifier, Policy policy, Object response)
+            throws PolicyComplianceException {
+        if (log.isDebugEnabled()) {
+            log.debug("Checking policy compliance status of device '" + deviceIdentifier.getId() + "'");
+        }
+        NonComplianceData nonComplianceData = new NonComplianceData();
+        if (response == null || policy == null) {
+            return nonComplianceData;
+        }
+
+        List<ComplianceFeature> complianceFeatures = (List<ComplianceFeature>) response;
+        List<ComplianceFeature> nonComplianceFeatures = new ArrayList<>();
+
+        for (ComplianceFeature complianceFeature : complianceFeatures) {
+            if (!complianceFeature.isCompliant()) {
+                nonComplianceFeatures.add(complianceFeature);
+                nonComplianceData.setStatus(false);
+                break;
+            }
+        }
+        nonComplianceData.setComplianceFeatures(nonComplianceFeatures);
+
+        return nonComplianceData;
+    }
+}

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java

@@ -21,8 +21,10 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util;
 import org.w3c.dom.Document;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.exception.DeviceTypeConfigurationException;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 
 /**
@@ -34,8 +36,12 @@ public class DeviceTypeConfigUtil {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         try {
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             DocumentBuilder docBuilder = factory.newDocumentBuilder();
             return docBuilder.parse(file);
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+            return null;
         } catch (Exception e) {
             throw new DeviceTypeConfigurationException("Error occurred while parsing file, while converting " +
                     "to a org.w3c.dom.Document", e);

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java

@@ -25,4 +25,11 @@ public class DeviceTypePluginConstants {
     public static final String MEDIA_TYPE_XML = "application/xml";
     public static final String CHARSET_UTF8 = "UTF8";
     public static final String LANGUAGE_CODE_ENGLISH_US = "en_US";
+
+    public static final String CDMF_UI_TYPE = "devicetype/ui";
+    public static final String CDMF_UI_TYPE_DIR = "devicetypes-ui";
+
+    public static final String CDMF_PLUGIN_TYPE = "devicetype/plugin";
+    public static final String CDMF_PLUGIN_TYPE_DIR = "devicetypes";
+    public static final String CDMF_PLUGIN_TYPE_EXTENSION = "xml";
 }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml

@@ -17,7 +17,11 @@
         <deployer>
             <directory>devicetypes</directory>
             <extension>xml</extension>
-            <class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeDeployer</class>
+            <class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer</class>
         </deployer>
+		<!--<deployer>-->
+			<!--<directory>devicetypes-ui</directory>-->
+			<!--<class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeUIDeployer</class>-->
+		<!--</deployer>-->
     </deployers>
 </component>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/sample.xml

@@ -81,12 +81,33 @@
         </ConfigProperties>
     </PushNotificationProvider>
 
+	<PolicyMonitoring enabled="true"/>
+
     <License>
         <Language>en_US</Language>
         <Version>1.0.0</Version>
         <Text>This is license text</Text>
     </License>
 
+	<TaskConfiguration>
+		<Enable>true</Enable>
+		<Frequency>600000</Frequency>
+		<Operations>
+			<Operation>
+				<Name>DEVICE_INFO</Name>
+				<RecurrentTimes>1</RecurrentTimes>
+			</Operation>
+			<Operation>
+				<Name>APPLICATION_LIST</Name>
+				<RecurrentTimes>5</RecurrentTimes>
+			</Operation>
+			<Operation>
+				<Name>DEVICE_LOCATION</Name>
+				<RecurrentTimes>1</RecurrentTimes>
+			</Operation>
+		</Operations>
+	</TaskConfiguration>
+
     <DataSource>
         <jndiConfig>
             <name>jdbc/SampleDM_DB</name>
@@ -101,22 +122,5 @@
             </Table>
         </tableConfig>
     </DataSource>
-    <TaskConfiguration>
+
-        <Enable>true</Enable>
-        <Frequency>600000</Frequency>
-        <Operations>
-            <Operation>
-                <Name>DEVICE_INFO</Name>
-                <RecurrentTimes>1</RecurrentTimes>
-            </Operation>
-            <Operation>
-                <Name>APPLICATION_LIST</Name>
-                <RecurrentTimes>5</RecurrentTimes>
-            </Operation>
-            <Operation>
-                <Name>DEVICE_LOCATION</Name>
-                <RecurrentTimes>1</RecurrentTimes>
-            </Operation>
-        </Operations>
-    </TaskConfiguration>
 </DeviceTypeConfiguration>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java

@@ -85,7 +85,7 @@ public class MQTTNotificationStrategy implements NotificationStrategy {
         } else {
             String topic = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(true) + "/"
                     + ctx.getDeviceId().getType() + "/" + ctx.getDeviceId().getId() + "/" + operation.getType()
-                    + "/" + operation.getCode();
+                    .toString().toLowerCase() + "/" + operation.getCode();
             dynamicProperties.put("topic", topic);
             if (operation.getPayLoad() == null) {
                 operation.setPayLoad("");

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

@@ -143,7 +143,8 @@
                             org.wso2.carbon.event.output.adapter.core,
                             org.wso2.carbon.event.output.adapter.core.exception,
                             org.osgi.framework,
-                            org.wso2.carbon.core
+                            org.wso2.carbon.core,
+							org.wso2.carbon.device.mgt.common.*
                         </Import-Package>
                     </instructions>
                 </configuration>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java

@@ -39,8 +39,13 @@ public class XMPPNotificationStrategy implements NotificationStrategy {
     private static final String XMPP_CLIENT_JID = "xmpp.client.jid";
     private static final String XMPP_CLIENT_SUBJECT = "xmpp.client.subject";
     public static final String XMPP_CLIENT_MESSAGE_TYPE = "xmpp.client.messageType";
+    private static final String DYNAMIC_PROPERTY_JID = "jid";
+    private static final String DYNAMIC_PROPERTY_SUBJECT = "subject";
+    private static final String DYNAMIC_PROPERTY_MSGTYPE = "messageType";
     private String xmppAdapterName;
     private static final Log log = LogFactory.getLog(XMPPNotificationStrategy.class);
+    private String subDomain;
+
 
     public XMPPNotificationStrategy(PushNotificationConfig config) {
 
@@ -61,6 +66,7 @@ public class XMPPNotificationStrategy implements NotificationStrategy {
         xmppAdapterProperties.put(XMPPAdapterConstants.XMPP_ADAPTER_PROPERTY_JID, config.getProperty(
                 XMPPAdapterConstants.XMPP_ADAPTER_PROPERTY_JID));
         outputEventAdapterConfiguration.setStaticProperties(xmppAdapterProperties);
+        subDomain = config.getProperty(XMPPAdapterConstants.XMPP_ADAPTER_PROPERTY_SUBDOMAIN);
         try {
             XMPPDataHolder.getInstance().getOutputEventAdapterService().create(outputEventAdapterConfiguration);
         } catch (OutputEventAdapterException e) {
@@ -77,9 +83,15 @@ public class XMPPNotificationStrategy implements NotificationStrategy {
     public void execute(NotificationContext ctx) throws PushNotificationExecutionFailedException {
         Map<String, String> dynamicProperties = new HashMap<>();
         Properties properties = ctx.getOperation().getProperties();
-        dynamicProperties.put("jid", properties.getProperty(XMPP_CLIENT_JID));
+        if (properties != null & properties.size() > 0) {
-        dynamicProperties.put("subject", properties.getProperty(XMPP_CLIENT_SUBJECT));
+            dynamicProperties.put(DYNAMIC_PROPERTY_JID, properties.getProperty(XMPP_CLIENT_JID));
-        dynamicProperties.put("messageType", properties.getProperty(XMPP_CLIENT_MESSAGE_TYPE));
+            dynamicProperties.put(DYNAMIC_PROPERTY_SUBJECT, properties.getProperty(XMPP_CLIENT_SUBJECT));
+            dynamicProperties.put(DYNAMIC_PROPERTY_MSGTYPE, properties.getProperty(XMPP_CLIENT_MESSAGE_TYPE));
+        } else {
+            dynamicProperties.put(DYNAMIC_PROPERTY_JID, ctx.getDeviceId().getId() + subDomain);
+            dynamicProperties.put(DYNAMIC_PROPERTY_SUBJECT, ctx.getOperation().getType().toString());
+            dynamicProperties.put(DYNAMIC_PROPERTY_MSGTYPE, XMPPAdapterConstants.CHAT_PROPERTY_KEY);
+        }
         XMPPDataHolder.getInstance().getOutputEventAdapterService().publish(xmppAdapterName, dynamicProperties,
                                                                             ctx.getOperation().getPayLoad());
     }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java

@@ -30,6 +30,7 @@ public final class XMPPAdapterConstants {
     public static final String SUBJECT_PROPERTY_KEY = "subject";
     public static final String MESSAGE_TYPE_PROPERTY_KEY = "messageType";
     public static final String CHAT_PROPERTY_KEY = "chat";
+    public static final String XMPP_ADAPTER_PROPERTY_SUBDOMAIN = "subDomain";
     public static final String XMPP_ADAPTER_PROPERTY_HOST = "host";
     public static final String XMPP_ADAPTER_PROPERTY_PORT = "port";
     public static final String XMPP_ADAPTER_PROPERTY_USERNAME = "username";

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceCompliance.java

@@ -19,20 +19,20 @@
 package org.wso2.carbon.device.mgt.jaxrs.beans;
 
 import io.swagger.annotations.ApiModel;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 
 @ApiModel(value = "DeviceCompliance", description = "Device's policy compliance status")
 public class DeviceCompliance {
 
     private String deviceID;
-    private ComplianceData complianceData;
+    private NonComplianceData complianceData;
     private Long code;
 
-    public ComplianceData getComplianceData() {
+    public NonComplianceData getComplianceData() {
         return complianceData;
     }
 
-    public void setComplianceData(ComplianceData complianceData) {
+    public void setComplianceData(NonComplianceData complianceData) {
         this.complianceData = complianceData;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.jaxrs.beans;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyWrapper.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.jaxrs.beans;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.policy.mgt.common.DeviceGroupWrapper;
+import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
 
 import javax.validation.constraints.Size;
 import java.util.List;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/common/GsonMessageBodyHandler.java

@@ -83,11 +83,7 @@ public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, Messag
 
         OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
         try {
-            Type jsonType = null;
+            getGson().toJson(object, type, writer);
-            if (type.equals(type)) {
-                jsonType = type;
-            }
-            getGson().toJson(object, jsonType, writer);
         } finally {
             writer.close();
         }

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

@@ -38,8 +38,8 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.search.SearchContext;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
@@ -850,7 +850,7 @@ public interface DeviceManagementService {
                     @ApiResponse(
                             code = 200,
                             message = "OK",
-                            response = ComplianceData.class),
+                            response = NonComplianceData.class),
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error.",

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

@@ -35,7 +35,7 @@ import org.wso2.carbon.apimgt.annotations.api.Permission;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PolicyWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PriorityUpdatedPolicyWrapper;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;

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

@@ -40,10 +40,10 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.OperationList;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyComplianceException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
@@ -442,7 +442,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         RequestValidationUtil.validateDeviceIdentifier(type, id);
         PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
         Policy policy;
-        ComplianceData complianceData = null;
+        NonComplianceData complianceData = null;
         DeviceCompliance deviceCompliance = new DeviceCompliance();
 
         try {

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

@@ -36,7 +36,7 @@ import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.FilteringUtil;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtUtil;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
@@ -168,7 +168,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
     @Override
     public Response getPolicy(@PathParam("id") int id, @HeaderParam("If-Modified-Since") String ifModifiedSince) {
         PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
-        final org.wso2.carbon.policy.mgt.common.Policy policy;
+        final Policy policy;
         try {
             PolicyAdministratorPoint policyAdministratorPoint = policyManagementService.getPAP();
             policy = policyAdministratorPoint.getPolicy(id);
@@ -378,7 +378,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
     @Override
     public Response getEffectivePolicy(@PathParam("deviceId") String deviceId, @PathParam("deviceType") String deviceType) {
         PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
-        final org.wso2.carbon.policy.mgt.common.Policy policy;
+        final Policy policy;
         try {
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
             deviceIdentifier.setId(deviceId);

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtUtil.java

@@ -23,7 +23,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorListItem;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ProfileFeature;
 import org.wso2.carbon.device.mgt.jaxrs.exception.BadRequestException;
-import org.wso2.carbon.policy.mgt.common.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 
 import javax.validation.ConstraintViolation;
 import java.util.ArrayList;
@@ -38,9 +38,8 @@ public class DeviceMgtUtil {
         profile.setCreatedDate(mdmProfile.getCreatedDate());
         profile.setDeviceType(mdmProfile.getDeviceType());
 
-        List<org.wso2.carbon.policy.mgt.common.ProfileFeature> profileFeatures =
+        List<org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature> profileFeatures =
-                new ArrayList<org.wso2.carbon.policy.
+                new ArrayList<org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature>(mdmProfile.getProfileFeaturesList().size());
-                        mgt.common.ProfileFeature>(mdmProfile.getProfileFeaturesList().size());
         for (ProfileFeature mdmProfileFeature : mdmProfile.getProfileFeaturesList()) {
             profileFeatures.add(convertProfileFeature(mdmProfileFeature));
         }
@@ -51,11 +50,11 @@ public class DeviceMgtUtil {
         return profile;
     }
 
-    public static org.wso2.carbon.policy.mgt.common.ProfileFeature convertProfileFeature(ProfileFeature
+    public static org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature convertProfileFeature(ProfileFeature
                                                                                                  mdmProfileFeature) {
 
-        org.wso2.carbon.policy.mgt.common.ProfileFeature profileFeature =
+        org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature profileFeature =
-                new org.wso2.carbon.policy.mgt.common.ProfileFeature();
+                new org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature();
         profileFeature.setProfileId(mdmProfileFeature.getProfileId());
         profileFeature.setContent(mdmProfileFeature.getPayLoad());
         profileFeature.setDeviceType(mdmProfileFeature.getDeviceTypeId());

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

@@ -370,7 +370,7 @@ public class DeviceInfo implements Serializable {
     }
 
     public Date getUpdatedTime() {
-        if(updatedTime.equals(null)){
+        if(updatedTime == null){
             updatedTime = new Date();
         }
         return updatedTime;

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

@@ -137,7 +137,7 @@ public class DeviceLocation implements Serializable {
     }
 
     public Date getUpdatedTime() {
-        if(updatedTime.equals(null)){
+        if(updatedTime == null ){
             updatedTime = new Date();
         }
         return updatedTime;

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

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package org.wso2.carbon.device.mgt.common.policy.mgt;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.policy.mgt.common;
+package org.wso2.carbon.device.mgt.common.policy.mgt;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common;
+package org.wso2.carbon.device.mgt.common.policy.mgt;
 
 import java.util.Map;
 import java.util.Properties;

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

@@ -17,23 +17,15 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common.spi;
+package org.wso2.carbon.device.mgt.common.policy.mgt;
 
-import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyComplianceException;
-import org.wso2.carbon.policy.mgt.common.Policy;
 
-import java.util.List;
 
-public interface  PolicyMonitoringService {
+public interface PolicyMonitoringManager {
 
-    void notifyDevices(List<Device> devices) throws PolicyComplianceException;
+    NonComplianceData checkPolicyCompliance(DeviceIdentifier deviceIdentifier, Policy policy, Object response)
-
-    ComplianceData checkPolicyCompliance(DeviceIdentifier deviceIdentifier, Policy policy, Object response)
             throws PolicyComplianceException;
-
-    String getType();
 }

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

@@ -16,11 +16,10 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.common;
+package org.wso2.carbon.device.mgt.common.policy.mgt;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

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

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.policy.mgt.common;
+package org.wso2.carbon.device.mgt.common.policy.mgt;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/monitor/ComplianceFeature.java

@@ -17,9 +17,9 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common.monitor;
+package org.wso2.carbon.device.mgt.common.policy.mgt.monitor;
 
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 public class ComplianceFeature {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/monitor/NonComplianceData.java

@@ -17,14 +17,14 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common.monitor;
+package org.wso2.carbon.device.mgt.common.policy.mgt.monitor;
 
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.sql.Timestamp;
 import java.util.List;
 
-public class ComplianceData {
+public class NonComplianceData {
 
     private int id;
     private int deviceId;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/monitor/PolicyComplianceException.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.policy.mgt.common.monitor;
+package org.wso2.carbon.device.mgt.common.policy.mgt.monitor;
 
 public class PolicyComplianceException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/NotificationContext.java

@@ -48,6 +48,10 @@ public class NotificationContext {
         return properties;
     }
 
+    public void setProperties(Map<String, String> propertiesMap) {
+        properties = propertiesMap;
+    }
+
     public Operation getOperation() {
         return operation;
     }

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

@@ -23,6 +23,7 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 
 /**
@@ -45,4 +46,6 @@ public interface DeviceManagementService {
 
     PushNotificationConfig getPushNotificationConfig();
 
+    PolicyMonitoringManager getPolicyMonitoringManager();
+
 }

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

@@ -31,6 +31,7 @@ import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -304,4 +305,6 @@ public interface DeviceManagementProviderService {
 
     boolean isDeviceMonitoringEnabled(String deviceType);
 
+    PolicyMonitoringManager getPolicyMonitoringManager(String deviceType);
+
 }

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

@@ -49,6 +49,7 @@ import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.core.DeviceManagementPluginRepository;
@@ -1255,6 +1256,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         return operationMonitoringTaskConfig.isEnabled();
     }
 
+    @Override
+    public PolicyMonitoringManager getPolicyMonitoringManager(String deviceType) {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        DeviceManagementService dms = pluginRepository.getDeviceManagementService(deviceType, tenantId);
+        return dms.getPolicyMonitoringManager();
+    }
+
     @Override
     public List<Device> getDevicesOfUser(String username) throws DeviceManagementException {
         List<Device> devices = new ArrayList<>();

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java

@@ -22,6 +22,7 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
@@ -69,4 +70,9 @@ public class TestDeviceManagementService implements DeviceManagementService {
         return null;
     }
 
+    @Override
+    public PolicyMonitoringManager getPolicyMonitoringManager() {
+        return null;
+    }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag

@@ -121,9 +121,9 @@ if (uriMatcher.match("/{context}/api/user/authenticate")) {
         } else {
             userRoles = String(addUserFormData.userRoles).split(",");
         }
-        if (username.length < devicemgtProps.usernameLength) {
+        if (username.length < devicemgtProps.userValidationConfig.usernameLength) {
-            log.error("Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long");
+            log.error("Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long");
-            result = "Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long";
+            result = "Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long";
         } else {
             try {
                 result = userModule.addUser(username, firstname, lastname, emailAddress, userRoles);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -1,7 +1,5 @@
 {
     "appContext": "/devicemgt/",
-    "webAgentContext" : "/emm-web-agent/",
-    "apiContext": "api",
     "httpsURL" : "%https.ip%",
     "httpURL" : "%http.ip%",
     "httpsWebURL" : "%https.ip%",
@@ -15,7 +13,7 @@
     "iOSConfigRoot" : "%https.ip%/ios-enrollment/",
     "iOSAPIRoot" : "%https.ip%/ios/",
     "adminService": "%https.ip%",
-    "apimgt-gateway": false,
+    "gatewayEnabled": false,
     "oauthProvider": {
         "appRegistration": {
             "appType": "webapp",
@@ -32,19 +30,8 @@
     "adminUser":"admin@carbon.super",
     "adminUserTenantId":"-1234",
     "adminRole":"admin",
-    "usernameLength":30,
-    "pageSize":10,
-    "ssoConfiguration" : {
-        "enabled" : false,
-        "issuer" : "devicemgt",
-        "appName" : "devicemgt",
-        "identityProviderURL" : "%https.ip%/sso/samlsso.jag",
-        "responseSigningEnabled" : "true",
-        "keyStorePassword" : "wso2carbon",
-        "identityAlias" : "wso2carbon",
-        "keyStoreName" : "/repository/resources/security/wso2carbon.jks"
-    },
     "userValidationConfig" : {
+        "usernameLength":30,
         "usernameJSRegEx" : "^[\\S]{3,30}$",
         "usernameRegExViolationErrorMsg" : "Provided username is invalid.",
         "usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.",

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

@@ -105,4 +105,33 @@ var groupModule = {};
         );
     };
 
+    groupModule.getGroup = function (groupId) {
+        return serviceInvokers.XMLHttp.get(
+                deviceServiceEndpoint + "/groups/id/" + groupId, function (responsePayload) {
+                    return JSON.parse(responsePayload.responseText);
+                },
+                function (responsePayload) {
+                    log.error(responsePayload);
+                    return -1;
+                }
+        );
+    };
+    
+    groupModule.getRolesOfGroup = function (groupId) {
+        return serviceInvokers.XMLHttp.get(
+                deviceServiceEndpoint + "/groups/id/" + groupId + "/roles", function (responsePayload) {
+                    var data = JSON.parse(responsePayload.responseText);
+                    if(data) {
+                        return data.roles;
+                    } else {
+                        return [];
+                    }
+                },
+                function (responsePayload) {
+                    log.error(responsePayload);
+                    return -1;
+                }
+        );
+    };
+
 }(groupModule));

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js

@@ -138,7 +138,7 @@ var handlers = function () {
                 "client credentials to session context. No username of logged in user is found as " +
                     "input - setUpEncodedTenantBasedClientAppCredentials(x)");
         } else {
-            if (devicemgtProps["apimgt-gateway"]) {
+            if (devicemgtProps["gatewayEnabled"]) {
 				var tenantBasedClientAppCredentials = tokenUtil.getTenantBasedClientAppCredentials(username);
 				if (!tenantBasedClientAppCredentials) {
 					throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant " +
@@ -176,7 +176,7 @@ var handlers = function () {
                 "client credentials to session context. No username of logged in user is found as " +
                 "input - setUpEncodedTenantBasedWebSocketClientAppCredentials(x)");
         } else {
-            if (devicemgtProps["apimgt-gateway"]) {
+            if (devicemgtProps["gatewayEnabled"]) {
                 var tenantBasedWebSocketClientAppCredentials
                     = tokenUtil.getTenantBasedWebSocketClientAppCredentials(username);
                 if (!tenantBasedWebSocketClientAppCredentials) {

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

@@ -33,7 +33,7 @@ function onRequest(context) {
         viewModel["roles"] = response["content"];
     }
 
-    viewModel["charLimit"] = mdmProps["usernameLength"];
+    viewModel["charLimit"] = mdmProps["userValidationConfig"]["usernameLength"];
     viewModel["usernameJSRegEx"] = mdmProps["userValidationConfig"]["usernameJSRegEx"];
     viewModel["usernameHelpText"] = mdmProps["userValidationConfig"]["usernameHelpMsg"];
     viewModel["usernameRegExViolationErrorMsg"] = mdmProps["userValidationConfig"]["usernameRegExViolationErrorMsg"];

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

@@ -171,7 +171,7 @@
                                 </a>
                             {{/if}}
                                 <!--suppress HtmlUnknownTarget -->
-                                <a href="{{@app.context}}/roles/add-role">
+                                <a href="{{@app.context}}/role/add">
                                     <span class="fw-stack">
                                         <i class="fw fw-ring fw-stack-2x"></i>
                                         <i class="fw fw-add fw-stack-1x"></i>

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

@@ -26,7 +26,7 @@
             <i class="icon fw fw-home"></i>
         </a>
     </li>
-    {{#if groupName}}
+    {{#if group}}
         <li>
             <a href="{{@app.context}}/groups">
                 Groups
@@ -34,7 +34,7 @@
         </li>
         <li>
             <a href="#">
-                {{groupName}}
+                {{group.name}}
             </a>
         </li>
     {{else}}
@@ -47,7 +47,7 @@
 {{/zone}}
 
 {{#zone "navbarActions"}}
-    {{#if groupName}}
+    {{#if group}}
         <li>
             <a href="{{@app.context}}/devices" class="cu-btn">
             <span class="icon fw-stack">
@@ -57,6 +57,15 @@
                 Assign from My Devices
             </a>
         </li>
+        <li>
+            <a href="{{@app.context}}/group/{{group.id}}/analytics" class="cu-btn">
+            <span class="icon fw-stack">
+                <i class="fw fw-statistics fw-stack-1x"></i>
+                <i class="fw fw-ring fw-stack-2x"></i>
+            </span>
+                View Analytics
+            </a>
+        </li>
     {{else}}
         {{#if permissions.enroll}}
             <li>
@@ -73,6 +82,55 @@
 {{/zone}}
 
 {{#zone "content"}}
+    {{#if group}}
+        <h1 class="page-sub-title">
+            {{group.name}} group
+        </h1>
+        <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
+            <div class="media">
+                <div id="device_overview">
+                    <div class="media-left col-lg-1">
+                        <div class="icon">
+                            <img src="/devicemgt/public/cdmf.page.groups/images/group-icon.png" style="background-color: #11375b; height: 152px;">
+                        </div>
+                    </div>
+                    <div class="media-body asset-desc add-padding-left-5x">
+                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                            Overview
+                        </div>
+                        <table class="table table-responsive table-striped" id="members" style="margin-bottom: 0px;">
+                            <tbody>
+                            <tr role="row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
+                                <td id="group_owner" style="padding:10px 15px;">{{group.owner}}</td>
+                            </tr>
+                            <tr role="row" class="odd">
+                                <td class="sorting_1" style="padding:10px 15px; width: 15%;">Shared with roles</td>
+                                <td style="padding:10px 15px;">
+                                    {{#each roles}}
+                                        {{this}}<br/>
+                                    {{/each}}
+                                </td>
+                            </tr>
+                            <tr role="row" class="even">
+                                <td class="sorting_1" style="padding:10px 15px;width: 15%;">Device Count</td>
+                                <td style="padding:10px 15px;">{{deviceCount}}</td>
+                            </tr>
+                            <tr role="row" class="odd">
+                                <td class="sorting_1" style="padding:10px 15px;width: 15%;">Description</td>
+                                <td style="padding:10px 15px;">{{group.description}}</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <br/>
+        <h1 class="page-sub-title add-margin-top-5x">
+            Devices in {{group.name}} group
+        </h1>
+    {{/if}}
     <div class="wr-device-list row">
         <div class="wr-hidden-operations wr-advance-operations"></div>
         <div class="col-md-12 wr-page-content">
@@ -82,7 +140,6 @@
                 {{#if deviceCount}}
                     <div id="loading-content" class="col-centered">
                         <i class="fw fw-settings fw-spin fw-2x"></i>
-
                         Loading devices . . .
                         <br>
                     </div>
@@ -118,19 +175,42 @@
                                 <th data-for="By Ownership" class="select-filter"></th>
                                 <th class="no-sort"></th>
                             </tr>
-                            <!--TODO: Enable bulk action row after gain compatibility with iot operation bar-->
+                            <tr class="bulk-action-row">
-                            <!--<tr class="bulk-action-row">-->
+                                <th colspan="7">
-                            <!--<th colspan="7">-->
+                                    <ul class="tiles">
-                            <!--<div id="operation-bar" class="hidden">-->
+                                        {{#unless group}}
-                            <!--{{!unit "mdm.unit.device.operation-bar"}}-->
+                                            <li>
-                            <!--</div>-->
+                                                <a href="#" style="width: 100px;height: 80px;;"
-                            <!--<div id="operation-guide" class="bs-callout bs-callout-info">-->
+                                                   data-click-event="remove-form"
-                            <!--<h4>Enabling Device Operations</h4>-->
+                                                   class="btn square-element add-devices-to-group-link"
-                            <!--<p>To enable device operations, select the desired platform from above-->
+                                                   data-toggle="modal" data-target="#modalDemo">
-                            <!--filter.</p>-->
+                                                    <span class="icon fw-stack">
-                            <!--</div>-->
+                                                        <i class="fw fw-ring fw-stack-2x"></i>
-                            <!--</th>-->
+                                                            <i class="fw fw-grouping fw-stack-1x"></i>
-                            <!--</tr>-->
+                                                    </span>
+                                                    Add to Group
+                                                </a>
+                                            </li>
+                                        {{/unless}}
+                                        <li>
+                                            <a href="#" style="width: 100px;height: 80px;"
+                                               data-click-event="remove-form"
+                                               class="btn square-element remove-device-link"
+                                               data-toggle="modal" data-target="#modalDemo">
+                                                <span class="icon fw-stack">
+                                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                                    <i class="fw fw-delete fw-stack-1x"></i>
+                                                </span>
+                                                {{#if group}}
+                                                    Remove from group
+                                                {{else}}
+                                                    Remove Device
+                                                {{/if}}
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </th>
+                            </tr>
                             </thead>
                             <tbody id="ast-container">
 
@@ -157,7 +237,7 @@
                             </h3>
                             <h3 class="text-muted">
                                 You don't have any device
-                                {{#if groupName}}
+                                {{#if group}}
                                     assigned to this group
                                 {{else}}
                                     enrolled
@@ -165,7 +245,7 @@
                                 at the moment.
                             </h3>
                             <h3>
-                                {{#if groupName}}
+                                {{#if group}}
                                     <!--suppress HtmlUnknownTarget -->
                                     <a href="{{@app.context}}/devices" class="btn-operations btn-default">
                                             <span class="fw-stack">
@@ -208,20 +288,19 @@
                         <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
                             <i class="icon fw fw-error"></i><span></span>
                         </div>
-                        <div>
+                        <div id="user-groups">Loading...</div>
-                            <h4>
-                                Please select group
-                                <br>
-                                <div id="user-groups">Loading...</div>
-                            </h4>
-                        </div>
                     </div>
                     <div class="modal-footer">
                         <div class="buttons">
-                            <a href="#" id="group-device-yes-link" class="btn-operations">
+                            <a href="{{@app.context}}/group/add" id="group-add-link" class="btn-operations">
-                                Assign
+                                Add device group
+                            </a>
+                            <a href="#" id="group-device-add-link" class="btn-operations">
+                                Add devices to group
+                            </a>
+                            <a href="#" id="group-device-update-link" class="btn-operations">
+                                Update assignment
                             </a>
-
                             <a href="#" id="group-device-cancel-link" class="btn-operations btn-default">
                                 Cancel
                             </a>
@@ -242,7 +321,11 @@
                 <div id="remove-device-modal-content" class="hide">
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
-                            Do you really want to remove this device from your Devices List?
+                            {{#if group}}
+                                Do you really want to remove this device(s) from '{{group.name}}' group?
+                            {{else}}
+                                Do you really want to remove this device(s) from your Devices?
+                            {{/if}}
                         </h3>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
                                 class="fw fw-cancel"></i>
@@ -267,26 +350,11 @@
                 <div id="remove-device-200-content" class="hide">
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
-                            Device was successfully removed.
+                            {{#if group}}
-                        </h3>
+                                Successfully removed from '{{group.name}}' group.
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                            {{else}}
-                                class="fw fw-cancel"></i>
+                                Successfully removed.
-                        </button>
+                            {{/if}}
-                    </div>
-                    <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-
-                    </div>
-                    <div class="modal-footer">
-                        <div class="buttons">
-                            <a href="javascript:hidePopup()" class="btn-operations">Ok</a>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="remove-device-from-group-200-content" class="hide">
-                    <div class="modal-header">
-                        <h3 class="pull-left modal-title">
-                            Device was successfully removed from group.
                         </h3>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
                                 class="fw fw-cancel"></i>
@@ -422,6 +490,24 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <div id="no-device-selected" class="hide">
+                                <div class="modal-content">
+                                    <div class="row">
+                                        <div class="col-lg-5 col-md-6 col-centered">
+                                            <h3>Please select one ore more devices in order to perform this
+                                                operation.</h3>
+                                            <br/>
+                                            <div class="buttons">
+                                                <a href="#" id="no-device-selected-link" class="btn-operations">
+                                                    Ok
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
                         </div>
                     </div>
                 </div>
@@ -435,3 +521,19 @@
             type="text/x-handlebars-template"></script>
     {{js "js/listing.js"}}
 {{/zone}}
+
+{{#zone "topCss"}}
+    <style>
+        .select2-dropdown {
+            z-index: 999999999;
+        }
+
+        .wr-input-control {
+            color: black;
+        }
+
+        .select2-selection__choice {
+            font-size: medium;
+        }
+    </style>
+{{/zone}}

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

@@ -20,15 +20,19 @@ function onRequest(context) {
     var constants = require("/app/modules/constants.js");
     var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
     var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
-
+    var groupModule = require("/app/modules/business-controllers/group.js")["groupModule"];
-    var groupName = request.getParameter("groupName");
+    
     var groupId = request.getParameter("groupId");
 
     var viewModel = {};
     var title = "Devices";
-    if (groupName) {
+    if (groupId) {
-        title = groupName + " " + title;
+        var group = groupModule.getGroup(groupId);
-        viewModel.groupName = groupName;
+        if (group) {
+            title = group.name + " " + title;
+            viewModel.roles = groupModule.getRolesOfGroup(groupId);
+            viewModel.group = group;
+        }
     }
     viewModel.title = title;
     var currentUser = session.get(constants.USER_SESSION_KEY);
@@ -42,7 +46,6 @@ function onRequest(context) {
         viewModel.currentUser = currentUser;
         var deviceCount = 0;
         if (groupId) {
-            var groupModule = require("/app/modules/business-controllers/group.js")["groupModule"];
             deviceCount = groupModule.getGroupDeviceCount(groupId);
         } else {
             deviceCount = deviceModule.getDevicesCount();

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

@@ -22,7 +22,8 @@
  * initial mode and with out select mode.
  */
 function InitiateViewOption(url) {
-    if ($(".select-enable-btn").text() == "Select") {
+    if ($(".select-enable-btn").text() == "Select" && !$(this).hasClass("btn")) {
+        url = $(this).parent().data("url");
         $(location).attr('href', url);
     }
 }
@@ -51,7 +52,7 @@ function InitiateViewOption(url) {
 var deviceCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
 var assetContainer = "#ast-container";
 
-var deviceListing, currentUser, groupName, groupId;
+var deviceListing, currentUser, groupId;
 
 /*
  * DOM ready functions.
@@ -69,8 +70,7 @@ $(document).ready(function () {
 
     deviceListing = $("#device-listing");
     currentUser = deviceListing.data("current-user");
-
+    
-    groupName = getParameterByName("groupName");
     groupId = getParameterByName("groupId");
 
     /* Adding selected class for selected devices */
@@ -85,18 +85,6 @@ $(document).ready(function () {
                                                     return $("#content-filter-types").html();
                                                 }
                                             });
-
-    $(".ast-container").on("click", ".claim-btn", function (e) {
-        e.stopPropagation();
-        var deviceId = $(this).data("deviceid");
-        var serviceURL = "/temp-controller-agent/enrollment/claim?username=" + currentUser;
-        var deviceIdentifier = {id: deviceId, type: "TemperatureController"};
-        invokerUtil.put(serviceURL, deviceIdentifier, function (message) {
-            console.log(message);
-        }, function (message) {
-            console.log(message.content);
-        });
-    });
 });
 
 /*
@@ -161,13 +149,13 @@ function toTitleCase(str) {
 
 function loadDevices(searchType, searchParam) {
     var serviceURL;
-    if (groupName && groupId && $.hasPermission("LIST_OWN_DEVICES")) {
+    if (groupId && $.hasPermission("LIST_OWN_DEVICES")) {
         serviceURL = "/api/device-mgt/v1.0/groups/id/" + groupId + "/devices";
     } else if ($.hasPermission("LIST_DEVICES")) {
         serviceURL = "/api/device-mgt/v1.0/devices";
     } else if (permissionsUtil.hasPermission("LIST_OWN_DEVICES")) {
         //Get authenticated users devices
-        serviceURL = "/api/device-mgt/v1.0/users/devices?username=" + currentUser;
+        serviceURL = "/api/device-mgt/v1.0/devices?username=" + currentUser;
     } else {
         $("#loading-content").remove();
         $('#device-table').addClass('hidden');
@@ -256,18 +244,16 @@ function loadDevices(searchType, searchParam) {
         {
             targets: 0,
             data: 'name',
-            class: 'remove-padding icon-only content-fill',
+            class: 'remove-padding icon-only content-fill viewEnabledIcon',
             render: function (data, type, row, meta) {
-                return '<a href="' + context + '/device/' + row.deviceType + '?id=' + row.deviceIdentifier
+                return '<div class="thumbnail icon"><img class="square-element text fw " src="'
-                       + '"><div class="thumbnail icon"><img class="square-element text fw " src="'
+                       + getDeviceTypeThumb(row.deviceType) + '"/></div>';
-                       + getDeviceTypeThumb(
-                                row.deviceType) + '"/></div></a>';
             }
         },
         {
             targets: 1,
             data: 'name',
-            class: '',
+            class: 'viewEnabledIcon',
             render: function (name, type, row, meta) {
                 var model = getPropertyValue(row.properties, 'DEVICE_MODEL');
                 var vendor = getPropertyValue(row.properties, 'VENDOR');
@@ -281,12 +267,12 @@ function loadDevices(searchType, searchParam) {
         {
             targets: 2,
             data: 'user',
-            class: 'remove-padding-top',
+            class: 'remove-padding-top viewEnabledIcon'
         },
         {
             targets: 3,
             data: 'status',
-            class: 'remove-padding-top',
+            class: 'remove-padding-top viewEnabledIcon',
             render: function (status, type, row, meta) {
                 var html;
                 switch (status) {
@@ -309,7 +295,7 @@ function loadDevices(searchType, searchParam) {
         {
             targets: 4,
             data: 'deviceType',
-            class: 'remove-padding-top',
+            class: 'remove-padding-top viewEnabledIcon',
             render: function (status, type, row, meta) {
                 return getDeviceTypeLabel(row.deviceType);
             }
@@ -317,7 +303,7 @@ function loadDevices(searchType, searchParam) {
         {
             targets: 5,
             data: 'ownership',
-            class: 'remove-padding-top',
+            class: 'remove-padding-top viewEnabledIcon',
             render: function (status, type, row, meta) {
                 if (getDeviceTypeCategory(row.deviceType) == 'mobile') {
                     return row.ownership;
@@ -345,7 +331,7 @@ function loadDevices(searchType, searchParam) {
                                 '<span class="hidden-xs hidden-on-grid-view">Analytics</span>';
                     }
 
-                    if ((!groupName || !groupId) && groupingEnabled(row.deviceType)) {
+                    if (!groupId && groupingEnabled(row.deviceType)) {
                         html +=
                                 '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view group-device-link" '
                                 +
@@ -358,20 +344,29 @@ function loadDevices(searchType, searchParam) {
 
                     html +=
                             '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view edit-device-link" '
-                            +
+                            + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                            'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
+                            + '" data-devicename="' + row.name + '">'
-                            + '" data-devicename="' + row.name + '">' +
+                            + '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>'
-                            '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>' +
+                            + '<i class="fw fw-edit fw-stack-1x"></i></span>'
-                            '<i class="fw fw-edit fw-stack-1x"></i></span>' +
+                            + '<span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
-                            '<span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
+                    var groupOwner = $('#group_owner').text();
-                    html +=
+                    if (groupId && groupOwner != "wso2.system.user") {
-                            '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
+                        html +=
-                            +
+                                '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
-                            'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
+                                + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
-                            + '" data-devicename="' + row.name + '">' +
+                                + '" data-devicename="' + row.name + '">'
-                            '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>' +
+                                + '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>'
-                            '<i class="fw fw-delete fw-stack-1x"></i></span>' +
+                                + '<i class="fw fw-delete fw-stack-1x"></i></span>'
-                            '<span class="hidden-xs hidden-on-grid-view">Delete</span>';
+                                + '<span class="hidden-xs hidden-on-grid-view">Remove from group</span>';
+                    } else {
+                        html +=
+                                '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-device-link" '
+                                + 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
+                                + '" data-devicename="' + row.name + '">'
+                                + '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>'
+                                + '<i class="fw fw-delete fw-stack-1x"></i></span>'
+                                + '<span class="hidden-xs hidden-on-grid-view">Delete</span>';
+                    }
                 }
                 return html;
             }
@@ -381,13 +376,14 @@ function loadDevices(searchType, searchParam) {
     var fnCreatedRow = function (row, data, dataIndex) {
         $(row).attr('data-type', 'selectable');
         $(row).attr('data-deviceid', data.deviceIdentifier);
-        $(row).attr('data-devicetype', data.type);
+        $(row).attr('data-devicetype', data.deviceType);
+        $(row).attr('data-url', context + '/device/' + data.deviceType + '?id=' + data.deviceIdentifier);
         var model = getPropertyValue(data.properties, 'DEVICE_MODEL');
         var vendor = getPropertyValue(data.properties, 'VENDOR');
         var owner = data.user;
         var status = data.status;
         var ownership = data.ownership;
-        var deviceType = data.type;
+        var deviceType = data.deviceType;
         var category = getDeviceTypeCategory(deviceType);
         $.each($('td', row), function (colIndex) {
             switch (colIndex) {
@@ -561,17 +557,13 @@ function markAlreadyAssignedGroups(deviceId, deviceType) {
         data = JSON.parse(data);
         if (xhr.status == 200) {
             if (data.length > 0) {
+                var selectedValues = [];
                 for (var i = 0; i < data.length; i++) {
-                    $('.groupCheckBoxes').each(
+                    if (data[i].owner != "wso2.system.user") {
-                            function () {
+                        selectedValues.push(data[i].id);
-                                if (data[i].id == $(this).data('groupid')) {
+                    }
-                                    $(this).attr('checked', true);
-                                }
-                            }
-                    );
                 }
-            } else {
+                $("#groups").val(selectedValues).trigger("change");
-                return;
             }
         } else {
             displayErrors(xhr);
@@ -601,7 +593,7 @@ function attachDeviceEvents() {
             $(modalPopupContent).html($('#group-device-modal-content').html());
             $('#user-groups').html(
                     '<div style="height:100px" data-state="loading" data-loading-text="Loading..." data-loading-style="icon-only" data-loading-inverse="true"></div>');
-            $("a#group-device-yes-link").hide();
+            $("a#group-device-update-link").hide();
             showPopup();
 
             var serviceURL;
@@ -613,29 +605,39 @@ function attachDeviceEvents() {
             }
 
             invokerUtil.get(serviceURL, function (data) {
+                $("a#group-device-add-link").hide();
                 var groups = JSON.parse(data);
-                var html = '<br />';
+                var html = '';
+                var hasGroups = false;
                 for (var i = 0; i < groups.deviceGroups.length; i++) {
                     if (groups.deviceGroups[i].owner != "wso2.system.user") {
-                        html += '<div class="wr-input-control"><label class="wr-input-control checkbox">' +
+                        html += '<option value="' + groups.deviceGroups[i].id + '">' + groups.deviceGroups[i].name + '</option>';
-                                '<input class="groupCheckBoxes" type="checkbox" data-groupid="' + groups.deviceGroups[i].id + '" />' +
+                        hasGroups = true;
-                                '<span class="helper" title="' + groups.deviceGroups[i].name + '">' + groups.deviceGroups[i].name +
-                                '</span></label></div>';
                     }
                 }
+                if (hasGroups) {
+                    html = '<br/><h4>Please select device group(s)</h4><br/>' +
+                           '<div class="wr-input-control">' +
+                           '<select id="groups" class="form-control select2" multiple="multiple">' +
+                           html + '</select></div>';
+                    markAlreadyAssignedGroups(deviceId, deviceType);
+                    $("a#group-device-update-link").show();
+                    $("a#group-add-link").hide();
+                } else {
+                    $("a#group-device-update-link").hide();
+                    $("a#group-add-link").show();
+                    html += '<br/><h4>You don\'t have any existing device groups. Please add new device group first.</h4>'
+                }
                 $('#user-groups').html(html);
-                markAlreadyAssignedGroups(deviceId, deviceType);
+                $("select.select2[multiple=multiple]").select2({
-                $("a#group-device-yes-link").show();
+                                                                   tags: false
-                $("a#group-device-yes-link").click(function () {
+                                                               });
+                $("a#group-device-update-link").click(function () {
                     var deviceIdentifier = {"id": deviceId, "type": deviceType};
-                    var deviceGroupIds = [];
+                    var deviceGroupIds = $("#groups").val();
-                    $('.modal .groupCheckBoxes').each(
+                    if (!deviceGroupIds) {
-                            function () {
+                        deviceGroupIds = [];
-                                if ($(this).is(':checked')) {
+                    }
-                                    deviceGroupIds.push($(this).data('groupid'));
-                                }
-                            }
-                    );
                     var deviceToGroupsAssignment = {
                         deviceIdentifier: deviceIdentifier,
                         deviceGroupIds: deviceGroupIds
@@ -675,36 +677,42 @@ function attachDeviceEvents() {
      * on Device Management page in WSO2 MDM Console.
      */
     $("a.remove-device-link").click(function () {
+        var deviceIdentifiers = [];
         var deviceId = $(this).data("deviceid");
         var deviceType = $(this).data("devicetype");
-        var serviceURL = "/api/device-mgt/v1.0/devices/type/" + deviceType + "/id/" + deviceId;
+
+        if (deviceId && deviceType) {
+            deviceIdentifiers = [{"id": deviceId, "type": deviceType}];
+        } else {
+            deviceIdentifiers = getSelectedDevices();
+        }
+
+        if (deviceIdentifiers.length == 0) {
+            $(modalPopupContent).html($('#no-device-selected').html());
+            $("a#no-device-selected-link").click(function () {
+                hidePopup();
+            });
+            showPopup();
+            return;
+        }
 
         $(modalPopupContent).html($('#remove-device-modal-content').html());
         showPopup();
 
         $("a#remove-device-yes-link").click(function () {
-            if (groupId && groupName) {
+            if (groupId) {
-                var deviceIdentifiers = [{"id": deviceId, "type": deviceType}];
+                var serviceURL = "/api/device-mgt/v1.0/groups/id/" + groupId + "/devices/remove";
-                serviceURL = "/api/device-mgt/v1.0/groups/id/" + groupId + "/devices/remove";
                 invokerUtil.post(serviceURL, deviceIdentifiers, function (message) {
-                    $(modalPopupContent).html($('#remove-device-from-group-200-content').html());
-                    setTimeout(function () {
-                        hidePopup();
-                        location.reload(false);
-                    }, 2000);
-                }, function (message) {
-                    displayDeviceErrors(message);
-                });
-            } else {
-                invokerUtil.delete(serviceURL, function (message) {
                     $(modalPopupContent).html($('#remove-device-200-content').html());
                     setTimeout(function () {
                         hidePopup();
                         location.reload(false);
                     }, 2000);
-                }, function (message) {
+                }, function (jqXHR) {
                     displayDeviceErrors(jqXHR);
                 });
+            } else {
+                removeDevices(deviceIdentifiers);
             }
         });
 
@@ -736,7 +744,7 @@ function attachDeviceEvents() {
                     hidePopup();
                     location.reload(false);
                 }, 2000);
-            }, function (message) {
+            }, function (jqXHR) {
                 displayDeviceErrors(jqXHR);
             });
         });
@@ -745,6 +753,106 @@ function attachDeviceEvents() {
             hidePopup();
         });
     });
+
+    /**
+     * Following click function would execute
+     * when a user clicks on "Add to Group" link
+     * on Device Management page in WSO2 devicemgt Console.
+     */
+    $("a.add-devices-to-group-link").click(function () {
+        $("a#group-device-update-link").hide();
+        var deviceIdentifiers = getSelectedDevices();
+        if (deviceIdentifiers.length == 0) {
+            $(modalPopupContent).html($('#no-device-selected').html());
+            $("a#no-device-selected-link").click(function () {
+                hidePopup();
+            });
+            showPopup();
+            return;
+        }
+
+        $(modalPopupContent).html($('#group-device-modal-content').html());
+        $('#user-groups').html(
+                '<div style="height:100px" data-state="loading" data-loading-text="Loading..." data-loading-style="icon-only" data-loading-inverse="true"></div>');
+        $("a#group-device-add-link").hide();
+        showPopup();
+
+        var serviceURL;
+        if ($.hasPermission("LIST_ALL_GROUPS")) {
+            serviceURL = "/api/device-mgt/v1.0/admin/groups?limit=100";
+        } else if ($.hasPermission("LIST_GROUPS")) {
+            //Get authenticated users groups
+            serviceURL = "/api/device-mgt/v1.0/groups?limit=100";
+        }
+
+        invokerUtil.get(serviceURL, function (data) {
+            var groups = JSON.parse(data);
+            var html = '';
+            var hasGroups = false;
+            for (var i = 0; i < groups.deviceGroups.length; i++) {
+                if (groups.deviceGroups[i].owner != "wso2.system.user") {
+                    html += '<option value="' + groups.deviceGroups[i].id + '">' +
+                            groups.deviceGroups[i].name + '</option>';
+                    hasGroups = true;
+                }
+            }
+            if (hasGroups) {
+                html = '<br /><select id="assign-group-selector" style="color:#3f3f3f;padding:5px;width:250px;">' +
+                       html + '</select>';
+                $("a#group-add-link").hide();
+                $("a#group-device-add-link").show();
+            } else {
+                html += '<br/><h4>You don\'t have any existing device groups. Please add new device group first.</h4>';
+                $("a#group-add-link").show();
+                $("a#group-device-add-link").hide();
+            }
+            $('#user-groups').html(html);
+            $("a#group-device-add-link").click(function () {
+                var selectedGroup = $('#assign-group-selector').val();
+                serviceURL = "/api/device-mgt/v1.0/groups/id/" + selectedGroup + "/devices/add";
+                invokerUtil.post(serviceURL, deviceIdentifiers, function (data) {
+                    $(modalPopupContent).html($('#group-associate-device-200-content').html());
+                    setTimeout(function () {
+                        hidePopup();
+                        location.reload(false);
+                    }, 2000);
+                }, function (jqXHR) {
+                    displayDeviceErrors(jqXHR);
+                });
+            });
+        }, function (jqXHR) {
+            if (jqXHR.status == 404) {
+                $(modalPopupContent).html($('#group-404-content').html());
+                $("a#cancel-link").click(function () {
+                    hidePopup();
+                });
+            } else {
+                displayDeviceErrors(jqXHR);
+            }
+        });
+
+        $("a#group-device-cancel-link").click(function () {
+            hidePopup();
+        });
+    });
+}
+
+function removeDevices(deviceIdentifiers) {
+    var serviceURL = "/api/device-mgt/v1.0/devices/type/" + deviceIdentifiers[0].type + "/id/" + deviceIdentifiers[0].id;
+    invokerUtil.delete(serviceURL, function (message) {
+        if (deviceIdentifiers.length > 1) {
+            deviceIdentifiers.slice(1, deviceIdentifiers.length);
+            removeDevices(deviceIdentifiers);
+        } else {
+            $(modalPopupContent).html($('#remove-device-200-content').html());
+            setTimeout(function () {
+                hidePopup();
+                location.reload(false);
+            }, 2000);
+        }
+    }, function (jqXHR) {
+        displayDeviceErrors(jqXHR);
+    });
 }
 
 function displayDeviceErrors(jqXHR) {
@@ -779,3 +887,23 @@ function getParameterByName(name) {
             results = regex.exec(location.search);
     return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
 }
+
+/*
+ * Function to get selected devices.
+ */
+function getSelectedDevices() {
+    var deviceList = [];
+    var thisTable = $(".DTTT_selected").closest('.dataTables_wrapper').find('.dataTable').dataTable();
+    thisTable.api().rows().every(function () {
+        if ($(this.node()).hasClass('DTTT_selected')) {
+            deviceList.push(
+                    {
+                        "id": $(thisTable.api().row(this).node()).data('deviceid'),
+                        "type": $(thisTable.api().row(this).node()).data('devicetype')
+                    }
+            );
+        }
+    });
+
+    return deviceList;
+}

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

@@ -37,7 +37,7 @@
         </a>
     </li>
     <li>
-        <a href="{{@app.context}}/devices?groupOwner={{groupOwner}}&groupName={{groupName}}">
+        <a href="{{@app.context}}/devices?groupId={{groupId}}&groupName={{groupName}}">
             {{groupName}}
         </a>
     </li>

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

@@ -19,8 +19,8 @@
 function onRequest(context) {
     var utility = require("/app/modules/utility.js").utility;
     var groupModule = require("/app/modules/business-controllers/group.js")["groupModule"];
-    var groupName = context.uriParams.name;
     var groupId = context.uriParams.id;
+    var group = groupModule.getGroup(groupId);
     var devices = [];
     var deviceResponse = groupModule.getGroupDevices(groupId).responseText;
 
@@ -29,8 +29,9 @@ function onRequest(context) {
         devices = deviceResponseObj.devices;
     }
     var page = {
-        "groupName": groupName,
+        "groupId": groupId,
-        "title": groupName + " Analytics"
+        "groupName": group.name,
+        "title": group.name + " Analytics"
     };
     if (devices) {
         var deviceTypes = [];

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

@@ -1,5 +1,5 @@
 {
   "version": "1.0.0",
-  "uri": "/group/{name}/{id}/analytics",
+  "uri": "/group/{id}/analytics",
   "layout": "cdmf.layout.default"
 }

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

@@ -16,18 +16,42 @@
  * under the License.
  */
 
+/**
+ * Following function would execute
+ * when a user clicks on the list item
+ * initial mode and with out select mode.
+ */
+function InitiateViewOption(url) {
+    if ($(".select-enable-btn").text() == "Select") {
+        url = $(this).parent().data("url");
+        $(location).attr('href', url);
+    }
+}
+
+(function () {
+    var cache = {};
+    var validateAndReturn = function (value) {
+        return (value == undefined || value == null) ? "Unspecified" : value;
+    };
+    Handlebars.registerHelper("deviceMap", function (device) {
+        device.owner = validateAndReturn(device.owner);
+        device.ownership = validateAndReturn(device.ownership);
+        var arr = device.properties;
+        if (arr) {
+            device.properties = arr.reduce(function (total, current) {
+                total[current.name] = validateAndReturn(current.value);
+                return total;
+            }, {});
+        }
+    });
+})();
+
 /*
  * Setting-up global variables.
  */
 var groupCheckbox = "#ast-container .ctrl-wr-asset .itm-select input[type='checkbox']";
 var assetContainer = "#ast-container";
 
-function InitiateViewOption() {
-    if ($(".select-enable-btn").text() == "Select") {
-        $(location).attr('href', $(this).data("url"));
-    }
-}
-
 /*
  * On Select All Groups button click function.
  *
@@ -118,34 +142,36 @@ function loadGroups() {
         });
         var json = {
             "recordsTotal": data.count,
+            "recordsFiltered": data.count,
             "data": objects
-        }
+        };
-
         return JSON.stringify(json);
     };
 
-    var columns = [{
+    var columns = [
-        targets: 0,
+        {
-        data: 'id',
+            targets: 0,
-        class: 'remove-padding icon-only content-fill',
+            data: 'id',
-        render: function (data, type, row, meta) {
+            class: 'remove-padding icon-only content-fill viewEnabledIcon',
-            return '<div class="thumbnail icon"><img class="square-element text fw " src="public/cdmf.page.groups/images/group-icon.png"/></div>';
+            render: function (data, type, row, meta) {
-        }
+                return '<div class="thumbnail icon"><img class="square-element text fw " ' +
-    },
+                       'src="public/cdmf.page.groups/images/group-icon.png"/></div>';
+            }
+        },
         {
             targets: 1,
             data: 'name',
-            class: ''
+            class: 'viewEnabledIcon'
         },
         {
             targets: 2,
             data: 'owner',
-            class: 'remove-padding-top',
+            class: 'remove-padding-top viewEnabledIcon'
         },
         {
             targets: 3,
             data: 'description',
-            class: 'remove-padding-top',
+            class: 'remove-padding-top viewEnabledIcon'
         },
         {
             targets: 4,
@@ -154,13 +180,7 @@ function loadGroups() {
             render: function (id, type, row, meta) {
                 var html = '';
                 if ($.hasPermission("VIEW_GROUP_DEVICES")) {
-                    html = '<a href="devices?groupId=' + row.groupId + '&groupName=' + row.name
+                    html += '<a href="group/' + row.groupId
-                           + '" data-click-event="remove-form" class="btn padding-reduce-on-grid-view">' +
-                           '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-view fw-stack-1x"></i></span>'
-                           +
-                           '<span class="hidden-xs hidden-on-grid-view">View Devices</span></a>';
-
-                    html += '<a href="group/' + row.name + '/' + row.groupId
                             + '/analytics" data-click-event="remove-form" class="btn padding-reduce-on-grid-view">' +
                             '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>'
                             +
@@ -202,7 +222,9 @@ function loadGroups() {
 
     var fnCreatedRow = function (row, data) {
         $(row).attr('data-type', 'selectable');
-        $(row).attr('data-groupid', data.id);
+        if ($.hasPermission("VIEW_GROUP_DEVICES")) {
+            $(row).attr('data-url', 'devices?groupId=' + data.groupId + '&groupName=' + data.name);
+        }
         $.each($('td', row), function (colIndex) {
             switch (colIndex) {
                 case 1:
@@ -224,21 +246,23 @@ function loadGroups() {
         });
     };
 
-
     $('#group-grid').datatables_extended_serverside_paging(
-        null,
+            null,
-        serviceURL,
+            serviceURL,
-        dataFilter,
+            dataFilter,
-        columns,
+            columns,
-        fnCreatedRow,
+            fnCreatedRow,
-        function (oSettings) {
+            function (oSettings) {
-            $(".icon .text").res_text(0.2);
+                $(".icon .text").res_text(0.2);
-            attachEvents();
+                attachEvents();
-        },
+                var thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();
-        {
+                thisTable.removeClass("table-selectable");
-            "placeholder": "Search By Group Name",
+            },
-            "searchKey": "name"
+            {
-        });
+                "placeholder": "Search By Group Name",
+                "searchKey": "name"
+            }
+    );
     $(groupCheckbox).click(function () {
         addGroupSelectedClass(this);
     });
@@ -257,6 +281,11 @@ function openCollapsedNav() {
  * DOM ready functions.
  */
 $(document).ready(function () {
+    /* Adding selected class for selected devices */
+    $(groupCheckbox).each(function () {
+        addGroupSelectedClass(this);
+    });
+
     var permissionSet = {};
 
     //This method is used to setup permission for device listing
@@ -278,11 +307,6 @@ $(document).ready(function () {
     loadGroups();
     //$('#device-grid').datatables_extended();
 
-    /* Adding selected class for selected devices */
-    $(groupCheckbox).each(function () {
-        addGroupSelectedClass(this);
-    });
-
     /* for device list sorting drop down */
     $(".ctrl-filter-type-switcher").popover(
         {

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

@@ -40,7 +40,7 @@ function onRequest() {
     }
     var userStores = userModule.getSecondaryUserStores();
     page["userStores"] = userStores;
-    page["charLimit"] = devicemgtProps["usernameLength"];
+    page["charLimit"] = devicemgtProps["userValidationConfig"]["usernameLength"];
     page["usernameJSRegEx"] = devicemgtProps["userValidationConfig"]["usernameJSRegEx"];
     page["usernameHelpMsg"] = devicemgtProps["userValidationConfig"]["usernameHelpMsg"];
     page["usernameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["usernameRegExViolationErrorMsg"];

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

@@ -15,4 +15,5 @@
   specific language governing permissions and limitations
   under the License.
 }}
-{{#zone "productName"}}WSO2 IoT{{/zone}}
+{{#zone "productName"}}WSO2 IoT Server{{/zone}}
+{{#zone "productNameResponsive"}}WSO2 IoT Server{{/zone}}

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/src/main/java/org/wso2/carbon/policy/evaluator/FeatureFilter.java

@@ -19,8 +19,8 @@
 
 package org.wso2.carbon.policy.evaluator;
 
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/src/main/java/org/wso2/carbon/policy/evaluator/FeatureFilterImpl.java

@@ -19,8 +19,8 @@
 package org.wso2.carbon.policy.evaluator;
 
 import org.wso2.carbon.policy.evaluator.utils.Constants;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/src/main/java/org/wso2/carbon/policy/evaluator/PDPServiceImpl.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.policy.evaluator;
 
 import org.wso2.carbon.policy.evaluator.spi.PDPService;
 import org.wso2.carbon.policy.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/src/main/java/org/wso2/carbon/policy/evaluator/PolicyFilter.java

@@ -19,7 +19,7 @@
 
 package org.wso2.carbon.policy.evaluator;
 
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/src/main/java/org/wso2/carbon/policy/evaluator/PolicyFilterImpl.java

@@ -18,7 +18,7 @@
 
 package org.wso2.carbon.policy.evaluator;
 
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/src/main/java/org/wso2/carbon/policy/evaluator/spi/PDPService.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.policy.evaluator.spi;
 
 import org.wso2.carbon.policy.evaluator.FeatureRules;
 import org.wso2.carbon.policy.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/merged/MergedEvaluationPoint.java

@@ -22,6 +22,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.policy.mgt.common.*;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.policy.decision.point.internal.PolicyDecisionPointDataHolder;

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/simple/PolicyEvaluationServiceImpl.java

@@ -19,10 +19,10 @@
 package org.wso2.carbon.policy.decision.point.simple;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/simple/SimpleEvaluation.java

@@ -20,7 +20,7 @@
 package org.wso2.carbon.policy.decision.point.simple;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
 
 public interface SimpleEvaluation  {

components/policy-mgt/org.wso2.carbon.policy.decision.point/src/main/java/org/wso2/carbon/policy/decision/point/simple/SimpleEvaluationImpl.java

@@ -21,6 +21,7 @@ package org.wso2.carbon.policy.decision.point.simple;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.decision.point.internal.PolicyDecisionPointDataHolder;
 import org.wso2.carbon.policy.mgt.common.*;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;

components/policy-mgt/org.wso2.carbon.policy.information.point/src/main/java/org/wso2/carbon/policy/information/point/PolicyInformationServiceImpl.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.policy.information.point;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.policy.mgt.common.PIPDevice;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
 
 import java.util.List;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyAdministratorPoint.java

@@ -17,8 +17,9 @@
  */
 
 package org.wso2.carbon.policy.mgt.common;
-import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyEvaluationPoint.java

@@ -20,6 +20,8 @@
 package org.wso2.carbon.policy.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyFilter.java

@@ -20,6 +20,7 @@
 package org.wso2.carbon.policy.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 import java.util.Map;

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/PolicyInformationPoint.java

@@ -21,6 +21,7 @@ package org.wso2.carbon.policy.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/main/java/org/wso2/carbon/policy/mgt/common/monitor/ComplianceDecisionPoint.java

@@ -22,7 +22,9 @@ package org.wso2.carbon.policy.mgt.common.monitor;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 
@@ -38,7 +40,7 @@ public interface ComplianceDecisionPoint {
 
     void setDeviceAsReachable(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
-    void reEnforcePolicy(DeviceIdentifier deviceIdentifier, ComplianceData complianceData) throws
+    void reEnforcePolicy(DeviceIdentifier deviceIdentifier, NonComplianceData complianceData) throws
             PolicyComplianceException;
 
     void markDeviceAsNoneCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
@@ -49,7 +51,7 @@ public interface ComplianceDecisionPoint {
 
     void activateDevice(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
-    void validateDevicePolicyCompliance(DeviceIdentifier deviceIdentifier, ComplianceData complianceData) throws
+    void validateDevicePolicyCompliance(DeviceIdentifier deviceIdentifier, NonComplianceData complianceData) throws
             PolicyComplianceException;
 
 

components/policy-mgt/org.wso2.carbon.policy.mgt.common/src/test/java/org/wos2/carbon/policy/mgt/common/utils/PolicyCreator.java

@@ -20,8 +20,8 @@ package org.wos2.carbon.policy.mgt.common.utils;
 
 
 import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 
 import java.util.ArrayList;
 import java.util.List;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerService.java

@@ -21,10 +21,13 @@ package org.wso2.carbon.policy.mgt.core;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.policy.mgt.common.*;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyComplianceException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.task.TaskScheduleService;
 
 import java.util.List;
@@ -75,7 +78,7 @@ public interface PolicyManagerService {
 
     boolean checkCompliance(DeviceIdentifier deviceIdentifier, Object response) throws PolicyComplianceException;
 
-    ComplianceData getDeviceCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
+    NonComplianceData getDeviceCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
     boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerServiceImpl.java

@@ -24,10 +24,13 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.policy.mgt.common.*;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyComplianceException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.impl.PolicyAdministratorPointImpl;
 import org.wso2.carbon.policy.mgt.core.impl.PolicyInformationPointImpl;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
@@ -210,7 +213,7 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
     }
 
     @Override
-    public ComplianceData getDeviceCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
+    public NonComplianceData getDeviceCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
         return monitoringManager.getDevicePolicyCompliance(deviceIdentifier);
     }
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/cache/PolicyCacheManager.java

@@ -19,7 +19,7 @@
 
 package org.wso2.carbon.policy.mgt.core.cache;
 
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 
 import java.util.List;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/cache/impl/PolicyCacheManagerImpl.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.policy.mgt.core.cache.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.cache.PolicyCacheManager;
 import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/FeatureDAO.java

@@ -20,8 +20,8 @@
 package org.wso2.carbon.policy.mgt.core.dao;
 
 import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/MonitoringDAO.java

@@ -19,11 +19,10 @@
 
 package org.wso2.carbon.policy.mgt.core.dao;
 
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
 import org.wso2.carbon.policy.mgt.common.monitor.PolicyDeviceWrapper;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,11 +49,11 @@ public interface MonitoringDAO {
             complianceFeatures)
             throws MonitoringDAOException;
 
-    ComplianceData getCompliance(int deviceId, int enrolmentId) throws MonitoringDAOException;
+    NonComplianceData getCompliance(int deviceId, int enrolmentId) throws MonitoringDAOException;
 
-    List<ComplianceData> getCompliance(List<Integer> deviceIds) throws MonitoringDAOException;
+    List<NonComplianceData> getCompliance(List<Integer> deviceIds) throws MonitoringDAOException;
 
-    List<ComplianceData> getCompliance() throws MonitoringDAOException;
+    List<NonComplianceData> getCompliance() throws MonitoringDAOException;
 
     List<ComplianceFeature> getNoneComplianceFeatures(int policyComplianceStatusId) throws MonitoringDAOException;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/PolicyDAO.java

@@ -20,9 +20,9 @@ package org.wso2.carbon.policy.mgt.core.dao;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.policy.mgt.common.Criterion;
-import org.wso2.carbon.policy.mgt.common.DeviceGroupWrapper;
+import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyCriterion;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyCriterion;
 
 import java.util.HashMap;
 import java.util.List;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/ProfileDAO.java

@@ -19,8 +19,7 @@
 
 package org.wso2.carbon.policy.mgt.core.dao;
 
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.policy.mgt.common.Profile;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/MonitoringDAOImpl.java

@@ -22,13 +22,12 @@ package org.wso2.carbon.policy.mgt.core.dao.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
 import org.wso2.carbon.policy.mgt.common.monitor.PolicyDeviceWrapper;
 import org.wso2.carbon.policy.mgt.core.dao.MonitoringDAO;
 import org.wso2.carbon.policy.mgt.core.dao.MonitoringDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
 import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
 
@@ -237,12 +236,12 @@ public class MonitoringDAOImpl implements MonitoringDAO {
     }
 
     @Override
-    public ComplianceData getCompliance(int deviceId, int enrolmentId) throws MonitoringDAOException {
+    public NonComplianceData getCompliance(int deviceId, int enrolmentId) throws MonitoringDAOException {
 
         Connection conn;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
-        ComplianceData complianceData = new ComplianceData();
+        NonComplianceData complianceData = new NonComplianceData();
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
 
         try {
@@ -275,11 +274,11 @@ public class MonitoringDAOImpl implements MonitoringDAO {
     }
 
     @Override
-    public List<ComplianceData> getCompliance(List<Integer> deviceIds) throws MonitoringDAOException {
+    public List<NonComplianceData> getCompliance(List<Integer> deviceIds) throws MonitoringDAOException {
         Connection conn;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
-        List<ComplianceData> complianceDataList = new ArrayList<>();
+        List<NonComplianceData> complianceDataList = new ArrayList<>();
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             conn = this.getConnection();
@@ -290,7 +289,7 @@ public class MonitoringDAOImpl implements MonitoringDAO {
 
             resultSet = stmt.executeQuery();
             while (resultSet.next()) {
-                ComplianceData complianceData = new ComplianceData();
+                NonComplianceData complianceData = new NonComplianceData();
                 complianceData.setId(resultSet.getInt("ID"));
                 complianceData.setDeviceId(resultSet.getInt("DEVICE_ID"));
                 complianceData.setEnrolmentId(resultSet.getInt("ENROLMENT_ID"));
@@ -312,11 +311,11 @@ public class MonitoringDAOImpl implements MonitoringDAO {
     }
 
     @Override
-    public List<ComplianceData> getCompliance() throws MonitoringDAOException {
+    public List<NonComplianceData> getCompliance() throws MonitoringDAOException {
         Connection conn;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
-        List<ComplianceData> complianceDataList = new ArrayList<>();
+        List<NonComplianceData> complianceDataList = new ArrayList<>();
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             conn = this.getConnection();
@@ -326,7 +325,7 @@ public class MonitoringDAOImpl implements MonitoringDAO {
 
             resultSet = stmt.executeQuery();
             while (resultSet.next()) {
-                ComplianceData complianceData = new ComplianceData();
+                NonComplianceData complianceData = new NonComplianceData();
                 complianceData.setId(resultSet.getInt("ID"));
                 complianceData.setDeviceId(resultSet.getInt("DEVICE_ID"));
                 complianceData.setEnrolmentId(resultSet.getInt("ENROLMENT_ID"));

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java

@@ -23,9 +23,9 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.policy.mgt.common.Criterion;
-import org.wso2.carbon.policy.mgt.common.DeviceGroupWrapper;
+import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.PolicyCriterion;
+import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyCriterion;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyDAO;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/ProfileDAOImpl.java

@@ -21,10 +21,8 @@ package org.wso2.carbon.policy.mgt.core.dao.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.policy.mgt.common.Profile;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
-import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.ProfileDAO;
 import org.wso2.carbon.policy.mgt.core.dao.ProfileManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/feature/AbstractFeatureDAO.java

@@ -22,8 +22,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Feature;
-import org.wso2.carbon.policy.mgt.common.Profile;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.policy.mgt.core.dao.FeatureDAO;
 import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/feature/GenericFeatureDAOImpl.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.policy.mgt.core.dao.impl.feature;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
 import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/feature/SQLServerFeatureDAOImpl.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.policy.mgt.core.dao.impl.feature;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
 import org.wso2.carbon.policy.mgt.core.dao.FeatureManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
 import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/PolicyEnforcementDelegator.java

@@ -19,7 +19,7 @@
 package org.wso2.carbon.policy.mgt.core.enforcement;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 
 import java.util.List;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/PolicyEnforcementDelegatorImpl.java

@@ -25,11 +25,9 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
 import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
-import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyAdministratorPoint;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/ComplianceDecisionPointImpl.java

@@ -27,12 +27,12 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementExcept
 import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
-import org.wso2.carbon.policy.mgt.common.ProfileFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.NonComplianceData;
 import org.wso2.carbon.policy.mgt.common.monitor.ComplianceDecisionPoint;
-import org.wso2.carbon.policy.mgt.common.monitor.ComplianceFeature;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
-import org.wso2.carbon.policy.mgt.common.monitor.PolicyComplianceException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
 
@@ -120,7 +120,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
     }
 
     @Override
-    public void reEnforcePolicy(DeviceIdentifier deviceIdentifier, ComplianceData complianceData) throws
+    public void reEnforcePolicy(DeviceIdentifier deviceIdentifier, NonComplianceData complianceData) throws
             PolicyComplianceException {
 
         try {
@@ -261,7 +261,7 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
     }
 
     @Override
-    public void validateDevicePolicyCompliance(DeviceIdentifier deviceIdentifier, ComplianceData complianceData) throws
+    public void validateDevicePolicyCompliance(DeviceIdentifier deviceIdentifier, NonComplianceData complianceData) throws
             PolicyComplianceException {
 
         Policy policy = complianceData.getPolicy();

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyAdministratorPointImpl.java

@@ -22,6 +22,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.ntask.common.TaskException;
 import org.wso2.carbon.ntask.core.TaskInfo;
 import org.wso2.carbon.ntask.core.TaskManager;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyFilterImpl.java

@@ -22,8 +22,8 @@ package org.wso2.carbon.policy.mgt.core.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
-import org.wso2.carbon.policy.mgt.common.DeviceGroupWrapper;
+import org.wso2.carbon.device.mgt.common.policy.mgt.DeviceGroupWrapper;
-import org.wso2.carbon.policy.mgt.common.Policy;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyFilter;
 import org.wso2.carbon.policy.mgt.core.util.PolicyManagementConstants;
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/impl/PolicyInformationPointImpl.java

@@ -26,6 +26,7 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
+import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.common.Feature;
@@ -40,7 +41,6 @@ import org.wso2.carbon.policy.mgt.core.mgt.impl.FeatureManagerImpl;
 import org.wso2.carbon.policy.mgt.core.mgt.impl.PolicyManagerImpl;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
-import org.wso2.carbon.user.api.UserStoreManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/internal/PolicyManagementDataHolder.java

@@ -24,7 +24,6 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.ntask.core.service.TaskService;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationPoint;
 import org.wso2.carbon.policy.mgt.common.PolicyInformationPoint;
-import org.wso2.carbon.policy.mgt.common.spi.PolicyMonitoringService;
 import org.wso2.carbon.policy.mgt.core.mgt.MonitoringManager;
 import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
 import org.wso2.carbon.user.core.service.RealmService;
@@ -43,7 +42,6 @@ public class PolicyManagementDataHolder {
     private DeviceManagementProviderService deviceManagementService;
     private MonitoringManager monitoringManager;
     private PolicyManager policyManager;
-    private Map<String, PolicyMonitoringService> policyMonitoringServiceMap = new HashMap<>();
     private TaskService taskService;
 
     private static PolicyManagementDataHolder thisInstance = new PolicyManagementDataHolder();
@@ -122,18 +120,6 @@ public class PolicyManagementDataHolder {
         this.deviceManagementService = deviceManagementService;
     }
 
-    public PolicyMonitoringService getPolicyMonitoringService(String deviceType) {
-        return policyMonitoringServiceMap.get(deviceType);
-    }
-
-    public void setPolicyMonitoringService(String deviceType, PolicyMonitoringService policyMonitoringService) {
-        this.policyMonitoringServiceMap.put(deviceType, policyMonitoringService);
-    }
-
-    public void unsetPolicyMonitoringService(String deviceType) {
-        this.policyMonitoringServiceMap.remove(deviceType);
-    }
-
     public TaskService getTaskService() {
         return taskService;
     }