Merge remote-tracking branch 'upstream/master'

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

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

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

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

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

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

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

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.145-SNAPSHOT</version>
+        <version>3.0.147-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>3.0.145-SNAPSHOT</version>
+    <version>3.0.147-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Security Handler Component</name>
     <description>WSO2 Carbon - API Management Security Handler Module</description>
@@ -55,6 +55,11 @@
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -97,6 +102,15 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+                    </suiteXmlFiles>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java

@@ -72,8 +72,8 @@ public class AuthenticationHandler extends AbstractHandler {
     /**
      * Handling the message and checking the security.
      *
-     * @param messageContext
+     * @param messageContext Request message context.
-     * @return
+     * @return Boolean value of the result of the processing the request.
      */
     @Override
     public boolean handleRequest(org.apache.synapse.MessageContext messageContext) {
@@ -87,7 +87,7 @@ public class AuthenticationHandler extends AbstractHandler {
         Map<String, String> headers = (Map<String, String>) axisMC.getProperty(MessageContext.TRANSPORT_HEADERS);
         try {
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            RESTResponse response;
+            RESTResponse response = null;
             if (headers.containsKey(AuthConstants.MDM_SIGNATURE)) {
 
                 String mdmSignature = headers.get(AuthConstants.MDM_SIGNATURE);
@@ -95,7 +95,7 @@ public class AuthenticationHandler extends AbstractHandler {
                     log.debug("Verify Cert:\n" + mdmSignature);
                 }
                 String deviceType = this.getDeviceType(messageContext.getTo().getAddress().trim());
-                if (deviceType == null){
+                if (deviceType == null) {
                     return false;
                 }
                 URI certVerifyUrl = new URI(iotServerConfiguration.getVerificationEndpoint() + deviceType);
@@ -108,8 +108,7 @@ public class AuthenticationHandler extends AbstractHandler {
 
                 Gson gson = new Gson();
                 String certVerifyContent = gson.toJson(certificate);
-                response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null,
+                response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, certVerifyContent);
-                        null, certVerifyContent);
 
                 String str = response.getContent();
                 if (log.isDebugEnabled()) {
@@ -140,8 +139,7 @@ public class AuthenticationHandler extends AbstractHandler {
 
                 Gson gson = new Gson();
                 String certVerifyContent = gson.toJson(certificate);
-                response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null,
+                response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, certVerifyContent);
-                        null, certVerifyContent);
                 if (log.isDebugEnabled()) {
                     log.debug("Verify response:" + response.getContent());
                 }
@@ -155,8 +153,6 @@ public class AuthenticationHandler extends AbstractHandler {
                 if (x509 != null) {
                     headers.put(AuthConstants.PROXY_MUTUAL_AUTH_HEADER, CertificateGenerator.getCommonName(x509));
                     return true;
-                } else {
-                    response = null;
                 }
             } else if (headers.containsKey(AuthConstants.ENCODED_PEM)) {
                 String encodedPem = headers.get(AuthConstants.ENCODED_PEM);
@@ -173,8 +169,7 @@ public class AuthenticationHandler extends AbstractHandler {
                 certificate.setSerial("");
                 Gson gson = new Gson();
                 String certVerifyContent = gson.toJson(certificate);
-                response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, null,
+                response = restInvoker.invokePOST(certVerifyUrl, certVerifyHeaders, certVerifyContent);
-                        null, certVerifyContent);
                 if (log.isDebugEnabled()) {
                     log.debug("Verify response:" + response.getContent());
                 }

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/invoker/RESTInvoker.java

@@ -17,11 +17,9 @@
  */
 package org.wso2.carbon.apimgt.handlers.invoker;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.http.Header;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.*;
 import org.apache.http.entity.StringEntity;
@@ -32,7 +30,6 @@ import org.apache.http.util.EntityUtils;
 
 import java.io.IOException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Set;
 
@@ -63,7 +60,7 @@ public class RESTInvoker {
                 .setConnectionManager(connectionManager)
                 .setDefaultRequestConfig(defaultRequestConfig)
                 .build();
-        if(log.isDebugEnabled()){
+        if (log.isDebugEnabled()) {
             log.debug("REST client initialized with " +
                     "maxTotalConnection = " + maxTotalConnections +
                     "maxConnectionsPerRoute = " + maxTotalConnectionsPerRoute +
@@ -72,14 +69,11 @@ public class RESTInvoker {
 
     }
 
-    public RESTResponse invokePOST(URI uri, Map<String, String> requestHeaders, String username,
+    public RESTResponse invokePOST(URI uri, Map<String, String> requestHeaders, String payload) throws IOException {
-                                   String password, String payload) throws IOException {
 
         HttpPost httpPost = null;
         CloseableHttpResponse response = null;
-        Header[] headers;
         int httpStatus;
-        String contentType;
         String output;
         try {
             httpPost = new HttpPost(uri);
@@ -90,11 +84,9 @@ public class RESTInvoker {
                     httpPost.setHeader(header, requestHeaders.get(header));
                 }
             }
-            response = sendReceiveRequest(httpPost, username, password);
+            response = sendReceiveRequest(httpPost);
             output = IOUtils.toString(response.getEntity().getContent());
-            headers = response.getAllHeaders();
             httpStatus = response.getStatusLine().getStatusCode();
-            contentType = response.getEntity().getContentType().getValue();
             if (log.isDebugEnabled()) {
                 log.debug("Invoked POST " + uri.toString() +
                         " - Input payload: " + payload + " - Response message: " + output);
@@ -108,21 +100,11 @@ public class RESTInvoker {
                 httpPost.releaseConnection();
             }
         }
-        return new RESTResponse(contentType, output, headers, httpStatus);
+        return new RESTResponse(output, httpStatus);
     }
 
-    private CloseableHttpResponse sendReceiveRequest(HttpRequestBase requestBase, String username, String password)
+    private CloseableHttpResponse sendReceiveRequest(HttpRequestBase requestBase)
             throws IOException {
-        CloseableHttpResponse response;
+        return client.execute(requestBase);
-        if (username != null && !username.equals("") && password != null) {
-            String combinedCredentials = username + ":" + password;
-            byte[] encodedCredentials = Base64.encodeBase64(combinedCredentials.getBytes(StandardCharsets.UTF_8));
-            requestBase.addHeader("Authorization", "Basic " + new String(encodedCredentials));
-
-            response = client.execute(requestBase);
-        } else {
-            response = client.execute(requestBase);
-        }
-        return response;
     }
 }

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/invoker/RESTResponse.java

@@ -17,40 +17,25 @@
  */
 package org.wso2.carbon.apimgt.handlers.invoker;
 
-import org.apache.http.Header;
 
 /**
  * RESTResponse class holds the data retrieved from the HTTP invoke response.
  */
 public class RESTResponse {
-    private String contentType;
     private String content;
-    private Header[] headers;
     private int httpStatus;
 
     /**
      * Constructor
      *
-     * @param contentType from the REST invoke response
      * @param content     from the REST invoke response
-     * @param headers     from the REST invoke response
      * @param httpStatus  from the REST invoke response
      */
-    RESTResponse(String contentType, String content, Header[] headers, int httpStatus) {
+    RESTResponse(String content, int httpStatus) {
-        this.contentType = contentType;
         this.content = content;
-        this.headers = headers;
         this.httpStatus = httpStatus;
     }
 
-    /**
-     * Get the content type of the EST invoke response
-     *
-     * @return String content type of the response
-     */
-    public String getContentType() {
-        return contentType;
-    }
 
     /**
      * Get contents of the REST invoke response
@@ -61,15 +46,6 @@ public class RESTResponse {
         return content;
     }
 
-    /**
-     * Get headers of the REST invoke response
-     *
-     * @return headers of the REST invoke response
-     */
-    public Header[] getHeaders() {
-        return headers;
-    }
-
     /**
      * Get the HTTP Status code from REST invoke response
      *

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/utils/Utils.java

@@ -59,6 +59,7 @@ public class Utils {
 
     /**
      * This method initializes the iot-api-config.xml file.
+     *
      * @return IoTServerConfiguration Object based on the configuration file.
      */
     public static IOTServerConfiguration initConfig() {
@@ -67,10 +68,11 @@ public class Utils {
 
     /**
      * This methods initialized the iot-api-config.xml from provided path.
+     *
      * @param path The actual file path of iot-api-config.xml
      * @return The instance of the IOTServerConfiguration based on the configuration.
      */
-    public static IOTServerConfiguration initConfig(String path){
+    public static IOTServerConfiguration initConfig(String path) {
         try {
             File file = new File(path);
             Document doc = Utils.convertToDocument(file);
@@ -145,15 +147,15 @@ public class Utils {
                 getClientSecretes(iotServerConfiguration, restInvoker);
             }
             URI tokenUrl = new URI(iotServerConfiguration.getOauthTokenEndpoint());
-            String tokenContent = "grant_type=password&username=" + iotServerConfiguration.getUsername()+ "&password=" +
+            String tokenContent = "grant_type=password&username=" + iotServerConfiguration.getUsername() + "&password=" +
                     iotServerConfiguration.getPassword() + "&scope=activity-view";
             String tokenBasicAuth = "Basic " + Base64.encode((clientId + ":" + clientSecret).getBytes());
             Map<String, String> tokenHeaders = new HashMap<>();
             tokenHeaders.put("Authorization", tokenBasicAuth);
             tokenHeaders.put("Content-Type", "application/x-www-form-urlencoded");
 
-            RESTResponse response = restInvoker.invokePOST(tokenUrl, tokenHeaders, null, null, tokenContent);
+            RESTResponse response = restInvoker.invokePOST(tokenUrl, tokenHeaders, tokenContent);
-            if(log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
                 log.debug("Token response:" + response.getContent());
             }
             JSONObject jsonResponse = new JSONObject(response.getContent());
@@ -168,6 +170,7 @@ public class Utils {
 
     /**
      * This method register an application to get the client key and secret.
+     *
      * @param iotServerConfiguration Instance of the IoTServerConfiguration.
      * @throws APIMCertificateMGTException
      */
@@ -189,7 +192,7 @@ public class Utils {
             dcrHeaders.put(AuthConstants.CONTENT_TYPE_HEADER, AuthConstants.CONTENT_TYPE);
             dcrHeaders.put(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BASIC_AUTH_PREFIX + basicAuth);
             URI dcrUrl = new URI(iotServerConfiguration.getDynamicClientRegistrationEndpoint());
-            RESTResponse response = restInvoker.invokePOST(dcrUrl, dcrHeaders, null, null, dcrContent);
+            RESTResponse response = restInvoker.invokePOST(dcrUrl, dcrHeaders, dcrContent);
             if (log.isDebugEnabled()) {
                 log.debug("DCR response :" + response.getContent());
             }

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandlerTest.java

@@ -78,7 +78,7 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
 
     @Test(description = "Handle request with without device type",
             dependsOnMethods = "testHandleRequestWithEmptyTransportHeader")
-    public void testHandleRequestWithURISyntaxError() throws Exception {
+    public void testHandleRequestWithoutDeviceType() throws Exception {
         HashMap<String, String> transportHeaders = new HashMap<>();
         transportHeaders.put(AuthConstants.MDM_SIGNATURE, "some cert");
         boolean response = this.handler.handleRequest(createSynapseMessageContext("<empty/>", this.synapseConfiguration,
@@ -87,7 +87,7 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
     }
 
     @Test(description = "Handle request with device type URI with MDM ceritificate",
-            dependsOnMethods = "testHandleRequestWithURISyntaxError")
+            dependsOnMethods = "testHandleRequestWithoutDeviceType")
     public void testHandleSuccessfulRequestMDMCertificate() throws Exception {
         HashMap<String, String> transportHeaders = new HashMap<>();
         transportHeaders.put(AuthConstants.MDM_SIGNATURE, "some cert");
@@ -150,6 +150,70 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
         this.mockClient.reset();
     }
 
+    @Test(description = "Handle request with device type URI with Encoded Pem with invalid response",
+            dependsOnMethods = "testHandleSuccessRequestEncodedPem")
+    public void testHandleSuccessRequestEncodedPemInvalidResponse() throws Exception {
+        HashMap<String, String> transportHeaders = new HashMap<>();
+        transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem");
+        setMockClient();
+        this.mockClient.setResponse(getAccessTokenReponse());
+        this.mockClient.setResponse(getInvalidResponse());
+        MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
+                transportHeaders, "https://test.com/testservice/api/testdevice");
+        boolean response = this.handler.handleRequest(messageContext);
+        Assert.assertFalse(response);
+        this.mockClient.reset();
+    }
+
+    @Test(description = "Handle request with cert management exception ",
+            dependsOnMethods = "testHandleSuccessRequestEncodedPem")
+    public void testHandleRequestWithCertMgmtException() throws Exception {
+        HashMap<String, String> transportHeaders = new HashMap<>();
+        transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem");
+        setMockClient();
+        this.mockClient.setResponse(null);
+        MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
+                transportHeaders, "https://test.com/testservice/api/testdevice");
+        boolean response = this.handler.handleRequest(messageContext);
+        Assert.assertFalse(response);
+        this.mockClient.reset();
+    }
+
+    @Test(description = "Handle request with IO exception",
+            dependsOnMethods = "testHandleRequestWithCertMgmtException")
+    public void testHandleRequestWithIOException() throws Exception {
+        HashMap<String, String> transportHeaders = new HashMap<>();
+        transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem");
+        setMockClient();
+        this.mockClient.setResponse(getAccessTokenReponse());
+        this.mockClient.setResponse(null);
+        MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
+                transportHeaders, "https://test.com/testservice/api/testdevice");
+        boolean response = this.handler.handleRequest(messageContext);
+        Assert.assertFalse(response);
+        this.mockClient.reset();
+    }
+
+    @Test(description = "Handle request with URI exception",
+            dependsOnMethods = "testHandleRequestWithIOException")
+    public void testHandleRequestWithURIException() throws Exception {
+        TestUtils.resetSystemProperties();
+        HashMap<String, String> transportHeaders = new HashMap<>();
+        transportHeaders.put(AuthConstants.MDM_SIGNATURE, "some cert");
+        AuthenticationHandler handler = new AuthenticationHandler();
+        boolean response = handler.handleRequest(createSynapseMessageContext("<empty/>", this.synapseConfiguration,
+                transportHeaders, "https://test.com/testservice/api/testdevice"));
+        Assert.assertFalse(response);
+        TestUtils.setSystemProperties();
+    }
+
+    @Test(description = "Handle response")
+    public void testHandleResponse() throws Exception {
+        boolean response = this.handler.handleResponse(null);
+        Assert.assertTrue(response);
+    }
+
+
     private static MessageContext createSynapseMessageContext(
             String payload, SynapseConfiguration config, HashMap<String, String> transportHeaders,
             String address) throws Exception {
@@ -228,6 +292,16 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
         return mockDCRResponse;
     }
 
+    private CloseableHttpResponse getInvalidResponse() throws UnsupportedEncodingException {
+        CloseableHttpResponse mockDCRResponse = new MockHttpResponse();
+        BasicHttpEntity responseEntity = new BasicHttpEntity();
+        responseEntity.setContent(new ByteArrayInputStream("invalid response".getBytes(StandardCharsets.UTF_8.name())));
+        responseEntity.setContentType(TestUtils.CONTENT_TYPE);
+        mockDCRResponse.setEntity(responseEntity);
+        mockDCRResponse.setStatusLine(new BasicStatusLine(new ProtocolVersion("http", 1, 0), 400, "Bad Request"));
+        return mockDCRResponse;
+    }
+
     private String getContent(String filePath) throws IOException {
         FileReader fileReader = new FileReader(filePath);
         BufferedReader bufferedReader = new BufferedReader(fileReader);

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/test/java/org/wso2/carbon/apimgt/handlers/mock/MockClient.java

@@ -41,7 +41,11 @@ public class MockClient extends CloseableHttpClient {
             throws IOException {
         if (this.responseCount < this.responses.size()) {
             this.responseCount++;
-            return this.responses.get(this.responseCount - 1);
+            CloseableHttpResponse response = this.responses.get(this.responseCount - 1);
+            if (response == null) {
+                throw new IOException("test exception");
+            }
+            return response;
         } else {
             return new MockHttpResponse();
         }

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

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

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

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

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

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

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

@@ -62,7 +62,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
                     for (APIInfo apiInfo : apiList.getList()) {
                         if (api.getName().equals(apiInfo.getName()) && api.getVersion().equals(apiInfo.getVersion())) {
                             api = publisherClient.getApi().apisApiIdPut(apiInfo.getId(), api, CONTENT_TYPE, null, null);
-                            if (CREATED_STATUS.equals(api.getStatus())) {
+                            if (api != null && CREATED_STATUS.equals(api.getStatus())) {
                                 publisherClient.getApi().apisChangeLifecyclePost(PUBLISH_ACTION, api.getId(), null, null,
                                                                                  null);
                             }
@@ -83,7 +83,9 @@ public class APIPublisherServiceImpl implements APIPublisherService {
             return false;
         }
         for (APIInfo existingApi : apiList.getList()) {
-            if (existingApi.getName().equals(api.getName()) && existingApi.getVersion().equals(api.getVersion())) {
+            if (existingApi.getName() != null && existingApi.getName().equals(api.
+                    getName()) && existingApi.getVersion() != null &&
+                    existingApi.getVersion().equals(api.getVersion())) {
                 return true;
             }
         }

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceTest.java

@@ -19,17 +19,30 @@ package org.wso2.carbon.apimgt.webapp.publisher;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.mockito.Mockito;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
+import org.wso2.carbon.apimgt.integration.client.IntegrationClientServiceImpl;
 import org.wso2.carbon.apimgt.integration.client.OAuthRequestInterceptor;
 import org.wso2.carbon.apimgt.integration.client.model.OAuthApplication;
+import org.wso2.carbon.apimgt.integration.client.publisher.PublisherClient;
+import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService;
+import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.APIsApi;
+import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.API;
+import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.APIInfo;
+import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.APIList;
+import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
 import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiScope;
 import org.wso2.carbon.apimgt.webapp.publisher.dto.ApiUriTemplate;
 import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
+import org.wso2.carbon.apimgt.webapp.publisher.utils.Api;
 
 import java.lang.reflect.Field;
 import java.util.*;
 
+import static org.mockito.Mockito.doReturn;
+
 /**
  * This is the test class for {@link APIPublisherServiceImpl}
  */
@@ -37,23 +50,119 @@ public class
 APIPublisherServiceTest extends BaseAPIPublisherTest {
     private static final Log log = LogFactory.getLog(APIPublisherServiceTest.class);
     private APIPublisherServiceImpl apiPublisherService = new APIPublisherServiceImpl();
-    private APIConfig apiConfig = new APIConfig();
 
     @BeforeTest
     public void initialConfigs() throws Exception {
-        setApiConfigs(apiConfig);
         initializeOAuthApplication();
+        WebappPublisherConfig.init();
     }
 
     @Test(description = "Publishes an API | will fail if there are any exceptions")
     public void publishAPI() throws NoSuchFieldException, IllegalAccessException,
             APIManagerPublisherException {
+        APIConfig apiConfig = new APIConfig();
+        setApiConfigs(apiConfig, "testAPI-0");
         apiPublisherService.publishAPI(apiConfig);
     }
 
-    private void setApiConfigs(APIConfig apiConfig) {
+    @Test(description = "Testing for API status CREATED | will fail if there are any exceptions")
-        apiConfig.setName("Windows Device Management Administrative Service");
+    public void publishCreatedAPI() throws APIManagerPublisherException, NoSuchFieldException,
-        apiConfig.setContext("/api/device-mgt/windows/v1.0/admin/devices");
+            IllegalAccessException {
+        APIConfig apiConfig = new APIConfig();
+        setApiConfigs(apiConfig, "testAPI-1");
+        APIPublisherDataHolder apiPublisherDataHolder = Mockito.mock(APIPublisherDataHolder.getInstance().
+                getClass(), Mockito.CALLS_REAL_METHODS);
+        IntegrationClientService integrationClientService = Mockito.mock(IntegrationClientServiceImpl.
+                class, Mockito.CALLS_REAL_METHODS);
+        doReturn(integrationClientService).when(apiPublisherDataHolder).getIntegrationClientService();
+        PublisherClient publisherClient = APIPublisherDataHolder.getInstance().getIntegrationClientService().
+                getPublisherClient();
+        doReturn(publisherClient).when(integrationClientService).getPublisherClient();
+        APIsApi apIsApi = Mockito.mock(Api.class, Mockito.CALLS_REAL_METHODS);
+        doReturn(apIsApi).when(publisherClient).getApi();
+        API api = Mockito.mock(API.class, Mockito.CALLS_REAL_METHODS);
+        api.setStatus("CREATED");
+        doReturn(api).when(apIsApi).apisPost(Mockito.any(), Mockito.anyString());
+        apiPublisherService.publishAPI(apiConfig);
+    }
+
+    @Test(description = "createAPIListWithNoApi | will fail if there are any exceptions")
+    private void publishWithNoAPIListCreated() throws APIManagerPublisherException {
+        APIConfig apiConfig = new APIConfig();
+        setApiConfigs(apiConfig, "testAPI-2");
+        APIPublisherDataHolder apiPublisherDataHolder = Mockito.mock(APIPublisherDataHolder.getInstance().
+                getClass(), Mockito.CALLS_REAL_METHODS);
+        IntegrationClientService integrationClientService = Mockito.mock(IntegrationClientServiceImpl.
+                class, Mockito.CALLS_REAL_METHODS);
+        doReturn(integrationClientService).when(apiPublisherDataHolder).getIntegrationClientService();
+        PublisherClient publisherClient = APIPublisherDataHolder.getInstance().getIntegrationClientService().
+                getPublisherClient();
+        doReturn(publisherClient).when(integrationClientService).getPublisherClient();
+        APIsApi apIsApi = Mockito.mock(Api.class, Mockito.CALLS_REAL_METHODS);
+        doReturn(apIsApi).when(publisherClient).getApi();
+        API api = Mockito.mock(API.class, Mockito.CALLS_REAL_METHODS);
+        api.setStatus("CREATED");
+        doReturn(api).when(apIsApi).apisPost(Mockito.any(), Mockito.anyString());
+        APIList apiList = Mockito.mock(APIList.class, Mockito.CALLS_REAL_METHODS);
+        APIInfo apiInfo = new APIInfo();
+        List<APIInfo> apiInfoList = new ArrayList<>();
+        apiInfoList.add(apiInfo);
+        apiList.list(apiInfoList);
+        doReturn(apiList).when(apIsApi).apisGet(Mockito.anyInt(), Mockito.anyInt(),
+                Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+        doReturn(api).when(apIsApi).apisApiIdPut(Mockito.anyString(), Mockito.any(),
+                Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+        apiPublisherService.publishAPI(apiConfig);
+    }
+
+    @Test(description = "createAPIList | will fail if there are any exceptions")
+    private void publishWithAPIListCreated() throws APIManagerPublisherException {
+        APIConfig apiConfig = new APIConfig();
+        setApiConfigs(apiConfig, "testAPI-3");
+        APIPublisherDataHolder apiPublisherDataHolder = Mockito.mock(APIPublisherDataHolder.getInstance().
+                getClass(), Mockito.CALLS_REAL_METHODS);
+        IntegrationClientService integrationClientService = Mockito.mock(IntegrationClientServiceImpl.
+                class, Mockito.CALLS_REAL_METHODS);
+        doReturn(integrationClientService).when(apiPublisherDataHolder).getIntegrationClientService();
+        PublisherClient publisherClient = APIPublisherDataHolder.getInstance().getIntegrationClientService().
+                getPublisherClient();
+        doReturn(publisherClient).when(integrationClientService).getPublisherClient();
+        APIsApi apIsApi = Mockito.mock(Api.class, Mockito.CALLS_REAL_METHODS);
+        doReturn(apIsApi).when(publisherClient).getApi();
+        API api = Mockito.mock(API.class, Mockito.CALLS_REAL_METHODS);
+        api.setStatus("CREATED");
+        doReturn(api).when(apIsApi).apisPost(Mockito.any(), Mockito.anyString());
+        APIList apiList = Mockito.mock(APIList.class, Mockito.CALLS_REAL_METHODS);
+        APIInfo apiInfo = new APIInfo();
+        apiInfo.setName("testAPI-3");
+        apiInfo.setVersion("1.0.0");
+        apiInfo.setId("test-one");
+        List<APIInfo> apiInfoList = new ArrayList<>();
+        apiInfoList.add(apiInfo);
+        apiList.list(apiInfoList);
+        doReturn(apiList).when(apIsApi).apisGet(Mockito.anyInt(), Mockito.anyInt(),
+                Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+        doReturn(api).when(apIsApi).apisApiIdPut(Mockito.anyString(), Mockito.any(),
+                Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+        apiConfig.setSharedWithAllTenants(false);
+        apiPublisherService.publishAPI(apiConfig);
+    }
+
+    @Test(description = "publish API with scope added | will fail if there are any exceptions")
+    private void publishWithAPIScope() throws APIManagerPublisherException {
+        APIConfig apiConfig = new APIConfig();
+        setApiConfigs(apiConfig, "testAPI-4");
+        Set<ApiScope> scopes = new HashSet<>();
+        ApiScope apiScope = new ApiScope();
+        apiScope.setDescription("testing");
+        scopes.add(apiScope);
+        apiConfig.setScopes(scopes);
+        apiPublisherService.publishAPI(apiConfig);
+    }
+
+    private void setApiConfigs(APIConfig apiConfig, String name) {
+        apiConfig.setName(name);
+        apiConfig.setContext("api/device-mgt/windows/v1.g0/admin/devices");
         apiConfig.setOwner("admin");
         apiConfig.setEndpoint("https://localhost:9443/api/device-mgt/windows/v1.0/admin/devices");
         apiConfig.setVersion("1.0.0");
@@ -98,3 +207,4 @@ APIPublisherServiceTest extends BaseAPIPublisherTest {
     }
 
 }
+

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtilTest.java

@@ -0,0 +1,126 @@
+/*
+*  Copyright (c) 2017, 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.apimgt.webapp.publisher;
+
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+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.apimgt.webapp.publisher.dto.ApiScope;
+import org.wso2.carbon.apimgt.webapp.publisher.exception.APIManagerPublisherException;
+import org.wso2.carbon.apimgt.webapp.publisher.utils.MockServletContext;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
+import org.wso2.carbon.user.api.RealmConfiguration;
+import org.wso2.carbon.user.api.UserRealm;
+import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import javax.servlet.ServletContext;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil.buildApiConfig;
+
+/**
+ * This is the test class for {@link APIPublisherUtil}
+ */
+public class APIPublisherUtilTest extends BaseAPIPublisherTest {
+
+    @BeforeTest
+    public void initialConfigs() throws WebappPublisherConfigurationFailedException,
+            org.wso2.carbon.user.core.UserStoreException, RegistryException {
+        WebappPublisherConfig.init();
+        setUserRealm();
+    }
+
+    @Test(description = "test buildAPIConfig method and ensures an APIConfig is created")
+    private void buildApiConfigTest() throws UserStoreException, RegistryException {
+        try {
+            startTenantFlowAsTestTenant();
+            ServletContext servletContext = new MockServletContext();
+            APIResourceConfiguration apiDef = new APIResourceConfiguration();
+            List<APIResource> resources = new ArrayList<>();
+            apiDef.setResources(resources);
+            APIConfig apiConfig = buildApiConfig(servletContext, apiDef);
+            Assert.assertNotNull(apiConfig, "API configuration is null.");
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+        }
+    }
+
+    @Test(description = "test buildAPIConfig method as SuperTenant and ensures" +
+            " an APIConfig is created")
+    private void buildApiConfigAsSuperTenat() throws UserStoreException {
+        ServletContext servletContext = new MockServletContext();
+        APIResourceConfiguration apiDef = new APIResourceConfiguration();
+        List<APIResource> resources = new ArrayList<>();
+        apiDef.setResources(resources);
+        APIConfig apiConfig = buildApiConfig(servletContext, apiDef);
+        Assert.assertNotNull(apiConfig, "API configuration is null.");
+    }
+
+    @Test(description = "test buildAPIConfig with API tags specified and ensures " +
+            "an APIConfig is created")
+    private void buildApiConfigTestWithTags() throws UserStoreException {
+        ServletContext servletContext = new MockServletContext();
+        APIResourceConfiguration apiDef = new APIResourceConfiguration();
+        List<APIResource> resources = new ArrayList<>();
+        APIResource apiResource = new APIResource();
+        resources.add(apiResource);
+        apiDef.setResources(resources);
+        apiDef.setTags(new String[]{"windows", "device_management"});
+        APIConfig apiConfig = buildApiConfig(servletContext, apiDef);
+        Assert.assertNotNull(apiConfig, "API configuration is null.");
+    }
+
+    @Test(description = "test buildAPIConfig method with API scopes specified and " +
+            "ensures an APIConfig is created")
+    private void buildApiConfigTestWithScope() throws UserStoreException, APIManagerPublisherException {
+        ServletContext servletContext = new MockServletContext();
+        APIResourceConfiguration apiDef = new APIResourceConfiguration();
+        List<APIResource> resources = new ArrayList<>();
+        APIResource apiResource = new APIResource();
+        ApiScope apiScope = new ApiScope();
+        apiScope.setDescription("testing");
+        apiResource.setScope(apiScope);
+        resources.add(apiResource);
+        apiDef.setResources(resources);
+        apiDef.setTags(new String[]{"windows", "device_management"});
+        APIConfig apiConfig = buildApiConfig(servletContext, apiDef);
+        Assert.assertNotNull(apiConfig, "API configuration is null.");
+    }
+
+    private void setUserRealm() throws RegistryException, org.wso2.carbon.user.core.UserStoreException {
+        RealmConfiguration configuration = new RealmConfiguration();
+        UserRealm userRealm = new InMemoryRealmService().getUserRealm(configuration);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUserRealm(userRealm);
+    }
+
+    private void startTenantFlowAsTestTenant() throws org.wso2.carbon.user.core.UserStoreException, RegistryException {
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(1212);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain("test.com");
+        setUserRealm();
+    }
+}

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/java/org/wso2/carbon/apimgt/webapp/publisher/utils/MockServletContext.java

@@ -0,0 +1,285 @@
+/*
+*  Copyright (c) 2017, 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.apimgt.webapp.publisher.utils;
+
+import javax.servlet.*;
+import javax.servlet.descriptor.JspConfigDescriptor;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
+
+public class MockServletContext implements ServletContext {
+    @Override
+    public ServletContext getContext(String s) {
+        return null;
+    }
+
+    @Override
+    public String getContextPath() {
+        return null;
+    }
+
+    @Override
+    public int getMajorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getMinorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMajorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() {
+        return 0;
+    }
+
+    @Override
+    public String getMimeType(String s) {
+        return null;
+    }
+
+    @Override
+    public Set<String> getResourcePaths(String s) {
+        return null;
+    }
+
+    @Override
+    public URL getResource(String s) throws MalformedURLException {
+        return null;
+    }
+
+    @Override
+    public InputStream getResourceAsStream(String s) {
+        return null;
+    }
+
+    @Override
+    public RequestDispatcher getRequestDispatcher(String s) {
+        return null;
+    }
+
+    @Override
+    public RequestDispatcher getNamedDispatcher(String s) {
+        return null;
+    }
+
+    @Override
+    public Servlet getServlet(String s) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public Enumeration<Servlet> getServlets() {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getServletNames() {
+        return null;
+    }
+
+    @Override
+    public void log(String s) {
+
+    }
+
+    @Override
+    public void log(Exception e, String s) {
+
+    }
+
+    @Override
+    public void log(String s, Throwable throwable) {
+
+    }
+
+    @Override
+    public String getRealPath(String s) {
+        return null;
+    }
+
+    @Override
+    public String getServerInfo() {
+        return null;
+    }
+
+    @Override
+    public String getInitParameter(String s) {
+        return "true";
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return null;
+    }
+
+    @Override
+    public boolean setInitParameter(String s, String s1) {
+        return false;
+    }
+
+    @Override
+    public Object getAttribute(String s) {
+        return null;
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return null;
+    }
+
+    @Override
+    public void setAttribute(String s, Object o) {
+
+    }
+
+    @Override
+    public void removeAttribute(String s) {
+
+    }
+
+    @Override
+    public String getServletContextName() {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String s, String s1) {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String s, Servlet servlet) {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration.Dynamic addServlet(String s, Class<? extends Servlet> aClass) {
+        return null;
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> aClass) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(String s) {
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String s, String s1) {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String s, Filter filter) {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration.Dynamic addFilter(String s, Class<? extends Filter> aClass) {
+        return null;
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(Class<T> aClass) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(String s) {
+        return null;
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        return null;
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        return null;
+    }
+
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> set) throws IllegalStateException, IllegalArgumentException {
+
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        return null;
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        return null;
+    }
+
+    @Override
+    public void addListener(String s) {
+
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(T t) {
+
+    }
+
+    @Override
+    public void addListener(Class<? extends EventListener> aClass) {
+
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> aClass) throws ServletException {
+        return null;
+    }
+
+    @Override
+    public void declareRoles(String... strings) {
+
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        return null;
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        return null;
+    }
+}

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/test/resources/carbon-home/repository/conf/etc/webapp-publisher-config.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2017, 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.
+  -->
+
+<!--
+        This configuration file represents the configuration that are needed
+        when publishing APIs to API Manager
+-->
+<WebappPublisherConfigs>
+
+    <!-- This host is used to define the host address which is used to publish APIs -->
+    <Host>https://${iot.core.host}:${iot.core.https.port}</Host>
+
+    <!-- If it is true, the APIs of this instance will be published to the defined host -->
+    <PublishAPI>true</PublishAPI>
+
+    <!-- If it is true, the APIs of this instance will be updated when the webapps are redeployed -->
+    <EnabledUpdateApi>true</EnabledUpdateApi>
+
+    <!--Webapp will be published only when running below profiles-->
+    <Profiles>
+        <Profile>default</Profile>
+    </Profiles>
+</WebappPublisherConfigs>

components/apimgt-extensions/pom.xml

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

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

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

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

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

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

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

components/certificate-mgt/pom.xml

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

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.145-SNAPSHOT</version>
+        <version>3.0.147-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -74,6 +74,39 @@
 			<groupId>org.wso2.carbon</groupId>
 			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.registry</groupId>
+            <artifactId>org.wso2.carbon.registry.indexing</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -51,8 +51,8 @@ public class DeviceTypePluginDeployer extends AbstractDeployer {
 
     private static Log log = LogFactory.getLog(DeviceTypePluginDeployer.class);
     private ConfigurationContext configurationContext;
-    protected Map<String, ServiceRegistration> deviceTypeServiceRegistrations = new ConcurrentHashMap();
+    private Map<String, ServiceRegistration> deviceTypeServiceRegistrations = new ConcurrentHashMap();
-    protected Map<String, DeviceTypeConfigIdentifier> deviceTypeConfigurationDataMap = new ConcurrentHashMap();
+    private Map<String, DeviceTypeConfigIdentifier> deviceTypeConfigurationDataMap = new ConcurrentHashMap();
 
     @Override
     public void init(ConfigurationContext configurationContext) {
@@ -118,7 +118,7 @@ public class DeviceTypePluginDeployer extends AbstractDeployer {
         }
     }
 
-    private ServiceRegistration registerDeviceType(DeviceTypeConfigIdentifier deviceTypeConfigIdentifier,
+    protected ServiceRegistration registerDeviceType(DeviceTypeConfigIdentifier deviceTypeConfigIdentifier,
                                                    DeviceTypeConfiguration deviceManagementConfiguration) {
         DeviceTypeManagerService deviceTypeManagerService = new DeviceTypeManagerService(deviceTypeConfigIdentifier,
                                                                                          deviceManagementConfiguration);

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, 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.DeploymentException;
+import org.apache.axis2.deployment.repository.util.DeploymentFileData;
+import org.junit.Assert;
+import org.mockito.Mockito;
+import org.osgi.framework.ServiceRegistration;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeConfigIdentifier;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/*
+    Unit tests for DeviceTypePluginDeployer
+ */
+public class DeviceTypePluginDeployerTest {
+    private DeviceTypePluginDeployer deviceTypePluginDeployer;
+    private DeploymentFileData deploymentFileData;
+    private Field deviceTypeServiceRegistrations = null;
+    private Field deviceTypeConfigurationDataMap = null;
+    private ServiceRegistration serviceRegistration = null;
+
+    @BeforeClass
+    public void init() throws NoSuchFieldException, IllegalAccessException, IOException, RegistryException {
+        deviceTypePluginDeployer = Mockito.mock(DeviceTypePluginDeployer.class, Mockito.CALLS_REAL_METHODS);
+        serviceRegistration = Mockito.mock(ServiceRegistration.class, Mockito.CALLS_REAL_METHODS);
+        Mockito.doReturn(serviceRegistration).when(deviceTypePluginDeployer).registerDeviceType(Mockito.any(),
+                Mockito.any());
+        deviceTypeServiceRegistrations = DeviceTypePluginDeployer.class.getDeclaredField
+                ("deviceTypeServiceRegistrations");
+        deviceTypeServiceRegistrations.setAccessible(true);
+        deviceTypeServiceRegistrations.set(deviceTypePluginDeployer, new ConcurrentHashMap());
+        deviceTypeConfigurationDataMap = DeviceTypePluginDeployer.class.getDeclaredField
+                ("deviceTypeConfigurationDataMap");
+        deviceTypeConfigurationDataMap.setAccessible(true);
+        deviceTypeConfigurationDataMap.set(deviceTypePluginDeployer, new ConcurrentHashMap());
+        this.initializeCarbonContext();
+    }
+
+    private void initializeCarbonContext() throws IOException, RegistryException {
+
+        if (System.getProperty("carbon.home") == null) {
+            File file = new File("src/test/resources");
+            if (file.exists()) {
+                System.setProperty("carbon.home", file.getAbsolutePath());
+            }
+        }
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(
+                org.wso2.carbon.base.MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(
+                org.wso2.carbon.base.MultitenantConstants.SUPER_TENANT_ID);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(description = "Testing deviceType deploy method by deploying Android device type")
+    public void deploy() throws DeploymentException, IllegalAccessException {
+        File file = new File("src/test/resources/android.xml");
+        if (file.exists()) {
+            deploymentFileData = new DeploymentFileData(file);
+        }
+        deviceTypePluginDeployer.deploy(deploymentFileData);
+        Map<String, ServiceRegistration> tempServiceRegistration = (Map<String, ServiceRegistration>)
+                deviceTypeServiceRegistrations.get(deviceTypePluginDeployer);
+        Assert.assertEquals(tempServiceRegistration.get(deploymentFileData.getAbsolutePath()), serviceRegistration);
+        Map<String, DeviceTypeConfigIdentifier> tempDeviceTypeConfig = (Map<String, DeviceTypeConfigIdentifier>)
+                deviceTypeConfigurationDataMap.get(deviceTypePluginDeployer);
+        DeviceTypeConfigIdentifier deviceTypeConfigIdentifier = tempDeviceTypeConfig.get(deploymentFileData
+                .getAbsolutePath());
+        Assert.assertEquals(deviceTypeConfigIdentifier.getDeviceType(), "android");
+    }
+}

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

@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2017, 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.
+  -->
+<DeviceTypeConfiguration name="android">
+
+    <DeviceDetails table-id="AD_DEVICE"/>
+
+    <License>
+        <Language>en_US</Language>
+        <Version>1.0.0</Version>
+        <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and WSO2,
+            Inc., regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile device
+            management program, and the loading to and removal from Your Device and Your use of certain
+            applications and any associated software and user documentation, whether provided in "online" or
+            electronic format, used in connection with the operation of or provision of services to WSO2,
+            Inc., BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND THEREBY
+            AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS DESCRIBED
+            IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS A BINDING
+            CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.
+
+            IF YOU DO NOT ACCEPT THESE TERMS, DO NOT ENROLL YOUR DEVICE AND DO NOT PROCEED ANY FURTHER.
+
+            You agree that: (1) You understand and agree to be bound by the terms and conditions contained in
+            this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter into
+            this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right, without
+            prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of Your Device, or
+            (iii) the functioning of the Apps in the event of a violation of this Agreement or the cessation
+            of Your relationship with SoR (including termination of Your employment if You are an employee or
+            expiration or termination of Your applicable franchise or supply agreement if You are a franchisee
+            of or supplier to the WSO2 WSO2, Inc., system). SoR expressly reserves all rights not expressly
+            granted herein.
+        </Text>
+    </License>
+
+    <ProvisioningConfig>
+        <SharedWithAllTenants>true</SharedWithAllTenants>
+    </ProvisioningConfig>
+    <!--
+    isScheduled element used to enable scheduler task to send push notification.
+    Task will send push notification as batches. So this will reduce sudden request burst when many devices try to
+    access server after receiving push notification.
+    -->
+    <!--Configuration for enable firebase push notifications-->
+    <!--<PushNotificationProviderConfig type="FCM" isScheduled="false">-->
+    <!--</PushNotificationProviderConfig>-->
+
+    <DataSource>
+        <JndiConfig>
+            <Name>jdbc/MobileAndroidDM_DS</Name>
+        </JndiConfig>
+        <TableConfig>
+            <Table name="AD_DEVICE">
+                <PrimaryKey>DEVICE_ID</PrimaryKey>
+                <Attributes>
+                    <Attribute>FCM_TOKEN</Attribute>
+                    <Attribute>DEVICE_INFO</Attribute>
+                    <Attribute>IMEI</Attribute>
+                    <Attribute>IMSI</Attribute>
+                    <Attribute>OS_VERSION</Attribute>
+                    <Attribute>DEVICE_MODEL</Attribute>
+                    <Attribute>VENDOR</Attribute>
+                    <Attribute>LATITUDE</Attribute>
+                    <Attribute>LONGITUDE</Attribute>
+                    <Attribute>SERIAL</Attribute>
+                    <Attribute>MAC_ADDRESS</Attribute>
+                    <Attribute>DEVICE_NAME</Attribute>
+                    <Attribute>OS_BUILD_DATE</Attribute>
+                </Attributes>
+            </Table>
+        </TableConfig>
+    </DataSource>
+
+    <Features>
+        <Feature code="DEVICE_RING">
+            <Name>Ring</Name>
+            <Description>Ring the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/ring" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_LOCK">
+            <Name>Device Lock</Name>
+            <Description>Lock the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/lock-devices" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_LOCATION">
+            <Name>Location</Name>
+            <Description>Request coordinates of device location</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/location" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="CLEAR_PASSWORD">
+            <Name>Clear Password</Name>
+            <Description>Clear current password</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/clear-password" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_REBOOT">
+            <Name>Reboot</Name>
+            <Description>Reboot the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/reboot" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="UPGRADE_FIRMWARE">
+            <Name>Upgrade Firmware</Name>
+            <Description>Upgrade Firmware</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/upgrade-firmware" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="DEVICE_MUTE">
+            <Name>Mute</Name>
+            <Description>Enable mute in the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/mute" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="NOTIFICATION">
+            <Name>Message</Name>
+            <Description>Send message</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/send-notification" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="CHANGE_LOCK_CODE">
+            <Name>Change Lock-code</Name>
+            <Description>Change current lock code</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/change-lock-code" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="ENTERPRISE_WIPE">
+            <Name>Enterprise Wipe</Name>
+            <Description>Remove enterprise applications</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/enterprise-wipe" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="WIPE_DATA">
+            <Name>Wipe Data</Name>
+            <Description>Factory reset the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/wipe" method="POST" type="application/json">
+            </Operation>
+        </Feature>
+        <Feature code="WIFI">
+            <Name>Wifi</Name>
+            <Description>Setting up wifi configuration</Description>
+        </Feature>
+        <Feature code="CAMERA">
+            <Name>Camera</Name>
+            <Description>Enable or disable camera</Description>
+        </Feature>
+        <Feature code="EMAIL">
+            <Name>Email</Name>
+            <Description>Configure email settings</Description>
+        </Feature>
+        <Feature code="DEVICE_INFO">
+            <Name>Device info</Name>
+            <Description>Request device information</Description>
+        </Feature>
+        <Feature code="APPLICATION_LIST">
+            <Name>Application List</Name>
+            <Description>Request list of current installed applications</Description>
+        </Feature>
+        <Feature code="INSTALL_APPLICATION">
+            <Name>Install App</Name>
+            <Description>Install App</Description>
+        </Feature>
+        <Feature code="UNINSTALL_APPLICATION">
+            <Name>Uninstall App</Name>
+            <Description>Uninstall App</Description>
+        </Feature>
+        <Feature code="BLACKLIST_APPLICATIONS">
+            <Name>Blacklist app</Name>
+            <Description>Blacklist applications</Description>
+        </Feature>
+        <Feature code="ENCRYPT_STORAGE">
+            <Name>Encrypt Storage</Name>
+            <Description>Encrypt storage</Description>
+        </Feature>
+        <Feature code="PASSCODE_POLICY">
+            <Name>Password Policy</Name>
+            <Description>Set passcode policy</Description>
+        </Feature>
+        <Feature code="VPN">
+            <Name>Configure VPN</Name>
+            <Description>Configure VPN settings</Description>
+        </Feature>
+        <Feature code="DISALLOW_ADJUST_VOLUME">
+            <Name>Disallow user to change volume</Name>
+            <Description>Allow or disallow user to change volume"</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_BLUETOOTH">
+            <Name>Disallow bluetooth configuration</Name>
+            <Description>Allow or disallow bluetooth configuration</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_CELL_BROADCASTS">
+            <Name>Disallow user to change cell broadcast configurations</Name>
+            <Description>Allow or disallow user to change cell broadcast configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_CREDENTIALS">
+            <Name>Disallow user to change user credentials</Name>
+            <Description>Allow or disallow user to change user credentials</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_MOBILE_NETWORKS">
+            <Name>Disallow user to change mobile networks configurations</Name>
+            <Description>Allow or disallow user to change mobile networks configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_TETHERING">
+            <Name>Disallow user to change tethering configurations</Name>
+            <Description>Allow or disallow user to change tethering configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_VPN">
+            <Name>Disallow user to change VPN configurations</Name>
+            <Description>Allow or disallow user to change VPN configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CONFIG_WIFI">
+            <Name>Disallow user to change WIFI configurations</Name>
+            <Description>Allow or disallow user to change WIFI configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_APPS_CONTROL">
+            <Name>Disallow user to change app control</Name>
+            <Description>Allow or disallow user to change app control</Description>
+        </Feature>
+        <Feature code="DISALLOW_CREATE_WINDOWS">
+            <Name>Disallow window creation</Name>
+            <Description>Allow or disallow window creation</Description>
+        </Feature>
+        <Feature code="DISALLOW_APPS_CONTROL">
+            <Name>Disallow user to change app control configurations</Name>
+            <Description>Allow or disallow user to change app control configurations</Description>
+        </Feature>
+        <Feature code="DISALLOW_CROSS_PROFILE_COPY_PASTE">
+            <Name>Disallow cross profile copy paste</Name>
+            <Description>Allow or disallow cross profile copy paste</Description>
+        </Feature>
+        <Feature code="DISALLOW_DEBUGGING_FEATURES">
+            <Name>Disallow debugging features</Name>
+            <Description>Allow or disallow debugging features</Description>
+        </Feature>
+        <Feature code="DISALLOW_FACTORY_RESET">
+            <Name>Disallow factory reset</Name>
+            <Description>Allow or disallow factory reset</Description>
+        </Feature>
+        <Feature code="DISALLOW_ADD_USER">
+            <Name>Disallow add user</Name>
+            <Description>Allow or disallow add user</Description>
+        </Feature>
+        <Feature code="DISALLOW_INSTALL_APPS">
+            <Name>Disallow install apps</Name>
+            <Description>Allow or disallow install apps</Description>
+        </Feature>
+        <Feature code="DISALLOW_INSTALL_UNKNOWN_SOURCES">
+            <Name>Disallow install unknown sources</Name>
+            <Description>Allow or disallow install unknown sources</Description>
+        </Feature>
+        <Feature code="DISALLOW_MODIFY_ACCOUNTS">
+            <Name>Disallow modify account</Name>
+            <Description>Allow or disallow modify account</Description>
+        </Feature>
+        <Feature code="DISALLOW_MOUNT_PHYSICAL_MEDIA">
+            <Name>Disallow mount physical media</Name>
+            <Description>Allow or disallow mount physical media</Description>
+        </Feature>
+        <Feature code="DISALLOW_NETWORK_RESET">
+            <Name>Disallow network reset</Name>
+            <Description>Allow or disallow network reset</Description>
+        </Feature>
+        <Feature code="DISALLOW_OUTGOING_BEAM">
+            <Name>Disallow outgoing beam</Name>
+            <Description>Allow or disallow outgoing beam</Description>
+        </Feature>
+        <Feature code="DISALLOW_OUTGOING_CALLS">
+            <Name>Disallow outgoing calls</Name>
+            <Description>Allow or disallow outgoing calls</Description>
+        </Feature>
+        <Feature code="DISALLOW_REMOVE_USER">
+            <Name>Disallow remove users</Name>
+            <Description>Allow or disallow remove users</Description>
+        </Feature>
+        <Feature code="DISALLOW_SAFE_BOOT">
+            <Name>Disallow safe boot</Name>
+            <Description>Allow or disallow safe boot</Description>
+        </Feature>
+        <Feature code="DISALLOW_SHARE_LOCATION">
+            <Name>Disallow share location</Name>
+            <Description>Allow or disallow share location</Description>
+        </Feature>
+        <Feature code="DISALLOW_SMS">
+            <Name>Disallow sms</Name>
+            <Description>Allow or disallow sms</Description>
+        </Feature>
+        <Feature code="DISALLOW_UNINSTALL_APPS">
+            <Name>Disallow uninstall app</Name>
+            <Description>Allow or disallow uninstall app</Description>
+        </Feature>
+        <Feature code="DISALLOW_UNMUTE_MICROPHONE">
+            <Name>Disallow unmute mic</Name>
+            <Description>Allow or disallow unmute mic</Description>
+        </Feature>
+        <Feature code="DISALLOW_USB_FILE_TRANSFER">
+            <Name>Disallow usb file transfer</Name>
+            <Description>Allow or disallow usb file transfer</Description>
+        </Feature>
+        <Feature code="ALLOW_PARENT_PROFILE_APP_LINKING">
+            <Name>Disallow parent profile app linking</Name>
+            <Description>Allow or disallow parent profile app linking</Description>
+        </Feature>
+        <Feature code="ENSURE_VERIFY_APPS">
+            <Name>Disallow ensure verify apps</Name>
+            <Description>Allow or disallow ensure verify apps</Description>
+        </Feature>
+        <Feature code="AUTO_TIME">
+            <Name>Disallow auto timing</Name>
+            <Description>Allow or disallow auto timing</Description>
+        </Feature>
+        <Feature code="REMOVE_DEVICE_OWNER">
+            <Name>Remove device owner</Name>
+            <Description>Remove device owner</Description>
+        </Feature>
+        <Feature code="LOGCAT">
+            <Name>Fetch device logcat</Name>
+            <Description>Fetch device logcat</Description>
+        </Feature>
+        <Feature code="DEVICE_UNLOCK">
+            <Name>Unlock the device</Name>
+            <Description>Unlock the device</Description>
+        </Feature>
+    </Features>
+    <TaskConfiguration>
+        <Enable>true</Enable>
+        <Frequency>60000</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>
+	<PolicyMonitoring enabled="true"/>
+    <InitialOperationConfig>
+        <Operations>
+            <Operation>DEVICE_INFO</Operation>
+            <Operation>APPLICATION_LIST</Operation>
+            <Operation>DEVICE_LOCATION</Operation>
+        </Operations>
+    </InitialOperationConfig>
+    <!--This configures the Task service for the android device-type. Given below are the property definitions.
+        <RequireStatusMonitoring> - This will enable or disable status monitoring for that particular device-type.
+        <Frequency> - The time interval (in seconds) in which the task should run for this device-type
+        <IdleTimeToMarkInactive> - The time duration (in seconds) in which the device can be moved to inactive status
+                                   which means the device will be moved to inactive status if that device does not
+                                   contact the server within that time period. Better to have a multiplier of Frequency.
+        <IdleTimeToMarkUnreachable> - The time duration (in seconds) in which the device can be moved to unreachable status
+                                      which means the device will be moved to unreachable status if that device does not
+                                      contact the server within that time period. Better to have a multiplier of Frequency.
+    -->
+    <DeviceStatusTaskConfig>
+        <RequireStatusMonitoring>true</RequireStatusMonitoring>
+        <Frequency>300</Frequency>
+        <IdleTimeToMarkInactive>900</IdleTimeToMarkInactive>
+        <IdleTimeToMarkUnreachable>600</IdleTimeToMarkUnreachable>
+    </DeviceStatusTaskConfig>
+</DeviceTypeConfiguration>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties

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

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

@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2017 WSO2 Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+    This is the main server configuration file
+
+    ${carbon.home} represents the carbon.home system property.
+    Other system properties can be specified in a similar manner.
+-->
+<Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
+
+    <!--
+       Product Name
+    -->
+    <Name>${product.name}</Name>
+
+    <!--
+       machine readable unique key to identify each product
+    -->
+    <ServerKey>${product.key}</ServerKey>
+
+    <!--
+       Product Version
+    -->
+    <Version>${product.version}</Version>
+
+    <!--
+       Host name or IP address of the machine hosting this server
+       e.g. www.wso2.org, 192.168.1.10
+       This is will become part of the End Point Reference of the
+       services deployed on this server instance.
+    -->
+    <!--HostName>www.wso2.org</HostName-->
+
+    <!--
+    Host name to be used for the Carbon management console
+    -->
+    <!--MgtHostName>mgt.wso2.org</MgtHostName-->
+
+    <!--
+        The URL of the back end server. This is where the admin services are hosted and
+        will be used by the clients in the front end server.
+        This is required only for the Front-end server. This is used when seperating BE server from FE server
+       -->
+    <ServerURL>local:/${carbon.context}/services/</ServerURL>
+    <!--
+    <ServerURL>https://${carbon.local.ip}:${carbon.management.port}${carbon.context}/services/</ServerURL>
+    -->
+     <!--
+     The URL of the index page. This is where the user will be redirected after signing in to the
+     carbon server.
+     -->
+    <!-- IndexPageURL>/carbon/admin/index.jsp</IndexPageURL-->
+
+    <!--
+    For cApp deployment, we have to identify the roles that can be acted by the current server.
+    The following property is used for that purpose. Any number of roles can be defined here.
+    Regular expressions can be used in the role.
+    Ex : <Role>.*</Role> means this server can act any role
+    -->
+    <ServerRoles>
+        <Role>${default.server.role}</Role>
+    </ServerRoles>
+
+    <!-- uncommnet this line to subscribe to a bam instance automatically -->
+    <!--<BamServerURL>https://bamhost:bamport/services/</BamServerURL>-->
+
+    <!--
+       The fully qualified name of the server
+    -->
+    <Package>org.wso2.carbon</Package>
+
+    <!--
+       Webapp context root of WSO2 Carbon management console.
+    -->
+    <WebContextRoot>/</WebContextRoot>
+
+    <!--
+    	Proxy context path is a useful parameter to add a proxy path when a Carbon server is fronted by reverse proxy. In addtion
+        to the proxy host and proxy port this parameter allows you add a path component to external URLs. e.g.
+     		URL of the Carbon server -> https://10.100.1.1:9443/carbon
+   		URL of the reverse proxy -> https://prod.abc.com/appserver/carbon
+
+   	appserver - proxy context path. This specially required whenever you are generating URLs to displace in
+   	Carbon UI components.
+    -->
+    <!--
+    	<MgtProxyContextPath></MgtProxyContextPath>
+    	<ProxyContextPath></ProxyContextPath>
+    -->
+
+    <!-- In-order to  get the registry http Port from the back-end when the default http transport is not the same-->
+    <!--RegistryHttpPort>9763</RegistryHttpPort-->
+
+    <!--
+    Number of items to be displayed on a management console page. This is used at the
+    backend server for pagination of various items.
+    -->
+    <ItemsPerPage>15</ItemsPerPage>
+
+    <!-- The endpoint URL of the cloud instance management Web service -->
+    <!--<InstanceMgtWSEndpoint>https://ec2.amazonaws.com/</InstanceMgtWSEndpoint>-->
+
+    <!--
+       Ports used by this server
+    -->
+    <Ports>
+
+        <!-- Ports offset. This entry will set the value of the ports defined below to
+         the define value + Offset.
+         e.g. Offset=2 and HTTPS port=9443 will set the effective HTTPS port to 9445
+         -->
+        <Offset>0</Offset>
+
+        <!-- The JMX Ports -->
+        <JMX>
+            <!--The port RMI registry is exposed-->
+            <RMIRegistryPort>9999</RMIRegistryPort>
+            <!--The port RMI server should be exposed-->
+            <RMIServerPort>11111</RMIServerPort>
+        </JMX>
+
+        <!-- Embedded LDAP server specific ports -->
+        <EmbeddedLDAP>
+            <!-- Port which embedded LDAP server runs -->
+            <LDAPServerPort>10389</LDAPServerPort>
+            <!-- Port which KDC (Kerberos Key Distribution Center) server runs -->
+            <KDCServerPort>8000</KDCServerPort>
+        </EmbeddedLDAP>
+	
+	<!-- 
+             Override datasources JNDIproviderPort defined in bps.xml and datasources.properties files
+	-->
+	<!--<JNDIProviderPort>2199</JNDIProviderPort>-->
+	<!--Override receive port of thrift based entitlement service.-->
+	<ThriftEntitlementReceivePort>10500</ThriftEntitlementReceivePort>
+
+    </Ports>
+
+    <!--
+        JNDI Configuration
+    -->
+    <JNDI>
+        <!-- 
+             The fully qualified name of the default initial context factory
+        -->
+        <DefaultInitialContextFactory>org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory</DefaultInitialContextFactory>
+        <!-- 
+             The restrictions that are done to various JNDI Contexts in a Multi-tenant environment 
+        -->
+        <Restrictions>
+            <!--
+                Contexts that will be available only to the super-tenant
+            -->
+            <!-- <SuperTenantOnly>
+                <UrlContexts>
+                    <UrlContext>
+                        <Scheme>foo</Scheme>
+                    </UrlContext>
+                    <UrlContext>
+                        <Scheme>bar</Scheme>
+                    </UrlContext>
+                </UrlContexts>
+            </SuperTenantOnly> -->
+            <!-- 
+                Contexts that are common to all tenants
+            -->
+            <AllTenants>
+                <UrlContexts>
+                    <UrlContext>
+                        <Scheme>java</Scheme>
+                    </UrlContext>
+                    <!-- <UrlContext>
+                        <Scheme>foo</Scheme>
+                    </UrlContext> -->
+                </UrlContexts>
+            </AllTenants>
+            <!-- 
+                 All other contexts not mentioned above will be available on a per-tenant basis 
+                 (i.e. will not be shared among tenants)
+            -->
+        </Restrictions>
+    </JNDI>
+
+    <!--
+        Property to determine if the server is running an a cloud deployment environment.
+        This property should only be used to determine deployment specific details that are
+        applicable only in a cloud deployment, i.e when the server deployed *-as-a-service.
+    -->
+    <IsCloudDeployment>false</IsCloudDeployment>
+
+    <!--
+	Property to determine whether usage data should be collected for metering purposes
+    -->
+    <EnableMetering>false</EnableMetering>
+
+    <!-- The Max time a thread should take for execution in seconds -->
+    <MaxThreadExecutionTime>600</MaxThreadExecutionTime>
+
+    <!--
+        A flag to enable or disable Ghost Deployer. By default this is set to false. That is
+        because the Ghost Deployer works only with the HTTP/S transports. If you are using
+        other transports, don't enable Ghost Deployer.
+    -->
+    <GhostDeployment>
+        <Enabled>false</Enabled>
+    </GhostDeployment>
+
+
+    <!--
+        Eager loading or lazy loading is a design pattern commonly used in computer programming which
+        will initialize an object upon creation or load on-demand. In carbon, lazy loading is used to
+        load tenant when a request is received only. Similarly Eager loading is used to enable load
+        existing tenants after carbon server starts up. Using this feature, you will be able to include
+        or exclude tenants which are to be loaded when server startup.
+
+        We can enable only one LoadingPolicy at a given time.
+
+        1. Tenant Lazy Loading
+           This is the default behaviour and enabled by default. With this policy, tenants are not loaded at
+           server startup, but loaded based on-demand (i.e when a request is received for a tenant).
+           The default tenant idle time is 30 minutes.
+
+        2. Tenant Eager Loading
+           This is by default not enabled. It can be be enabled by un-commenting the <EagerLoading> section.
+           The eager loading configurations supported are as below. These configurations can be given as the
+           value for <Include> element with eager loading.
+                (i)Load all tenants when server startup             -   *
+                (ii)Load all tenants except foo.com & bar.com       -   *,!foo.com,!bar.com
+                (iii)Load only foo.com &  bar.com to be included    -   foo.com,bar.com
+    -->
+    <Tenant>
+        <LoadingPolicy>
+            <LazyLoading>
+                <IdleTime>30</IdleTime>
+            </LazyLoading>
+            <!-- <EagerLoading>
+                   <Include>*,!foo.com,!bar.com</Include>
+            </EagerLoading>-->
+        </LoadingPolicy>
+    </Tenant>
+
+    <!--
+     Caching related configurations
+    -->
+    <Cache>
+        <!-- Default cache timeout in minutes -->
+        <DefaultCacheTimeout>15</DefaultCacheTimeout>
+    </Cache>
+
+    <!--
+    Axis2 related configurations
+    -->
+    <Axis2Config>
+        <!--
+             Location of the Axis2 Services & Modules repository
+
+             This can be a directory in the local file system, or a URL.
+
+             e.g.
+             1. /home/wso2wsas/repository/ - An absolute path
+             2. repository - In this case, the path is relative to CARBON_HOME
+             3. file:///home/wso2wsas/repository/
+             4. http://wso2wsas/repository/
+        -->
+        <RepositoryLocation>${carbon.home}/repository/deployment/server/</RepositoryLocation>
+
+        <!--
+         Deployment update interval in seconds. This is the interval between repository listener
+         executions. 
+        -->
+        <DeploymentUpdateInterval>15</DeploymentUpdateInterval>
+
+        <!--
+            Location of the main Axis2 configuration descriptor file, a.k.a. axis2.xml file
+
+            This can be a file on the local file system, or a URL
+
+            e.g.
+            1. /home/repository/axis2.xml - An absolute path
+            2. conf/axis2.xml - In this case, the path is relative to CARBON_HOME
+            3. file:///home/carbon/repository/axis2.xml
+            4. http://repository/conf/axis2.xml
+        -->
+        <ConfigurationFile>${carbon.home}/repository/conf/axis2/axis2.xml</ConfigurationFile>
+
+        <!--
+          ServiceGroupContextIdleTime, which will be set in ConfigurationContex
+          for multiple clients which are going to access the same ServiceGroupContext
+          Default Value is 30 Sec.
+        -->
+        <ServiceGroupContextIdleTime>30000</ServiceGroupContextIdleTime>
+
+        <!--
+          This repository location is used to crete the client side configuration
+          context used by the server when calling admin services.
+        -->
+        <ClientRepositoryLocation>${carbon.home}/repository/deployment/client/</ClientRepositoryLocation>
+        <!-- This axis2 xml is used in createing the configuration context by the FE server
+         calling to BE server -->
+        <clientAxis2XmlLocation>${carbon.home}/repository/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
+        <!-- If this parameter is set, the ?wsdl on an admin service will not give the admin service wsdl. -->
+        <HideAdminServiceWSDLs>true</HideAdminServiceWSDLs>
+	
+	<!--WARNING-Use With Care! Uncommenting bellow parameter would expose all AdminServices in HTTP transport.
+	With HTTP transport your credentials and data routed in public channels are vulnerable for sniffing attacks. 
+	Use bellow parameter ONLY if your communication channels are confirmed to be secured by other means -->
+        <!--HttpAdminServices>*</HttpAdminServices-->
+
+    </Axis2Config>
+
+    <!--
+       The default user roles which will be created when the server
+       is started up for the first time.
+    -->
+    <ServiceUserRoles>
+        <Role>
+            <Name>admin</Name>
+            <Description>Default Administrator Role</Description>
+        </Role>
+        <Role>
+            <Name>user</Name>
+            <Description>Default User Role</Description>
+        </Role>
+    </ServiceUserRoles>
+    
+    <!-- 
+      Enable following config to allow Emails as usernames. 	
+    -->	    	
+    <!--EnableEmailUserName>true</EnableEmailUserName-->	
+
+    <!--
+      Security configurations
+    -->
+    <Security>
+        <!--
+            KeyStore which will be used for encrypting/decrypting passwords
+            and other sensitive information.
+        -->
+        <KeyStore>
+            <!-- Keystore file location-->
+            <Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location>
+            <!-- Keystore type (JKS/PKCS12 etc.)-->
+            <Type>JKS</Type>
+            <!-- Keystore password-->
+            <Password>wso2carbon</Password>
+            <!-- Private Key alias-->
+            <KeyAlias>wso2carbon</KeyAlias>
+            <!-- Private Key password-->
+            <KeyPassword>wso2carbon</KeyPassword>
+        </KeyStore>
+
+        <!--
+            System wide trust-store which is used to maintain the certificates of all
+            the trusted parties.
+        -->
+        <TrustStore>
+            <!-- trust-store file location -->
+            <Location>${carbon.home}/repository/resources/security/client-truststore.jks</Location>
+            <!-- trust-store type (JKS/PKCS12 etc.) -->
+            <Type>JKS</Type>
+            <!-- trust-store password -->
+            <Password>wso2carbon</Password>
+        </TrustStore>
+
+        <!--
+            The Authenticator configuration to be used at the JVM level. We extend the
+            java.net.Authenticator to make it possible to authenticate to given servers and 
+            proxies.
+        -->
+        <NetworkAuthenticatorConfig>
+            <!-- 
+                Below is a sample configuration for a single authenticator. Please note that
+                all child elements are mandatory. Not having some child elements would lead to
+                exceptions at runtime.
+            -->
+            <!-- <Credential> -->
+                <!-- 
+                    the pattern that would match a subset of URLs for which this authenticator
+                    would be used
+                -->
+                <!-- <Pattern>regularExpression</Pattern> -->
+                <!-- 
+                    the type of this authenticator. Allowed values are:
+                    1. server
+                    2. proxy
+                -->
+                <!-- <Type>proxy</Type> -->
+                <!-- the username used to log in to server/proxy -->
+                <!-- <Username>username</Username> -->
+                <!-- the password used to log in to server/proxy -->
+                <!-- <Password>password</Password> -->
+            <!-- </Credential> -->
+        </NetworkAuthenticatorConfig>
+
+        <!--
+         The Tomcat realm to be used for hosted Web applications. Allowed values are;
+         1. UserManager
+         2. Memory
+
+         If this is set to 'UserManager', the realm will pick users & roles from the system's
+         WSO2 User Manager. If it is set to 'memory', the realm will pick users & roles from
+         CARBON_HOME/repository/conf/tomcat/tomcat-users.xml
+        -->
+        <TomcatRealm>UserManager</TomcatRealm>
+
+	<!--Option to disable storing of tokens issued by STS-->
+	<DisableTokenStore>false</DisableTokenStore>
+
+	<!--
+	 Security token store class name. If this is not set, default class will be
+	 org.wso2.carbon.security.util.SecurityTokenStore
+	-->
+	<!--TokenStoreClassName>org.wso2.carbon.identity.sts.store.DBTokenStore</TokenStoreClassName-->
+    </Security>
+
+    <!--
+       The temporary work directory
+    -->
+    <WorkDirectory>${carbon.home}/tmp/work</WorkDirectory>
+
+    <!--
+       House-keeping configuration
+    -->
+    <HouseKeeping>
+
+        <!--
+           true  - Start House-keeping thread on server startup
+           false - Do not start House-keeping thread on server startup.
+                   The user will run it manually as and when he wishes.
+        -->
+        <AutoStart>true</AutoStart>
+
+        <!--
+           The interval in *minutes*, between house-keeping runs
+        -->
+        <Interval>10</Interval>
+
+        <!--
+          The maximum time in *minutes*, temp files are allowed to live
+          in the system. Files/directories which were modified more than
+          "MaxTempFileLifetime" minutes ago will be removed by the
+          house-keeping task
+        -->
+        <MaxTempFileLifetime>30</MaxTempFileLifetime>
+    </HouseKeeping>
+
+    <!--
+       Configuration for handling different types of file upload & other file uploading related
+       config parameters.
+       To map all actions to a particular FileUploadExecutor, use
+       <Action>*</Action>
+    -->
+    <FileUploadConfig>
+        <!--
+           The total file upload size limit in MB
+        -->
+        <TotalFileSizeLimit>100</TotalFileSizeLimit>
+
+        <Mapping>
+            <Actions>
+                <Action>keystore</Action>
+                <Action>certificate</Action>
+                <Action>*</Action>
+            </Actions>
+            <Class>org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor</Class>
+        </Mapping>
+
+        <Mapping>
+            <Actions>
+                <Action>jarZip</Action>
+            </Actions>
+            <Class>org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor</Class>
+        </Mapping>
+        <Mapping>
+            <Actions>
+                <Action>dbs</Action>
+            </Actions>
+            <Class>org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor</Class>
+        </Mapping>
+        <Mapping>
+            <Actions>
+                <Action>tools</Action>
+            </Actions>
+            <Class>org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor</Class>
+        </Mapping>
+        <Mapping>
+            <Actions>
+                <Action>toolsAny</Action>
+            </Actions>
+            <Class>org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor</Class>
+        </Mapping>
+    </FileUploadConfig>
+
+    <!--
+       Processors which process special HTTP GET requests such as ?wsdl, ?policy etc.
+
+       In order to plug in a processor to handle a special request, simply add an entry to this
+       section.
+
+       The value of the Item element is the first parameter in the query string(e.g. ?wsdl)
+       which needs special processing
+       
+       The value of the Class element is a class which implements
+       org.wso2.carbon.transport.HttpGetRequestProcessor
+    -->
+    <HttpGetRequestProcessors>
+        <Processor>
+            <Item>info</Item>
+            <Class>org.wso2.carbon.core.transports.util.InfoProcessor</Class>
+        </Processor>
+        <Processor>
+            <Item>wsdl</Item>
+            <Class>org.wso2.carbon.core.transports.util.Wsdl11Processor</Class>
+        </Processor>
+        <Processor>
+            <Item>wsdl2</Item>
+            <Class>org.wso2.carbon.core.transports.util.Wsdl20Processor</Class>
+        </Processor>
+        <Processor>
+            <Item>xsd</Item>
+            <Class>org.wso2.carbon.core.transports.util.XsdProcessor</Class>
+        </Processor>
+    </HttpGetRequestProcessors>
+
+    <!-- Deployment Synchronizer Configuration. t Enabled value to true when running with "svn based" dep sync.
+	In master nodes you need to set both AutoCommit and AutoCheckout to true
+	and in  worker nodes set only AutoCheckout to true.
+    -->
+    <DeploymentSynchronizer>
+        <Enabled>false</Enabled>
+        <AutoCommit>false</AutoCommit>
+        <AutoCheckout>true</AutoCheckout>
+        <RepositoryType>svn</RepositoryType>
+        <SvnUrl>http://svnrepo.example.com/repos/</SvnUrl>
+        <SvnUser>username</SvnUser>
+        <SvnPassword>password</SvnPassword>
+        <SvnUrlAppendTenantId>true</SvnUrlAppendTenantId>
+    </DeploymentSynchronizer>
+
+    <!-- Deployment Synchronizer Configuration. Uncomment the following section when running with "registry based" dep sync.
+        In master nodes you need to set both AutoCommit and AutoCheckout to true
+        and in  worker nodes set only AutoCheckout to true.
+    -->
+    <!--<DeploymentSynchronizer>
+        <Enabled>true</Enabled>
+        <AutoCommit>false</AutoCommit>
+        <AutoCheckout>true</AutoCheckout>
+    </DeploymentSynchronizer>-->
+
+    <!-- Mediation persistence configurations. Only valid if mediation features are available i.e. ESB -->
+    <!--<MediationConfig>
+        <LoadFromRegistry>false</LoadFromRegistry>
+        <SaveToFile>false</SaveToFile>
+        <Persistence>enabled</Persistence>
+        <RegistryPersistence>enabled</RegistryPersistence>
+    </MediationConfig>-->
+
+    <!--
+    Server intializing code, specified as implementation classes of org.wso2.carbon.core.ServerInitializer.
+    This code will be run when the Carbon server is initialized
+    -->
+    <ServerInitializers>
+        <!--<Initializer></Initializer>-->
+    </ServerInitializers>
+    
+    <!--
+    Indicates whether the Carbon Servlet is required by the system, and whether it should be
+    registered
+    -->
+    <RequireCarbonServlet>${require.carbon.servlet}</RequireCarbonServlet>
+
+    <!--
+    Carbon H2 OSGI Configuration
+    By default non of the servers start.
+        name="web" - Start the web server with the H2 Console
+        name="webPort" - The port (default: 8082)
+        name="webAllowOthers" - Allow other computers to connect
+        name="webSSL" - Use encrypted (HTTPS) connections
+        name="tcp" - Start the TCP server
+        name="tcpPort" - The port (default: 9092)
+        name="tcpAllowOthers" - Allow other computers to connect
+        name="tcpSSL" - Use encrypted (SSL) connections
+        name="pg" - Start the PG server
+        name="pgPort"  - The port (default: 5435)
+        name="pgAllowOthers"  - Allow other computers to connect
+        name="trace" - Print additional trace information; for all servers
+        name="baseDir" - The base directory for H2 databases; for all servers  
+    -->
+    <!--H2DatabaseConfiguration>
+        <property name="web" />
+        <property name="webPort">8082</property>
+        <property name="webAllowOthers" />
+        <property name="webSSL" />
+        <property name="tcp" />
+        <property name="tcpPort">9092</property>
+        <property name="tcpAllowOthers" />
+        <property name="tcpSSL" />
+        <property name="pg" />
+        <property name="pgPort">5435</property>
+        <property name="pgAllowOthers" />
+        <property name="trace" />
+        <property name="baseDir">${carbon.home}</property>
+    </H2DatabaseConfiguration-->
+    <!--Disabling statistics reporter by default-->
+    <StatisticsReporterDisabled>true</StatisticsReporterDisabled>
+
+    <!-- Enable accessing Admin Console via HTTP -->
+    <!-- EnableHTTPAdminConsole>true</EnableHTTPAdminConsole -->
+
+    <!--
+       Default Feature Repository of WSO2 Carbon.
+    -->
+    <FeatureRepository>
+	    <RepositoryName>default repository</RepositoryName>
+	    <RepositoryURL>${p2.repo.url}</RepositoryURL>
+    </FeatureRepository>
+
+    <!--
+	Configure API Management
+   -->
+   <APIManagement>
+	
+	<!--Uses the embedded API Manager by default. If you want to use an external 
+	API Manager instance to manage APIs, configure below  externalAPIManager-->
+	
+	<Enabled>true</Enabled>
+	
+	<!--Uncomment and configure API Gateway and 
+	Publisher URLs to use external API Manager instance-->
+	
+	<!--ExternalAPIManager>
+
+		<APIGatewayURL>http://localhost:8281</APIGatewayURL>
+		<APIPublisherURL>http://localhost:8281/publisher</APIPublisherURL>
+
+	</ExternalAPIManager-->
+	
+	<LoadAPIContextsInServerStartup>true</LoadAPIContextsInServerStartup>
+   </APIManagement>
+</Server>

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

@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright (c) 2017, 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.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="DeviceManagementCore">
+    <parameter name="useDefaultListeners" value="false"/>
+    <test name="Extension Unit Tests" preserve-order="true">
+        <classes>
+            <class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/>
+        </classes>
+    </test>
+</suite>

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

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

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

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

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

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

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

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

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

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

components/device-mgt-extensions/pom.xml

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

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

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

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

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

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

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

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

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

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

@@ -394,28 +394,6 @@ public class GenericOperationDAOImpl implements OperationDAO {
         List<Activity> activities = new ArrayList<>();
         try {
             Connection conn = OperationManagementDAOFactory.getConnection();
-
-/*
-            String sql = "SELECT opm.ENROLMENT_ID, opm.CREATED_TIMESTAMP, opm.UPDATED_TIMESTAMP, opm.OPERATION_ID,\n" +
-                    "op.OPERATION_CODE, op.TYPE as OPERATION_TYPE, opm.STATUS, en.DEVICE_ID,\n" +
-                    "ops.RECEIVED_TIMESTAMP, ops.ID as OP_RES_ID, ops.OPERATION_RESPONSE,\n" +
-                    "de.DEVICE_IDENTIFICATION, dt.NAME as DEVICE_TYPE\n" +
-                    "FROM DM_ENROLMENT_OP_MAPPING AS opm\n" +
-                    "LEFT JOIN DM_OPERATION AS op ON opm.OPERATION_ID = op.ID \n" +
-                    "LEFT JOIN DM_ENROLMENT as en ON opm.ENROLMENT_ID = en.ID \n" +
-                    "LEFT JOIN DM_DEVICE as de ON en.DEVICE_ID = de.ID \n" +
-                    "LEFT JOIN DM_DEVICE_TYPE as dt ON dt.ID = de.DEVICE_TYPE_ID \n" +
-                    "LEFT JOIN DM_DEVICE_OPERATION_RESPONSE as ops ON \n" +
-                    "opm.ENROLMENT_ID = ops.ENROLMENT_ID AND opm.OPERATION_ID = ops.OPERATION_ID \n" +
-                    "WHERE opm.UPDATED_TIMESTAMP > ? \n" +
-                    "AND de.TENANT_ID = ? \n";
-
-            if (timestamp == 0) {
-                sql += "ORDER BY opm.OPERATION_ID LIMIT ? OFFSET ?;";
-            } else {
-                sql += "ORDER BY opm.UPDATED_TIMESTAMP asc LIMIT ? OFFSET ?";
-            }
-*/
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
             String sql = "SELECT " +
                     "    opr.ENROLMENT_ID, " +
@@ -650,11 +628,6 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
                 operation.setCreatedTimeStamp(rs.getTimestamp("CREATED_TIMESTAMP").toString());
                 operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
-//                if (rs.getTimestamp("RECEIVED_TIMESTAMP") == null) {
-//                    operation.setReceivedTimeStamp("");
-//                } else {
-//                    operation.setReceivedTimeStamp(rs.getTimestamp("RECEIVED_TIMESTAMP").toString());
-//                }
                 if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
                     operation.setReceivedTimeStamp("");
                 } else {
@@ -696,11 +669,6 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 operation.setId(rs.getInt("ID"));
                 operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
                 operation.setCreatedTimeStamp(rs.getTimestamp("CREATED_TIMESTAMP").toString());
-//                if (rs.getTimestamp("RECEIVED_TIMESTAMP") == null) {
-//                    operation.setReceivedTimeStamp("");
-//                } else {
-//                    operation.setReceivedTimeStamp(rs.getTimestamp("RECEIVED_TIMESTAMP").toString());
-//                }
                 if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
                     operation.setReceivedTimeStamp("");
                 } else {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java

@@ -251,7 +251,7 @@ public class ProcessorImpl implements Processor {
         if (log.isDebugEnabled()) {
             log.debug("Query : " + queryHolder.getQuery());
         }
-        Connection conn;
+        Connection conn = null;
         PreparedStatement stmt = null;
         ResultSet rs = null;
         List<Device> devices = new ArrayList<>();

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java

@@ -23,7 +23,11 @@ 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.search.Condition;
-import org.wso2.carbon.device.mgt.core.search.mgt.*;
+import org.wso2.carbon.device.mgt.core.search.mgt.Constants;
+import org.wso2.carbon.device.mgt.core.search.mgt.InvalidOperatorException;
+import org.wso2.carbon.device.mgt.core.search.mgt.QueryBuilder;
+import org.wso2.carbon.device.mgt.core.search.mgt.QueryHolder;
+import org.wso2.carbon.device.mgt.core.search.mgt.ValueType;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -135,20 +139,13 @@ public class QueryBuilderImpl implements QueryBuilder {
                                 + " LIKE  ? ";
                         ValueType type = new ValueType();
                         type.setColumnType(ValueType.columnType.STRING);
-                        type.setStringValue("%"+con.getValue()+"%");
+                        type.setStringValue("%" + con.getValue() + "%");
                         valueType[x] = type;
                         x++;
                     } else {
                         querySuffix = querySuffix + " AND DD." + Utils.getDeviceDetailsColumnNames().get(con.getKey()) + con
                                 .getOperator() + " ? ";
-                        ValueType type = new ValueType();
+                        ValueType type = this.getValueType(con);
-                        if (Utils.checkColumnType(con.getKey())) {
-                            type.setColumnType(ValueType.columnType.STRING);
-                            type.setStringValue(con.getValue());
-                        } else {
-                            type.setColumnType(ValueType.columnType.INTEGER);
-                            type.setIntValue(Integer.parseInt(con.getValue()));
-                        }
                         valueType[x] = type;
                         x++;
                     }
@@ -182,21 +179,15 @@ public class QueryBuilderImpl implements QueryBuilder {
                                 + " LIKE  ? ";
                         ValueType type = new ValueType();
                         type.setColumnType(ValueType.columnType.STRING);
-                        type.setStringValue("%"+con.getValue()+"%");
+                        type.setStringValue("%" + con.getValue() + "%");
                         valueType[x] = type;
                         x++;
                     } else {
                         querySuffix = querySuffix + " OR DD." + Utils.getDeviceDetailsColumnNames().get(con.getKey()) + con
                                 .getOperator() + " ? ";
 
-                        ValueType type = new ValueType();
+                        ValueType type = this.getValueType(con);
-                        if (Utils.checkColumnType(con.getKey())) {
+
-                            type.setColumnType(ValueType.columnType.STRING);
-                            type.setStringValue(con.getValue());
-                        } else {
-                            type.setColumnType(ValueType.columnType.INTEGER);
-                            type.setIntValue(Integer.parseInt(con.getValue()));
-                        }
                         valueType[x] = type;
                         x++;
                     }
@@ -386,4 +377,35 @@ public class QueryBuilderImpl implements QueryBuilder {
             throw new InvalidOperatorException("Error occurred while building the sql", e);
         }
     }
+
+    /**
+     * Returns a Value type based on the Condition data.
+     *
+     * @param con : The condition that passed.
+     * @re
+     */
+    private ValueType getValueType(Condition con) {
+        ValueType type = new ValueType();
+        String colValue = Utils.checkColumnType(con.getKey());
+
+        switch (colValue) {
+            case "String":
+                type.setColumnType(ValueType.columnType.STRING);
+                type.setStringValue(con.getValue());
+                break;
+            case "Double":
+                type.setColumnType(ValueType.columnType.DOUBLE);
+                type.setDoubleValue(Double.parseDouble(con.getValue()));
+                break;
+            case "Integer":
+                type.setColumnType(ValueType.columnType.INTEGER);
+                type.setIntValue(Integer.parseInt(con.getValue()));
+                break;
+            case "Long":
+                type.setColumnType(ValueType.columnType.STRING);
+                type.setLongValue(Long.parseLong(con.getValue()));
+        }
+
+        return type;
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/Utils.java

@@ -75,32 +75,56 @@ public class Utils {
 
     }
 
-    public static boolean checkColumnType(String column) {
+    public static String checkColumnType(String column) {
 
-        boolean bool = false;
+        String type;
 
         switch (column) {
             case "deviceModel":
-                bool = true;
+                type = "String";
                 break;
             case "vendor":
-                bool = true;
+                type = "String";
                 break;
             case "osVersion":
-                bool = true;
+                type = "String";
                 break;
             case "connectionType":
-                bool = true;
+                type = "String";
                 break;
             case "ssid":
-                bool = true;
+                type = "String";
+                break;
+            case "imei":
+                type = "String";
+                break;
+            case "imsi":
+                type = "String";
+                break;
+            case "batteryLevel":
+                type = "Double";
+                break;
+            case "internalTotalMemory":
+                type = "Double";
+                break;
+            case "internalAvailableMemory":
+                type = "Double";
+                break;
+            case "externalAvailableMemory":
+                type = "Double";
+                break;
+            case "externalTotalMemory":
+                type = "Double";
+                break;
+            case "cpuUsage":
+                type = "Double";
                 break;
             default:
-                bool = false;
+                type = "String";
                 break;
         }
 
-        return bool;
+        return type;
     }
 
     public static Map<String, String> getDeviceDetailsColumnNames() {

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

@@ -66,8 +66,11 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dao.EnrollmentDAO;
+import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
+import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
 import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsDAO;
 import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsMgtDAOException;
+import org.wso2.carbon.device.mgt.core.device.details.mgt.impl.DeviceInformationManagerImpl;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
@@ -272,6 +275,18 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                 DeviceManagementDAOFactory.closeConnection();
             }
 
+            if (device.getDeviceInfo() != null) {
+                DeviceInformationManager deviceInformationManager = new DeviceInformationManagerImpl();
+                try {
+                    deviceInformationManager.addDeviceInfo(deviceIdentifier, device.getDeviceInfo());
+                } catch (DeviceDetailsMgtException e) {
+                    String msg = "Error occurred while adding device info for the device " +
+                            device.getDeviceIdentifier();
+                   log.error(msg, e);
+                   throw new DeviceManagementException(msg, e);
+                }
+            }
+
             if (log.isDebugEnabled()) {
                 log.debug("An enrolment is successfully created with the id '" + enrolmentId + "' associated with " +
                         "the device identified by key '" + device.getDeviceIdentifier() + "', which belongs to " +

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

@@ -21,10 +21,7 @@ package org.wso2.carbon.device.mgt.core.common;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeSuite;
 import org.w3c.dom.Document;
@@ -59,14 +56,11 @@ import javax.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.InputStream;
 import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.sql.Statement;
 
 public abstract class BaseDeviceManagementTest {
 
     private DataSource dataSource;
-    private static final Log log = LogFactory.getLog(BaseDeviceManagementTest.class);
 
     @BeforeSuite
     public void setupDataSource() throws Exception {
@@ -77,7 +71,8 @@ public abstract class BaseDeviceManagementTest {
     }
 
     protected void initDataSource() throws Exception {
-        this.dataSource = this.getDataSource(this.readDataSourceConfig());
+        this.dataSource = this.getDataSource(this.
+                readDataSourceConfig("src/test/resources/config/datasource/data-source-config.xml"));
         DeviceManagementDAOFactory.init(dataSource);
         GroupManagementDAOFactory.init(dataSource);
         OperationManagementDAOFactory.init(dataSource);
@@ -116,7 +111,7 @@ public abstract class BaseDeviceManagementTest {
     @BeforeClass
     public abstract void init() throws Exception;
 
-    private DataSource getDataSource(DataSourceConfig config) {
+    protected DataSource getDataSource(DataSourceConfig config) {
         PoolProperties properties = new PoolProperties();
         properties.setUrl(config.getUrl());
         properties.setDriverClassName(config.getDriverClassName());
@@ -151,9 +146,9 @@ public abstract class BaseDeviceManagementTest {
         PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID);
     }
 
-    private DataSourceConfig readDataSourceConfig() throws DeviceManagementException {
+    protected DataSourceConfig readDataSourceConfig(String configLocation) throws DeviceManagementException {
         try {
-            File file = new File("src/test/resources/config/datasource/data-source-config.xml");
+            File file = new File(configLocation);
             Document doc = DeviceManagerUtil.convertToDocument(file);
             JAXBContext testDBContext = JAXBContext.newInstance(DataSourceConfig.class);
             Unmarshaller unmarshaller = testDBContext.createUnmarshaller();

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

@@ -0,0 +1,316 @@
+/*
+*  Copyright (c) 2017, 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.core.mock;
+
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
+/**
+ * This is mock class which provides mock database connection.
+ */
+public class MockConnection implements Connection {
+    @Override
+    public Statement createStatement() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public CallableStatement prepareCall(String sql) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public String nativeSQL(String sql) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void setAutoCommit(boolean autoCommit) throws SQLException {
+
+    }
+
+    @Override
+    public boolean getAutoCommit() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public void commit() throws SQLException {
+
+    }
+
+    @Override
+    public void rollback() throws SQLException {
+
+    }
+
+    @Override
+    public void close() throws SQLException {
+
+    }
+
+    @Override
+    public boolean isClosed() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public DatabaseMetaData getMetaData() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void setReadOnly(boolean readOnly) throws SQLException {
+
+    }
+
+    @Override
+    public boolean isReadOnly() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public void setCatalog(String catalog) throws SQLException {
+
+    }
+
+    @Override
+    public String getCatalog() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void setTransactionIsolation(int level) throws SQLException {
+
+    }
+
+    @Override
+    public int getTransactionIsolation() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public SQLWarning getWarnings() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void clearWarnings() throws SQLException {
+
+    }
+
+    @Override
+    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
+            throws SQLException {
+        return null;
+    }
+
+    @Override
+    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
+            throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Map<String, Class<?>> getTypeMap() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+
+    }
+
+    @Override
+    public void setHoldability(int holdability) throws SQLException {
+
+    }
+
+    @Override
+    public int getHoldability() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public Savepoint setSavepoint() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Savepoint setSavepoint(String name) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void rollback(Savepoint savepoint) throws SQLException {
+
+    }
+
+    @Override
+    public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+
+    }
+
+    @Override
+    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
+                                              int resultSetHoldability) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
+                                         int resultSetHoldability) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Clob createClob() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Blob createBlob() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public NClob createNClob() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public SQLXML createSQLXML() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean isValid(int timeout) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+
+    }
+
+    @Override
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+
+    }
+
+    @Override
+    public String getClientInfo(String name) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Properties getClientInfo() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void setSchema(String schema) throws SQLException {
+
+    }
+
+    @Override
+    public String getSchema() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void abort(Executor executor) throws SQLException {
+
+    }
+
+    @Override
+    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
+
+    }
+
+    @Override
+    public int getNetworkTimeout() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;
+    }
+}

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

@@ -0,0 +1,99 @@
+/*
+*  Copyright (c) 2017, 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.core.mock;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+import javax.sql.DataSource;
+
+/**
+ * This is the mock data source implementation that will be used in the test cases.
+ *
+ */
+public class MockDataSource implements DataSource {
+    private boolean throwException = false;
+    private Connection connection;
+
+    @Override
+    public Connection getConnection() throws SQLException {
+        if (throwException) {
+            throw new SQLException("Cannot created test connection.");
+        } else {
+            if (connection != null) {
+                return connection;
+            }
+            return new MockConnection();
+        }
+    }
+
+    @Override
+    public Connection getConnection(String username, String password) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public PrintWriter getLogWriter() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void setLogWriter(PrintWriter out) throws SQLException {
+
+    }
+
+    @Override
+    public void setLoginTimeout(int seconds) throws SQLException {
+
+    }
+
+    @Override
+    public int getLoginTimeout() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+
+    public void setThrowException(boolean throwException) {
+        this.throwException = throwException;
+    }
+
+    public void reset() {
+        this.throwException = false;
+        this.connection = null;
+    }
+
+    private void setConnection(Connection connection) {
+        this.connection = connection;
+    }
+}

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

@@ -0,0 +1,69 @@
+/*
+*  Copyright (c) 2017, 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.core.mock;
+
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+/**
+ * This is the mock JDBC driver which is used in the testcases to mock other database operations.
+ */
+public class MockJDBCDriver implements Driver {
+
+    @Override
+    public Connection connect(String url, Properties info) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean acceptsURL(String url) throws SQLException {
+        return true;
+    }
+
+    @Override
+    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
+        return new DriverPropertyInfo[0];
+    }
+
+    @Override
+    public int getMajorVersion() {
+        return 0;
+    }
+
+    @Override
+    public int getMinorVersion() {
+        return 0;
+    }
+
+    @Override
+    public boolean jdbcCompliant() {
+        return true;
+    }
+
+    @Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,250 @@
+/*
+*  Copyright (c) 2017, 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.core.mock;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+
+/**
+ * This is the mock statement for the testcases.
+ */
+public class MockStatement implements Statement {
+
+    @Override
+    public ResultSet executeQuery(String sql) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public int executeUpdate(String sql) throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public void close() throws SQLException {
+
+    }
+
+    @Override
+    public int getMaxFieldSize() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public void setMaxFieldSize(int max) throws SQLException {
+
+    }
+
+    @Override
+    public int getMaxRows() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public void setMaxRows(int max) throws SQLException {
+
+    }
+
+    @Override
+    public void setEscapeProcessing(boolean enable) throws SQLException {
+
+    }
+
+    @Override
+    public int getQueryTimeout() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public void setQueryTimeout(int seconds) throws SQLException {
+
+    }
+
+    @Override
+    public void cancel() throws SQLException {
+
+    }
+
+    @Override
+    public SQLWarning getWarnings() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void clearWarnings() throws SQLException {
+
+    }
+
+    @Override
+    public void setCursorName(String name) throws SQLException {
+
+    }
+
+    @Override
+    public boolean execute(String sql) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public ResultSet getResultSet() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public int getUpdateCount() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean getMoreResults() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public void setFetchDirection(int direction) throws SQLException {
+
+    }
+
+    @Override
+    public int getFetchDirection() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public void setFetchSize(int rows) throws SQLException {
+
+    }
+
+    @Override
+    public int getFetchSize() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getResultSetConcurrency() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int getResultSetType() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public void addBatch(String sql) throws SQLException {
+
+    }
+
+    @Override
+    public void clearBatch() throws SQLException {
+
+    }
+
+    @Override
+    public int[] executeBatch() throws SQLException {
+        return new int[0];
+    }
+
+    @Override
+    public Connection getConnection() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean getMoreResults(int current) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public ResultSet getGeneratedKeys() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public int executeUpdate(String sql, String[] columnNames) throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean execute(String sql, int[] columnIndexes) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public boolean execute(String sql, String[] columnNames) throws SQLException {
+        return false;
+    }
+
+    @Override
+    public int getResultSetHoldability() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean isClosed() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public void setPoolable(boolean poolable) throws SQLException {
+
+    }
+
+    @Override
+    public boolean isPoolable() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public void closeOnCompletion() throws SQLException {
+
+    }
+
+    @Override
+    public boolean isCloseOnCompletion() throws SQLException {
+        return false;
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;
+    }
+}

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

@@ -0,0 +1,228 @@
+/*
+*  Copyright (c) 2017, 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.core.operation;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.PaginationRequest;
+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.common.push.notification.NotificationStrategy;
+import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
+import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
+import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import org.wso2.carbon.device.mgt.core.mock.MockDataSource;
+import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
+import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import javax.sql.DataSource;
+
+/**
+ * Negative testcases for {@link OperationManagerImpl}
+ * regarding the database connectivity.
+ */
+public class OperationManagementNegativeDBOperationTest extends BaseDeviceManagementTest {
+
+    private static final String DEVICE_TYPE = "NEGDB_OP_TEST_TYPE";
+    private static final String DEVICE_ID_PREFIX = "NEGDB_OP-TEST-DEVICE-ID-";
+    private static final int NO_OF_DEVICES = 5;
+    private static final String ADMIN_USER = "admin";
+
+    private List<DeviceIdentifier> deviceIds = new ArrayList<>();
+    private OperationManager operationMgtService;
+    private MockDataSource dataSource;
+
+
+    @BeforeClass
+    @Override
+    public void init() throws Exception {
+        DataSource datasource = this.getDataSource(this.
+                readDataSourceConfig("src/test/resources/config/datasource/mock-data-source-config.xml"));
+        OperationManagementDAOFactory.init(datasource);
+        for (int i = 0; i < NO_OF_DEVICES; i++) {
+            deviceIds.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
+        }
+        List<Device> devices = TestDataHolder.generateDummyDeviceData(this.deviceIds);
+        DeviceManagementProviderService deviceMgtService = DeviceManagementDataHolder.getInstance().
+                getDeviceManagementProvider();
+        deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
+                MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
+        for (Device device : devices) {
+            deviceMgtService.enrollDevice(device);
+        }
+        List<Device> returnedDevices = deviceMgtService.getAllDevices(DEVICE_TYPE);
+        for (Device device : returnedDevices) {
+            if (!device.getDeviceIdentifier().startsWith(DEVICE_ID_PREFIX)) {
+                throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
+            }
+        }
+        NotificationStrategy notificationStrategy = new TestNotificationStrategy();
+        this.operationMgtService = new OperationManagerImpl(DEVICE_TYPE, notificationStrategy);
+        this.setMockDataSource();
+    }
+
+    @Test(description = "Get operation by device id", expectedExceptions = OperationManagementException.class)
+    public void getOperations() throws OperationManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperations(this.deviceIds.get(0));
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get operations with paginated request",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationsPaginatedRequest() throws OperationManagementException {
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID, true);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(ADMIN_USER);
+        PaginationRequest request = new PaginationRequest(1, 2);
+        request.setDeviceType(DEVICE_TYPE);
+        request.setOwner(ADMIN_USER);
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperations(this.deviceIds.get(0), request);
+        } finally {
+            PrivilegedCarbonContext.endTenantFlow();
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get pending operations", expectedExceptions = OperationManagementException.class)
+    public void getPendingOperations() throws OperationManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getPendingOperations(this.deviceIds.get(0));
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get next pending operations", expectedExceptions = OperationManagementException.class)
+    public void getNextPendingOperations() throws OperationManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getNextPendingOperation(this.deviceIds.get(0));
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get operation by device and operation id",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByDeviceAndOperationId() throws OperationManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperationByDeviceAndOperationId(this.deviceIds.get(0), 1);
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get operation by device and status",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByDeviceAndStatus() throws OperationManagementException, DeviceManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperationsByDeviceAndStatus(this.deviceIds.get(0), Operation.Status.PENDING);
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get operation by operation id",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByOperationId() throws OperationManagementException, DeviceManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperation(1);
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get operation by activity id",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByActivityId() throws OperationManagementException, DeviceManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperationByActivityId("ACTIVITY_1");
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get operation by activity id and device id",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByActivityAndDeviceID() throws OperationManagementException, DeviceManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getOperationByActivityIdAndDevice("ACTIVITY_1", deviceIds.get(0));
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get activities updated after some timestamp",
+            expectedExceptions = OperationManagementException.class)
+    public void getActivitiesUpdatedAfter() throws OperationManagementException, DeviceManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getActivitiesUpdatedAfter(System.currentTimeMillis() / 1000, 10, 0);
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    @Test(description = "Get activities count updated after some timestamp",
+            expectedExceptions = OperationManagementException.class)
+    public void getActivityCountUpdatedAfter() throws OperationManagementException, DeviceManagementException {
+        this.dataSource.setThrowException(true);
+        try {
+            this.operationMgtService.getActivityCountUpdatedAfter(System.currentTimeMillis() / 1000);
+        } finally {
+            this.dataSource.reset();
+        }
+    }
+
+    private void setMockDataSource() throws NoSuchFieldException, IllegalAccessException {
+        Field datasource = OperationManagementDAOFactory.class.getDeclaredField("dataSource");
+        datasource.setAccessible(true);
+        this.dataSource = new MockDataSource();
+        datasource.set(datasource, this.dataSource);
+    }
+
+    @AfterClass
+    public void resetDatabase() throws DeviceManagementException {
+        OperationManagementDAOFactory.init(this.getDataSource(this.
+                readDataSourceConfig("src/test/resources/config/datasource/data-source-config.xml")));
+    }
+}

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

@@ -0,0 +1,196 @@
+/*
+*  Copyright (c) 2017, 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.core.operation;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.PaginationRequest;
+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.common.push.notification.NotificationStrategy;
+import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
+import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
+import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
+import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+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.dao.OperationManagementDAOFactory;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.sql.DataSource;
+
+/**
+ * This is the testcase which covers the methods from {@link OperationManager}
+ */
+public class OperationManagementNoDBSchemaTests extends BaseDeviceManagementTest {
+
+    private static final String DEVICE_TYPE = "NEG_OP_TEST_TYPE";
+    private static final String DEVICE_ID_PREFIX = "NEG_OP-TEST-DEVICE-ID-";
+    private static final String COMMAND_OPERATON_CODE = "COMMAND-TEST";
+    private static final int NO_OF_DEVICES = 5;
+    private static final String ADMIN_USER = "admin";
+
+    private List<DeviceIdentifier> deviceIds = new ArrayList<>();
+    private OperationManager operationMgtService;
+
+    @BeforeClass
+    public void init() throws Exception {
+        DataSource datasource = this.getDataSource(this.
+                readDataSourceConfig("src/test/resources/config/datasource/no-table-data-source-config.xml"));
+        OperationManagementDAOFactory.init(datasource);
+        for (int i = 0; i < NO_OF_DEVICES; i++) {
+            deviceIds.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
+        }
+        List<Device> devices = TestDataHolder.generateDummyDeviceData(this.deviceIds);
+        DeviceManagementProviderService deviceMgtService = DeviceManagementDataHolder.getInstance().
+                getDeviceManagementProvider();
+        deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
+                MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
+        for (Device device : devices) {
+            deviceMgtService.enrollDevice(device);
+        }
+        List<Device> returnedDevices = deviceMgtService.getAllDevices(DEVICE_TYPE);
+        for (Device device : returnedDevices) {
+            if (!device.getDeviceIdentifier().startsWith(DEVICE_ID_PREFIX)) {
+                throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
+            }
+        }
+        NotificationStrategy notificationStrategy = new TestNotificationStrategy();
+        this.operationMgtService = new OperationManagerImpl(DEVICE_TYPE, notificationStrategy);
+    }
+
+    @Test(description = "add operation", expectedExceptions = OperationManagementException.class)
+    public void addCommandOperation() throws DeviceManagementException, OperationManagementException,
+            InvalidDeviceException {
+        this.operationMgtService.addOperation(
+                OperationManagementTests.getOperation(new CommandOperation(),
+                        Operation.Type.COMMAND, COMMAND_OPERATON_CODE),
+                this.deviceIds);
+    }
+
+    @Test(description = "Get operations", expectedExceptions = OperationManagementException.class)
+    public void getOperations() throws DeviceManagementException, OperationManagementException,
+            InvalidDeviceException {
+        for (DeviceIdentifier deviceIdentifier : deviceIds) {
+            this.operationMgtService.getOperations(deviceIdentifier);
+        }
+    }
+
+
+    @Test(description = "Get Pending operations", expectedExceptions = OperationManagementException.class)
+    public void getPendingOperations() throws DeviceManagementException, OperationManagementException,
+            InvalidDeviceException {
+        for (DeviceIdentifier deviceIdentifier : deviceIds) {
+            this.operationMgtService.getPendingOperations(deviceIdentifier);
+        }
+    }
+
+    @Test(description = "Get paginated request", expectedExceptions = OperationManagementException.class)
+    public void getPaginatedRequestAsAdmin() throws OperationManagementException {
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID, true);
+        PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(ADMIN_USER);
+        PaginationRequest request = new PaginationRequest(1, 2);
+        request.setDeviceType(DEVICE_TYPE);
+        request.setOwner(ADMIN_USER);
+        for (DeviceIdentifier deviceIdentifier : deviceIds) {
+            this.operationMgtService.getOperations(deviceIdentifier, request);
+        }
+        PrivilegedCarbonContext.endTenantFlow();
+    }
+
+    @Test(description = "Update operation", expectedExceptions = OperationManagementException.class)
+    public void updateOperation() throws OperationManagementException {
+        DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+        Operation operation = OperationManagementTests.getOperation(new CommandOperation(), Operation.Type.COMMAND,
+                COMMAND_OPERATON_CODE);
+        operation.setStatus(Operation.Status.COMPLETED);
+        operation.setOperationResponse("The operation is successfully completed");
+        this.operationMgtService.updateOperation(deviceIdentifier, operation);
+    }
+
+    @Test(description = "Get next pending operation", expectedExceptions = OperationManagementException.class)
+    public void getNextPendingOperation() throws OperationManagementException {
+        DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+        this.operationMgtService.getNextPendingOperation(deviceIdentifier);
+    }
+
+
+    @Test(description = "get operation by device and operation id",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByDeviceAndOperationId() throws OperationManagementException {
+        DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+        this.operationMgtService.getOperationByDeviceAndOperationId(deviceIdentifier, 1);
+    }
+
+    @Test(description = "Get operation by device and status",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationsByDeviceAndStatus() throws OperationManagementException, DeviceManagementException {
+        DeviceIdentifier deviceIdentifier = this.deviceIds.get(0);
+        this.operationMgtService.getOperationsByDeviceAndStatus(deviceIdentifier,
+                Operation.Status.PENDING);
+    }
+
+    @Test(description = "Get operation by operation id", expectedExceptions = OperationManagementException.class)
+    public void getOperation() throws OperationManagementException, DeviceManagementException {
+        this.operationMgtService.getOperation(1);
+    }
+
+    @Test(description = "Get operation activity", expectedExceptions = OperationManagementException.class)
+    public void getOperationActivity() throws OperationManagementException {
+        this.operationMgtService.getOperationByActivityId
+                (DeviceManagementConstants.OperationAttributes.ACTIVITY + "1");
+    }
+
+    @Test(description = "Get operation by activity id and device",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationByActivityIdAndDevice() throws OperationManagementException {
+        this.operationMgtService.getOperationByActivityIdAndDevice(
+                DeviceManagementConstants.OperationAttributes.ACTIVITY + "1", this.deviceIds.get(0));
+    }
+
+    @Test(description = "Get activities updated after some time",
+            expectedExceptions = OperationManagementException.class)
+    public void getOperationUpdatedAfterWithLimitAndOffset() throws OperationManagementException {
+        this.operationMgtService.getActivitiesUpdatedAfter(System.currentTimeMillis() / 1000, 10, 0);
+    }
+
+    @Test(description = "Get activity count updated after",
+            expectedExceptions = OperationManagementException.class)
+    public void getActivityCountUpdatedAfter() throws OperationManagementException {
+        this.operationMgtService.getActivityCountUpdatedAfter(System.currentTimeMillis() / 1000);
+    }
+
+    @AfterClass
+    public void resetDatabase() throws DeviceManagementException {
+        OperationManagementDAOFactory.init(this.getDataSource(this.
+                readDataSourceConfig("src/test/resources/config/datasource/data-source-config.xml")));
+    }
+}

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

@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2017, 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.core.search;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.powermock.api.mockito.PowerMockito;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
+import org.wso2.carbon.device.mgt.common.search.Condition;
+import org.wso2.carbon.device.mgt.common.search.SearchContext;
+import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
+import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
+import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
+import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import org.wso2.carbon.device.mgt.core.search.mgt.InvalidOperatorException;
+import org.wso2.carbon.device.mgt.core.search.mgt.SearchMgtException;
+import org.wso2.carbon.device.mgt.core.search.mgt.impl.ProcessorImpl;
+import org.wso2.carbon.device.mgt.core.search.util.ChangeEnumValues;
+import org.wso2.carbon.device.mgt.core.search.util.Utils;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import javax.sql.DataSource;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This class holds unit test cases for org.wso2.carbon.device.mgt.core.search.mgt.impl.ProcessorImpl
+ * */
+public class ProcessorImplTest extends BaseDeviceManagementTest{
+
+    private DeviceAccessAuthorizationService deviceAccessAuthorizationService;
+    private static final Log log = LogFactory.getLog(SearchManagementServiceTest.class);
+    private static List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+    private static final String DEVICE_ID_PREFIX = "SEARCH-DEVICE-ID-";
+    private static final String DEVICE_TYPE = "SEARCH_TYPE";
+
+    @BeforeClass
+    public void init() throws Exception {
+        deviceAccessAuthorizationService = DeviceManagementDataHolder.getInstance()
+                .getDeviceAccessAuthorizationService();
+
+        for (int i = 0; i < 5; i++) {
+            deviceIdentifiers.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
+        }
+        DeviceManagementProviderService deviceMgtService = new DeviceManagementProviderServiceImpl();
+        DeviceManagementServiceComponent.notifyStartupListeners();
+        DeviceManagementDataHolder.getInstance().setDeviceManagementProvider(deviceMgtService);
+        deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
+                MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
+
+        List<Device> devices = TestDataHolder.generateDummyDeviceData(deviceIdentifiers);
+        for (Device device : devices) {
+            device.setDeviceInfo(Utils.getDeviceInfo());
+            deviceMgtService.enrollDevice(device);
+        }
+        List<Device> returnedDevices = deviceMgtService.getAllDevices(DEVICE_TYPE, true);
+        for (Device device : returnedDevices) {
+            if (!device.getDeviceIdentifier().startsWith(DEVICE_ID_PREFIX)) {
+                throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
+            }
+        }
+    }
+
+    @Test(description = "Test the Search Processor")
+    public void testWithNoDeviceAccessAuthorization() throws Exception {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("batteryLevel");
+        cond.setOperator("=");
+        cond.setValue("40");
+        cond.setState(Condition.State.AND);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        ProcessorImpl processor = new ProcessorImpl();
+        Field deviceAccessAuthorizationServiceField = ProcessorImpl.class.getDeclaredField
+                ("deviceAccessAuthorizationService");
+        deviceAccessAuthorizationServiceField.setAccessible(true);
+        deviceAccessAuthorizationServiceField.set(processor, null);
+
+        List<Device> searchedDevices = processor.execute(context);
+
+        Assert.assertEquals(0, searchedDevices.size());
+    }
+
+
+    @Test(description = "Test for invalid state")
+    public void testInvalidState() throws SearchMgtException {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        ChangeEnumValues.addEnum(Condition.State.class, "BLA");
+
+        Condition.State state = Condition.State.valueOf("BLA");
+
+        Condition cond = new Condition();
+        cond.setKey("batteryLevel");
+        cond.setOperator("=");
+        cond.setValue("40");
+        cond.setState(Condition.State.AND);
+        conditions.add(cond);
+
+        Condition cond2 = new Condition();
+        cond2.setKey("LOCATION");
+        cond2.setOperator("=");
+        cond2.setValue("Karandeniya");
+        cond2.setState(Condition.State.AND);
+        conditions.add(cond2);
+
+        Condition cond3 = new Condition();
+        cond3.setKey("batteryLevel");
+        cond3.setOperator("=");
+        cond3.setValue("23.0");
+        cond3.setState(state);
+        conditions.add(cond3);
+
+        context.setConditions(conditions);
+
+        ProcessorImpl processor = new ProcessorImpl();
+        try {
+            processor.execute(context);
+        } catch (SearchMgtException e) {
+            if (!(e.getCause() instanceof InvalidOperatorException)) {
+                throw e;
+            }
+        }
+    }
+
+    @Test(description = "Test when Device Access Authorization is null", expectedExceptions = {IllegalStateException
+            .class}, dependsOnMethods = {"testWithNoDeviceAccessAuthorization", "testInvalidState"})
+    public void testProcessorInitializationError() throws ClassNotFoundException, NoSuchMethodException,
+            NoSuchFieldException,
+            IllegalAccessException, SearchMgtException {
+        DeviceManagementDataHolder deviceManagementDataHolder = DeviceManagementDataHolder.getInstance();
+        Field field = DeviceManagementDataHolder.class.getDeclaredField("deviceAccessAuthorizationService");
+        field.setAccessible(true);
+        field.set(deviceManagementDataHolder, null);
+
+        ProcessorImpl processor = new ProcessorImpl();
+        processor.execute(null);
+    }
+}

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

@@ -1,183 +0,0 @@
-/*
- * 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.core.search;
-
-import com.google.gson.Gson;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.search.Condition;
-import org.wso2.carbon.device.mgt.common.search.SearchContext;
-import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
-import org.wso2.carbon.device.mgt.core.search.mgt.impl.SearchManagerServiceImpl;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SearchDevice extends BaseDeviceManagementTest {
-
-    private static final Log log = LogFactory.getLog(SearchDevice.class);
-
-    @BeforeClass
-    @Override
-    public void init() throws Exception {
-        DeviceManagementProviderService deviceManagementProviderService = new DeviceManagementProviderServiceImpl();
-        DeviceManagementDataHolder.getInstance().setDeviceManagementProvider(deviceManagementProviderService);
-    }
-
-    @Test
-    public void searchDeviceDetails() throws Exception {
-
-        SearchContext context = new SearchContext();
-        List<Condition> conditions = new ArrayList<>();
-
-
-        Condition cond = new Condition();
-        cond.setKey("BATTERY_VOLTAGE");
-        cond.setOperator("=");
-        cond.setValue("40");
-        cond.setState(Condition.State.AND);
-        conditions.add(cond);
-
-//        Condition cond2 = new Condition();
-//        cond2.setKey("CPU_USAGE");
-//        cond2.setOperator(">");
-//        cond2.setValue("40");
-//        cond2.setState(Condition.State.OR);
-//        conditions.add(cond2);
-//
-//        Condition cond3 = new Condition();
-//        cond3.setKey("LOCATION");
-//        cond3.setOperator("=");
-//        cond3.setValue("Colombo");
-//        cond3.setState(Condition.State.AND);
-//        conditions.add(cond3);
-
-        context.setConditions(conditions);
-
-        SearchManagerService service = new SearchManagerServiceImpl();
-        List<Device> devices = service.search(context);
-
-        Gson gson = new Gson();
-        String bbbb = gson.toJson(devices);
-        log.info(bbbb);
-
-
-        for (Device device : devices) {
-            log.debug(device.getDescription());
-            log.debug(device.getDeviceIdentifier());
-        }
-
-    }
-
-    @Test
-    public void doValidLocationSearch() throws Exception {
-
-        SearchContext context = new SearchContext();
-        List<Condition> conditions = new ArrayList<>();
-
-        Condition cond = new Condition();
-        cond.setKey("LOCATION");
-        cond.setOperator("=");
-        cond.setValue("Karan");
-        cond.setState(Condition.State.AND);
-        conditions.add(cond);
-
-        context.setConditions(conditions);
-
-        SearchManagerService service = new SearchManagerServiceImpl();
-        List<Device> devices = service.search(context);
-
-        Gson gson = new Gson();
-        String bbbb = gson.toJson(devices);
-        log.info("Valid Search " + bbbb);
-
-
-        for (Device device : devices) {
-            log.debug(device.getDescription());
-            log.debug(device.getDeviceIdentifier());
-        }
-    }
-
-    @Test
-    public void doInvalidLocationSearch() throws Exception {
-
-        SearchContext context = new SearchContext();
-        List<Condition> conditions = new ArrayList<>();
-
-        Condition cond = new Condition();
-        cond.setKey("LOCATION");
-        cond.setOperator("=");
-        cond.setValue("Colombo");
-        cond.setState(Condition.State.AND);
-        conditions.add(cond);
-
-        context.setConditions(conditions);
-
-        SearchManagerService service = new SearchManagerServiceImpl();
-        List<Device> devices = service.search(context);
-
-        Gson gson = new Gson();
-        String bbbb = gson.toJson(devices);
-        log.info("Invalid Search " + bbbb);
-
-
-        for (Device device : devices) {
-            log.debug(device.getDescription());
-            log.debug(device.getDeviceIdentifier());
-        }
-    }
-
-    @Test
-    public void doStringSearch() throws Exception {
-
-        SearchContext context = new SearchContext();
-        List<Condition> conditions = new ArrayList<>();
-
-        Condition cond = new Condition();
-        cond.setKey("deviceModel");
-        cond.setOperator("=");
-        cond.setValue("SM-T520");
-        cond.setState(Condition.State.AND);
-        conditions.add(cond);
-
-        context.setConditions(conditions);
-
-        SearchManagerService service = new SearchManagerServiceImpl();
-        List<Device> devices = service.search(context);
-
-        Gson gson = new Gson();
-        String bbbb = gson.toJson(devices);
-        log.info("Invalid Search " + bbbb);
-
-
-        for (Device device : devices) {
-            log.debug(device.getDescription());
-            log.debug(device.getDeviceIdentifier());
-        }
-    }
-}
-

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

@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2017, 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.core.search;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.search.Condition;
+import org.wso2.carbon.device.mgt.common.search.SearchContext;
+import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
+import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
+import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
+import org.wso2.carbon.device.mgt.core.search.mgt.InvalidOperatorException;
+import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
+import org.wso2.carbon.device.mgt.core.search.mgt.SearchMgtException;
+import org.wso2.carbon.device.mgt.core.search.mgt.impl.SearchManagerServiceImpl;
+import org.wso2.carbon.device.mgt.core.search.util.Utils;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * This class contains unit tests for the class SearchManagerService
+ * */
+public class SearchManagementServiceTest extends BaseDeviceManagementTest {
+
+    private static final Log log = LogFactory.getLog(SearchManagementServiceTest.class);
+    private static List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+    private static final String DEVICE_ID_PREFIX = "SEARCH-DEVICE-ID-";
+    private static final String DEVICE_TYPE = "SEARCH_TYPE";
+
+    @BeforeClass
+    public void init() throws Exception {
+        DeviceManagementDataHolder.getInstance().getDeviceAccessAuthorizationService();
+
+        for (int i = 0; i < 5; i++) {
+            deviceIdentifiers.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
+        }
+        DeviceManagementProviderService deviceMgtService = new DeviceManagementProviderServiceImpl();
+        DeviceManagementServiceComponent.notifyStartupListeners();
+        DeviceManagementDataHolder.getInstance().setDeviceManagementProvider(deviceMgtService);
+        deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
+                MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
+
+        List<Device> devices = TestDataHolder.generateDummyDeviceData(deviceIdentifiers);
+        for (Device device : devices) {
+            device.setDeviceInfo(Utils.getDeviceInfo());
+            deviceMgtService.enrollDevice(device);
+        }
+        List<Device> returnedDevices = deviceMgtService.getAllDevices(DEVICE_TYPE, true);
+        for (Device device : returnedDevices) {
+            if (!device.getDeviceIdentifier().startsWith(DEVICE_ID_PREFIX)) {
+                throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
+            }
+        }
+    }
+
+    @Test(description = "Search for device details.")
+    public void searchDeviceDetails() throws Exception {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("batteryVoltage");
+        cond.setOperator("=");
+        cond.setValue("40");
+        cond.setState(Condition.State.OR);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+        Assert.assertTrue(devices != null);
+    }
+
+    @Test(description = "Search devices by location")
+    public void doValidLocationSearch() throws Exception {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("LOCATION");
+        cond.setOperator("=");
+        cond.setValue("Karandeniya");
+        cond.setState(Condition.State.AND);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+        Assert.assertTrue(devices != null);
+    }
+
+    @Test(description = "Search devices by location.")
+    public void doInvalidLocationSearch() throws Exception {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("LOCATION");
+        cond.setOperator("=");
+        cond.setValue("Colombo");
+        cond.setState(Condition.State.AND);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+        Assert.assertTrue(devices.size() == 0);
+    }
+
+    @Test(description = "Search devices by string parameter.")
+    public void testStringSearch() throws Exception {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("deviceModel");
+        cond.setOperator("=");
+        cond.setValue("SM-T520");
+        cond.setState(Condition.State.AND);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+
+        Assert.assertTrue(devices != null);
+    }
+
+    @Test(description = "Search devices by Double parameter.")
+    public void testDoubleSearch() throws Exception {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("internalAvailableMemory");
+        cond.setOperator("=");
+        cond.setValue("3.56");
+        cond.setState(Condition.State.AND);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+
+        Assert.assertTrue(devices != null);
+    }
+
+    @Test(expectedExceptions = {SearchMgtException.class})
+    public void testInvalidOperator() throws SearchMgtException {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("deviceModel");
+        cond.setOperator("=/");
+        cond.setValue("SM-T520");
+        cond.setState(Condition.State.OR);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+
+        Assert.assertTrue(devices != null);
+    }
+
+    @Test(description = "Test for search updated devices in given time.")
+    public void testGetUpdatedDevices() throws SearchMgtException {
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> updatedDevices = service.getUpdated(Calendar.getInstance().getTimeInMillis());
+        Assert.assertEquals(updatedDevices.size(), 0);
+    }
+
+    @Test(description = "Test for invalid number")
+    public void testInvalidNumber() throws SearchMgtException {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("batteryLevel");
+        cond.setOperator("=");
+        cond.setValue("bbb");
+        cond.setState(Condition.State.OR);
+        conditions.add(cond);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        try {
+            service.search(context);
+        } catch (SearchMgtException e) {
+            if (!(e.getCause() instanceof InvalidOperatorException)) {
+                throw e;
+            }
+        }
+    }
+
+    @Test(description = "Test multiple search conditions")
+    public void testMultipleConditions() throws SearchMgtException {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition cond = new Condition();
+        cond.setKey("batteryLevel");
+        cond.setOperator("%");
+        cond.setValue("40");
+        cond.setState(Condition.State.OR);
+        conditions.add(cond);
+
+        Condition cond2 = new Condition();
+        cond2.setKey("availableTotalMemory");
+        cond2.setOperator("=");
+        cond2.setValue("40.0");
+        cond2.setState(Condition.State.OR);
+        conditions.add(cond2);
+
+        Condition cond3 = new Condition();
+        cond3.setKey("LOCATION");
+        cond3.setOperator("=");
+        cond3.setValue("Karandeniya");
+        cond3.setState(Condition.State.OR);
+        conditions.add(cond3);
+
+        Condition cond4 = new Condition();
+        cond4.setKey("deviceModel");
+        cond4.setOperator("=");
+        cond4.setValue("SM-T520");
+        cond4.setState(Condition.State.AND);
+        conditions.add(cond4);
+
+        Condition cond5 = new Condition();
+        cond5.setKey("vendor");
+        cond5.setOperator("=");
+        cond5.setValue("Samsung");
+        cond5.setState(Condition.State.AND);
+        conditions.add(cond5);
+
+        Condition cond6 = new Condition();
+        cond6.setKey("osVersion");
+        cond6.setOperator("=");
+        cond6.setValue("Marshmellow");
+        cond6.setState(Condition.State.OR);
+        conditions.add(cond6);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+        Assert.assertTrue(devices != null);
+    }
+
+    @Test(description = "Test with wildcard operator")
+    public void testWithWildcardOperator() throws SearchMgtException {
+        SearchContext context = new SearchContext();
+        List<Condition> conditions = new ArrayList<>();
+
+        Condition condition = new Condition();
+        condition.setKey("batteryLevel");
+        condition.setOperator("=");
+        condition.setValue("40");
+        condition.setState(Condition.State.AND);
+        conditions.add(condition);
+
+        Condition condition2 = new Condition();
+        condition2.setKey("LOCATION");
+        condition2.setOperator("%");
+        condition2.setValue("Karandeniya");
+        condition2.setState(Condition.State.OR);
+        conditions.add(condition2);
+
+        Condition condition3 = new Condition();
+        condition3.setKey("internalTotalMemory");
+        condition3.setOperator("%");
+        condition3.setValue("23.2");
+        condition3.setState(Condition.State.OR);
+        conditions.add(condition3);
+
+        Condition condition4 = new Condition();
+        condition4.setKey("connectionType");
+        condition4.setOperator("%");
+        condition4.setValue("DIALOG");
+        condition4.setState(Condition.State.AND);
+        conditions.add(condition4);
+
+        context.setConditions(conditions);
+
+        SearchManagerService service = new SearchManagerServiceImpl();
+        List<Device> devices = service.search(context);
+        Assert.assertTrue(devices != null);
+    }
+}

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

@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2017, 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.core.search;
+
+import org.junit.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
+import org.wso2.carbon.device.mgt.core.search.mgt.impl.Utils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This class holds the Unit test cases to test org.wso2.carbon.device.mgt.core.search.mgt.impl.Util
+ * */
+public class SearchMgtUtilTest {
+
+    private static List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+    private static final String DEVICE_ID_PREFIX = "SEARCH-DEVICE-ID-";
+    private static final String DEVICE_TYPE = "SEARCH_TYPE";
+    private static final String DEVICE_IDS = "0,0,0,0,0";
+    private static final Integer[] DEVICE_IDS_INT = {0,0,0,0,0};
+    private List<Device> devices;
+
+    @BeforeClass
+    public void init() throws Exception {
+        for (int i = 0; i < 5; i++) {
+            deviceIdentifiers.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
+        }
+        devices = TestDataHolder.generateDummyDeviceData(deviceIdentifiers);
+    }
+
+    @Test(description = "Test for converting given devices list to string")
+    public void testConvertDeviceListToString() {
+        String ids = Utils.getDeviceIdsAsString(devices);
+        Assert.assertEquals(ids, DEVICE_IDS);
+    }
+
+    @Test(description = "Test for get all the device ids as an array")
+    public void testGetArrayOfDeviceIds() {
+        Integer[] deviceIds = Utils.getArrayOfDeviceIds(devices);
+        Assert.assertArrayEquals(deviceIds, DEVICE_IDS_INT);
+    }
+
+    @Test(description = "Test to convert given String to a List")
+    public void testConvertStringToList() {
+        List<String> stringList = Utils.convertStringToList("some string");
+        List<String> expected = this.getStringList();
+
+        Assert.assertEquals(stringList, expected);
+    }
+
+    @Test(description = "Test to check what type of data the specified column can hold")
+    public void testColumnTypes() {
+        Map<String, String> colTypes = this.buildColumnMap();
+
+        for (String key : colTypes.keySet()) {
+            String result = Utils.checkColumnType(key);
+            Assert.assertEquals(result, colTypes.get(key));
+        }
+    }
+
+    /**
+     * Generates a map of columns and particular data type.
+     * @return HashMap of column name and data type.
+     * */
+    private Map<String, String> buildColumnMap() {
+        Map<String, String> columnTypes = new HashMap<>();
+
+        columnTypes.put("deviceModel", "String");
+        columnTypes.put("vendor", "String");
+        columnTypes.put("osVersion", "String");
+        columnTypes.put("connectionType", "String");
+        columnTypes.put("ssid", "String");
+        columnTypes.put("imei", "String");
+        columnTypes.put("imsi", "String");
+        columnTypes.put("batteryLevel", "Double");
+        columnTypes.put("externalAvailableMemory", "Double");
+        columnTypes.put("externalTotalMemory", "Double");
+        columnTypes.put("internalAvailableMemory", "Double");
+        columnTypes.put("cpuUsage", "Double");
+        columnTypes.put("someProperty", "String");
+        return columnTypes;
+    }
+
+    /**
+     * Generates a list of Strings.
+     * @return List<String>
+     * */
+    private List<String> getStringList() {
+        List<String> strings = new ArrayList<>();
+        strings.add("some string");
+        return strings;
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/ChangeEnumValues.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2017, 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.core.search.util;
+
+import org.wso2.carbon.device.mgt.common.search.Condition;
+import sun.reflect.ConstructorAccessor;
+import sun.reflect.FieldAccessor;
+import sun.reflect.ReflectionFactory;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Changes the Enum values of a given class.
+ */
+public class ChangeEnumValues {
+
+    private static ReflectionFactory reflectionFactory = ReflectionFactory.getReflectionFactory();
+
+    public ChangeEnumValues() {}
+
+    private static void setFailSafeFieldValue(Field field, Object target, Object value) throws NoSuchFieldException,
+            IllegalAccessException {
+
+        field.setAccessible(true);
+
+        Field modifiersField = Field.class.getDeclaredField("modifiers");
+        modifiersField.setAccessible(true);
+        int modifiers = modifiersField.getInt(field);
+
+        modifiers &= ~Modifier.FINAL;
+        modifiersField.setInt(field, modifiers);
+
+        FieldAccessor fa = reflectionFactory.newFieldAccessor(field, false);
+        fa.set(target, value);
+    }
+
+    private static void blankField(Class<?> enumClass, String fieldName) throws NoSuchFieldException,
+            IllegalAccessException {
+        for (Field field : Class.class.getDeclaredFields()) {
+            if (field.getName().contains(fieldName)) {
+                AccessibleObject.setAccessible(new Field[]{field}, true);
+                setFailSafeFieldValue(field, enumClass, null);
+                break;
+            }
+        }
+    }
+
+    private static void cleanEnumCache(Class<?> enumClass) throws NoSuchFieldException, IllegalAccessException {
+        blankField(enumClass, "enumConstantDirectory");
+        blankField(enumClass, "enumConstants");
+    }
+
+    private static ConstructorAccessor getConstructorAccessor(Class<?> enumClass, Class<?>[] additionalParameterTypes)
+            throws NoSuchMethodException {
+        Class<?>[] parameterTypes = new Class[additionalParameterTypes.length + 2];
+        parameterTypes[0] = String.class;
+        parameterTypes[1] = int.class;
+        System.arraycopy(additionalParameterTypes, 0, parameterTypes, 2, additionalParameterTypes.length);
+        return reflectionFactory.newConstructorAccessor(enumClass.getDeclaredConstructor(parameterTypes));
+    }
+
+    private static Object makeEnum(Class<?> enumClass, String value, int ordinal, Class<?>[] additionalTypes,
+                                   Object[] additionalValues) throws Exception {
+        Object[] parms = new Object[additionalValues.length + 2];
+        parms[0] = value;
+        parms[1] = ordinal;
+        System.arraycopy(additionalValues, 0, parms, 2, additionalValues.length);
+        return enumClass.cast(getConstructorAccessor(enumClass, additionalTypes).newInstance(parms));
+    }
+
+    /**
+     * Add an enum instance to the enum class given as argument
+     *
+     * @param <T>      the type of the enum
+     * @param enumType the class of the enum to be modified
+     * @param enumName the name of the new enum instance to be added to the class.
+     */
+    public static <T extends Enum<?>> void addEnum(Class<T> enumType, String enumName) {
+
+        if (!Enum.class.isAssignableFrom(enumType)) {
+            throw new RuntimeException("class " + enumType + " is not an instance of Enum");
+        }
+
+        Field valuesField = null;
+        Field[] fields = Condition.State.class.getDeclaredFields();
+        for (Field field : fields) {
+            if (field.getName().contains("$VALUES")) {
+                valuesField = field;
+                break;
+            }
+        }
+        AccessibleObject.setAccessible(new Field[]{valuesField}, true);
+
+        try {
+            T[] previousValues = (T[]) valuesField.get(enumType);
+            List<T> values = new ArrayList<T>(Arrays.asList(previousValues));
+
+            T newValue = (T) makeEnum(enumType, enumName, values.size(), new Class<?>[]{}, new Object[]{});
+
+            values.add(newValue);
+
+            setFailSafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0)));
+
+            cleanEnumCache(enumType);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java

@@ -15,30 +15,33 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-
 package org.wso2.carbon.device.mgt.core.search.util;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
+import org.wso2.carbon.device.mgt.common.search.Condition;
+import org.wso2.carbon.device.mgt.common.search.SearchContext;
 import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import static org.wso2.carbon.device.mgt.common.search.Condition.State.AND;
+import static org.wso2.carbon.device.mgt.common.search.Condition.State.OR;
+
 public class Utils {
 
     public static DeviceInfo getDeviceInfo() {
-
         DeviceInfo deviceInfo = new DeviceInfo();
 
         deviceInfo.setIMSI("e6f236ac82537a8e");
         deviceInfo.setSsid("FAFDA");
 
-
         deviceInfo.setAvailableRAMMemory(1.24);
-        deviceInfo.setBatteryLevel(27.3);
+        deviceInfo.setBatteryLevel(40.0);
         deviceInfo.setConnectionType("GSM");
         deviceInfo.setCpuUsage(82.34);
         deviceInfo.setDeviceModel("SM-T520");
@@ -56,7 +59,7 @@ public class Utils {
         deviceInfo.setSsid("SSSSSS");
         deviceInfo.setTotalRAMMemory(4.00);
         deviceInfo.setVendor("SAMSUNG");
-
+        deviceInfo.setLocation(getSampleDeviceLocation());
 
         Map<String, String> propertyMap = new HashMap<>();
 
@@ -75,8 +78,6 @@ public class Utils {
 
 
     public static DeviceLocation getSampleDeviceLocation(){
-
-
         DeviceLocation deviceLocation = new DeviceLocation();
         deviceLocation.setDeviceIdentifier(Utils.getDeviceIdentifier());
         deviceLocation.setLatitude(76.2422);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/datasource/mock-data-source-config.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2017, 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.
+  -->
+
+<DataSourceConfig>
+    <Url>jdbc:h2:mem:cdm-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url>
+    <DriverClassName>org.wso2.carbon.device.mgt.core.mock.MockJDBCDriver</DriverClassName>
+    <User>wso2carbon</User>
+    <Password>wso2carbon</Password>
+
+
+    <!-- For MySql -->
+
+    <!--<Url>jdbc:mysql://localhost:3306/WSO2CDM</Url>-->
+    <!--<DriverClassName>com.mysql.jdbc.Driver</DriverClassName>-->
+    <!--<User>root</User>-->
+    <!--<Password></Password>-->
+</DataSourceConfig>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/datasource/no-table-data-source-config.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2017, 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.
+  -->
+
+<DataSourceConfig>
+    <Url>jdbc:h2:mem:nodb-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url>
+    <DriverClassName>org.h2.Driver</DriverClassName>
+    <User>wso2carbon</User>
+    <Password>wso2carbon</Password>
+
+
+    <!-- For MySql -->
+
+    <!--<Url>jdbc:mysql://localhost:3306/WSO2CDM</Url>-->
+    <!--<DriverClassName>com.mysql.jdbc.Driver</DriverClassName>-->
+    <!--<User>root</User>-->
+    <!--<Password></Password>-->
+</DataSourceConfig>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml

@@ -1,4 +1,3 @@
-
 <!--
   ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
@@ -32,7 +31,6 @@
             <class name="org.wso2.carbon.device.mgt.core.app.mgt.AppManagementConfigurationManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>
             <class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>
-            <!--<class name="org.wso2.carbon.device.mgt.core.search.SearchDevice"/>-->
             <class name="org.wso2.carbon.device.mgt.core.dao.GroupPersistTests"/>
         </classes>
     </test>
@@ -42,14 +40,19 @@
             <class name="org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderServiceTest"/>
             <class name="org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceTest"/>
             <class name="org.wso2.carbon.device.mgt.core.operation.OperationManagementTests"/>
+            <class name="org.wso2.carbon.device.mgt.core.operation.OperationManagementNoDBSchemaTests"/>
+            <class name="org.wso2.carbon.device.mgt.core.operation.OperationManagementNegativeDBOperationTest"/>
             <class name="org.wso2.carbon.device.mgt.core.geo.service.GeoLocationProviderServiceTest"/>
             <class name="org.wso2.carbon.device.mgt.core.operation.ScheduledTaskOperationTests"/>
-            <class name="org.wso2.carbon.device.mgt.core.permission.mgt.PermissionManagerServiceTest" />
+            <class name="org.wso2.carbon.device.mgt.core.permission.mgt.PermissionManagerServiceTest"/>
             <class name="org.wso2.carbon.device.mgt.core.notification.mgt.NotificationManagementServiceImplTests"/>
             <class name="org.wso2.carbon.device.mgt.core.push.notification.mgt.task.PushNotificationSchedulerTaskTest"/>
             <class name="org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerServiceTest"/>
             <class name="org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceTest"/>
+            <class name="org.wso2.carbon.device.mgt.core.search.SearchManagementServiceTest"/>
+            <class name="org.wso2.carbon.device.mgt.core.search.ProcessorImplTest"/>
+            <class name="org.wso2.carbon.device.mgt.core.search.SearchMgtUtilTest"/>
         </classes>
     </test>
 </suite>

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

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

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

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

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

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

components/device-mgt/pom.xml

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

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

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

components/email-sender/pom.xml

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

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

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

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

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

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

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

components/identity-extensions/pom.xml

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

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

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

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

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

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

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

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

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

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

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

components/policy-mgt/pom.xml

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

components/test-coverage/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.145-SNAPSHOT</version>
+        <version>3.0.147-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -192,7 +192,9 @@
                                                 <fileset dir="${api.extension.handlers}/${target}/${coverge-report}">
                                                     <include name="${individual.test.report.name}" />
                                                 </fileset>
-
+                                                <fileset dir="${device.extensions.deployer}/${target}/${coverge-report}">
+                                                    <include name="${individual.test.report.name}" />
+                                                </fileset>
                                                 <!-- Need to list the newly added exec files here -->
                                             </executiondata>
                                             <structure name="Carbon Device Management Component Coverage Report">

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

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

components/webapp-authenticator-framework/pom.xml

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

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

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

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

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

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

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

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

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

features/apimgt-extensions/pom.xml

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

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

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

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

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

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

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

features/certificate-mgt/pom.xml

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

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

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

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

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

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

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

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

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

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

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

features/device-mgt-extensions/pom.xml

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

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

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

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

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

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

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

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

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

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

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