Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7

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

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.3-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.annotations/src/main/java/org/wso2/carbon/apimgt/annotations/api/Scope.java

@@ -28,18 +28,24 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Permission {
+public @interface Scope {
+
+    /**
+     * Represents the scope key which should be unique.
+     * @return Returns scope key.
+     */
+    String key();
 
     /**
      * Represents the scope name.
      * @return Returns scope name.
      */
-    String scope();
+    String name();
 
     /**
-     * Represents the associated permissions.
-     * @return Returns list of permissions.
+     * Represents the scope description.
+     * @return Returns scope description.
      */
-    String[] permissions();
+    String description();
 
 }

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

@@ -21,12 +21,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.3-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Application Management API</name>
@@ -161,6 +161,10 @@
             <artifactId>org.wso2.carbon.user.api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -18,20 +18,19 @@
 
 package org.wso2.carbon.apimgt.application.extension.api;
 
+import org.wso2.carbon.apimgt.annotations.api.API;
 import org.wso2.carbon.apimgt.application.extension.api.util.RegistrationProfile;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 /**
  * This is the application registration service that exposed for apimApplicationRegistration
  */
+@API(name = "API Registration Service", version = "1.0.0",
+        context = "api-application-registration",
+        tags = {"devicemgt_admin"})
 public interface ApiApplicationRegistrationService {
 
     /**
@@ -40,6 +39,7 @@ public interface ApiApplicationRegistrationService {
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
+    @Path("register/tenants")
     Response register(@PathParam("tenantDomain") String tenantDomain,
                       @QueryParam("applicationName") String applicationName);
 
@@ -51,6 +51,7 @@ public interface ApiApplicationRegistrationService {
     @POST
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
+    @Path("register")
     Response register(RegistrationProfile registrationProfile);
 
     /**
@@ -59,5 +60,6 @@ public interface ApiApplicationRegistrationService {
      * @return the response status of request.
      */
     @DELETE
+    @Path("unregister")
     Response unregister(@QueryParam("applicationName") String applicationName);
 }

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/webapp/WEB-INF/web.xml

@@ -47,7 +47,11 @@
     <!--publish to apim-->
     <context-param>
         <param-name>managed-api-enabled</param-name>
-        <param-value>false</param-value>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <param-name>managed-api-owner</param-name>
+        <param-value>admin</param-value>
     </context-param>
 
     <filter>

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

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

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

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>
@@ -107,6 +107,10 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+        </dependency>
     </dependencies>
 
 

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

@@ -18,7 +18,6 @@
 
 package org.wso2.carbon.apimgt.webapp.publisher;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.apimgt.api.APIManagementException;
@@ -30,6 +29,10 @@ import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration;
 import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.core.util.Utils;
+import org.wso2.carbon.device.mgt.common.scope.mgt.ScopeManagementException;
+import org.wso2.carbon.device.mgt.common.scope.mgt.ScopeManagementService;
+import org.wso2.carbon.user.api.UserRealm;
+import org.wso2.carbon.user.api.UserStoreException;
 
 import javax.servlet.ServletContext;
 import java.util.*;
@@ -121,16 +124,18 @@ public class APIPublisherUtil {
                 if (scope != null) {
                     if (apiScopes.get(scope.getKey()) == null) {
                         apiScopes.put(scope.getKey(), scope);
-                    } else {
-                        existingScope = apiScopes.get(scope.getKey());
-                        existingPermissions = existingScope.getRoles();
-                        existingPermissions = getDistinctPermissions(existingPermissions + "," + scope.getRoles());
-                        existingScope.setRoles(existingPermissions);
-                        apiScopes.put(scope.getKey(), existingScope);
                     }
                 }
             }
             Set<Scope> scopes = new HashSet<>(apiScopes.values());
+            // adding existing persisted roles to the scopes
+            try {
+                setExistingRoles(scopes);
+            } catch (ScopeManagementException | UserStoreException e) {
+                throw new APIManagementException("Error occurred while retrieving roles for the existing scopes");
+            }
+
+            // set current scopes to API
             api.setScopes(scopes);
 
             // this has to be done because of the use of pass by reference
@@ -307,9 +312,34 @@ public class APIPublisherUtil {
         return apiConfig;
     }
 
-    private static String getDistinctPermissions(String permissions) {
-        String[] unique = new HashSet<String>(Arrays.asList(permissions.split(","))).toArray(new String[0]);
-        return StringUtils.join(unique, ",");
+    /**
+     * This method is used to set the existing roles of the given scope.
+     *
+     * @param scopes List of scopes.
+     * @throws ScopeManagementException
+     */
+    private static void setExistingRoles(Set<Scope> scopes) throws ScopeManagementException, UserStoreException {
+        String scopeKey;
+        String roles;
+        ScopeManagementService scopeManagementService = WebappPublisherUtil.getScopeManagementService();
+        UserRealm userRealm = WebappPublisherUtil.getUserRealm();
+
+        if (scopeManagementService == null) {
+            throw new ScopeManagementException("Error occurred while initializing scope management service");
+        } else if (userRealm == null) {
+            throw new UserStoreException("Error occurred while initializing realm service");
+        } else {
+            String adminRole = userRealm.getRealmConfiguration().getAdminRoleName();
+            for (Scope scope : scopes) {
+                scopeKey = scope.getKey();
+                roles = scopeManagementService.getRolesOfScope(scopeKey);
+                if (roles == null) {
+                    roles = adminRole;
+                }
+                scope.setRoles(roles);
+
+            }
+        }
     }
 
 }

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

@@ -18,7 +18,16 @@
 
 package org.wso2.carbon.apimgt.webapp.publisher;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
+import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.common.scope.mgt.ScopeManagementService;
+import org.wso2.carbon.user.api.UserRealm;
+import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.user.api.UserStoreManager;
+import org.wso2.carbon.user.core.service.RealmService;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
@@ -31,6 +40,10 @@ import java.io.File;
  */
 public class WebappPublisherUtil {
 
+    private static Log log = LogFactory.getLog(WebappPublisherUtil.class);
+    private static final int CARBON_SUPER = -1234;
+
+
     public static Document convertToDocument(File file) throws WebappPublisherConfigurationFailedException {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
@@ -44,4 +57,32 @@ public class WebappPublisherUtil {
         }
     }
 
+    public static ScopeManagementService getScopeManagementService() {
+        PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        ScopeManagementService scopeManagementService =
+                (ScopeManagementService) ctx.getOSGiService(ScopeManagementService.class, null);
+        if (scopeManagementService == null) {
+            String msg = "Scope Management Service has not been initialized.";
+            log.error(msg);
+            throw new IllegalStateException(msg);
+        }
+        return scopeManagementService;
+    }
+
+    /**
+     * Getting the current tenant's user realm
+     */
+    public static UserRealm getUserRealm() throws UserStoreException {
+        RealmService realmService;
+        UserRealm realm;
+        PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
+
+        if (realmService == null) {
+            throw new IllegalStateException("Realm service not initialized");
+        }
+        realm = realmService.getTenantUserRealm(CARBON_SUPER);
+        return realm;
+    }
+
 }

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

@@ -1,45 +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.apimgt.webapp.publisher.config;
-
-/**
- * This class represents the information related to permissions.
- */
-public class PermissionConfiguration {
-
-    private String scopeName;
-    private String[] permissions;
-
-    public String getScopeName() {
-        return scopeName;
-    }
-
-    public void setScopeName(String scope) {
-        this.scopeName = scope;
-    }
-
-    public String[] getPermissions() {
-        return permissions;
-    }
-
-    public void setPermissions(String[] permissions) {
-        this.permissions = permissions;
-    }
-
-}

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

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, 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.config;
-
-/**
- * Custom exception class of Permission related operations.
- */
-public class PermissionManagementException extends Exception {
-
-    private static final long serialVersionUID = -3151279311929070298L;
-
-    private String errorMessage;
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-    public PermissionManagementException(String msg, Exception nestedEx) {
-        super(msg, nestedEx);
-        setErrorMessage(msg);
-    }
-
-    public PermissionManagementException(String message, Throwable cause) {
-        super(message, cause);
-        setErrorMessage(message);
-    }
-
-    public PermissionManagementException(String msg) {
-        super(msg);
-        setErrorMessage(msg);
-    }
-
-    public PermissionManagementException() {
-        super();
-    }
-
-    public PermissionManagementException(Throwable cause) {
-        super(cause);
-    }
-
-}

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

@@ -41,16 +41,13 @@ import java.util.List;
 public class Profiles {
 
     @XmlElement(name = "Profile")
-    protected List<String> profile;
+    protected List<String> profile = new ArrayList<String>();;
 
     /**
      * Gets the value of the profile property.
      *
      */
     public List<String> getProfile() {
-        if (profile == null) {
-            profile = new ArrayList<String>();
-        }
         return this.profile;
     }
 

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java

@@ -19,20 +19,13 @@
 package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
 
 import org.apache.catalina.core.StandardContext;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.scannotation.AnnotationDB;
-import org.scannotation.WarUrlFinder;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
-import org.wso2.carbon.apimgt.api.model.Scope;
 import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil;
 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.PermissionConfiguration;
-import org.wso2.carbon.apimgt.webapp.publisher.config.PermissionManagementException;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;
@@ -61,11 +54,9 @@ public class AnnotationProcessor {
     private static final String WILD_CARD = "/*";
 
     private static final String AUTH_TYPE = "Any";
-    private static final String PROTOCOL_HTTP = "http";
-    private static final String SERVER_HOST = "carbon.local.ip";
-    private static final String HTTP_PORT = "httpPort";
     private static final String STRING_ARR = "string_arr";
     private static final String STRING = "string";
+
     Class<API> apiClazz;
     private StandardContext context;
     private Method[] pathClazzMethods;
@@ -75,7 +66,6 @@ public class AnnotationProcessor {
 
 
     public AnnotationProcessor(final StandardContext context) {
-        this.context = context;
         servletContext = context.getServletContext();
         classLoader = servletContext.getClassLoader();
     }
@@ -141,7 +131,7 @@ public class AnnotationProcessor {
                                             pathClazzMethods = pathClazz.getMethods();
 
                                             Annotation rootContectAnno = clazz.getAnnotation(pathClazz);
-                                            String subContext = "";
+                                            String subContext;
                                             if (rootContectAnno != null) {
                                                 subContext = invokeMethod(pathClazzMethods[0], rootContectAnno, STRING);
                                                 if (subContext != null && !subContext.isEmpty()) {
@@ -150,8 +140,6 @@ public class AnnotationProcessor {
                                                     } else {
                                                         rootContext = rootContext + "/" + subContext;
                                                     }
-                                                } else {
-                                                    subContext = "";
                                                 }
                                                 if (log.isDebugEnabled()) {
                                                     log.debug("API Root  Context = " + rootContext);
@@ -166,7 +154,7 @@ public class AnnotationProcessor {
                                         }
                                     }
                                 } catch (ClassNotFoundException e) {
-                                    log.error("Error when passing the api annotation for device type apis.");
+                                    log.error("Error when passing the api annotation for device type apis.", e);
                                 }
                                 return apiResourceConfig;
                             }
@@ -251,15 +239,9 @@ public class AnnotationProcessor {
                         Annotation producesAnno = method.getAnnotation(producesClass);
                         resource.setProduces(invokeMethod(producesClassMethods[0], producesAnno, STRING_ARR));
                     }
-                    if (annotations[i].annotationType().getName().equals(Permission.class.getName())) {
-                        PermissionConfiguration permissionConf = this.getPermission(method);
-                        if (permissionConf != null) {
-                            Scope scope = new Scope();
-                            scope.setKey(permissionConf.getScopeName());
-                            scope.setDescription(permissionConf.getScopeName());
-                            scope.setName(permissionConf.getScopeName());
-                            String roles = StringUtils.join(permissionConf.getPermissions(), ",");
-                            scope.setRoles(roles);
+                    if (annotations[i].annotationType().getName().equals(org.wso2.carbon.apimgt.annotations.api.Scope.class.getName())) {
+                        org.wso2.carbon.apimgt.api.model.Scope scope = this.getScope(method);
+                        if (scope != null) {
                             resource.setScope(scope);
                         }
                     }
@@ -357,35 +339,32 @@ public class AnnotationProcessor {
         return ((String[]) methodHandler.invoke(annotation, method, null));
     }
 
-    private PermissionConfiguration getPermission(Method currentMethod) throws Throwable {
-        Class<Permission> permissionClass = (Class<Permission>) classLoader.loadClass(Permission.class.getName());
-        Annotation permissionAnnotation = currentMethod.getAnnotation(permissionClass);
-        if (permissionClass != null) {
-            Method[] permissionClassMethods = permissionClass.getMethods();
-            PermissionConfiguration permissionConf = new PermissionConfiguration();
+    private org.wso2.carbon.apimgt.api.model.Scope getScope(Method currentMethod) throws Throwable {
+        Class<org.wso2.carbon.apimgt.annotations.api.Scope> scopeClass =
+                (Class<org.wso2.carbon.apimgt.annotations.api.Scope>) classLoader.
+                        loadClass(org.wso2.carbon.apimgt.annotations.api.Scope.class.getName());
+        Annotation permissionAnnotation = currentMethod.getAnnotation(scopeClass);
+        if (scopeClass != null) {
+            Method[] permissionClassMethods = scopeClass.getMethods();
+            org.wso2.carbon.apimgt.api.model.Scope scope = new org.wso2.carbon.apimgt.api.model.Scope();
             for (Method method : permissionClassMethods) {
                 switch (method.getName()) {
-                    case "scope":
-                        permissionConf.setScopeName(invokeMethod(method, permissionAnnotation, STRING));
+                    case "key":
+                        scope.setKey(invokeMethod(method, permissionAnnotation, STRING));
                         break;
-                    case "permissions":
-                        String permissions[] = invokeMethod(method, permissionAnnotation);
-                        this.addPermission(permissions);
-                        permissionConf.setPermissions(permissions);
+                    case "name":
+                        scope.setName(invokeMethod(method, permissionAnnotation, STRING));
+                        break;
+                    case "description":
+                        scope.setDescription(invokeMethod(method, permissionAnnotation, STRING));
                         break;
                 }
             }
-            return permissionConf;
+            return scope;
         }
         return null;
     }
 
-    private void addPermission(String[] permissions) throws PermissionManagementException {
-        for (String permission : permissions) {
-            PermissionUtils.addPermission(permission);
-        }
-    }
-
     /**
      * Find the URL pointing to "/WEB-INF/classes"  This method may not work in conjunction with IteratorFactory
      * if your servlet container does not extract the /WEB-INF/classes into a real file-based directory

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedIteratorFactory.java

@@ -15,6 +15,7 @@
 */
 package org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util;
 
+
 import org.scannotation.archiveiterator.DirectoryIteratorFactory;
 import org.scannotation.archiveiterator.Filter;
 import org.scannotation.archiveiterator.JarIterator;

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/PermissionUtils.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2015, 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.lifecycle.util;
-
-import org.wso2.carbon.apimgt.webapp.publisher.config.PermissionManagementException;
-import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.registry.api.RegistryException;
-import org.wso2.carbon.registry.api.Resource;
-import org.wso2.carbon.registry.core.Registry;
-
-import java.util.StringTokenizer;
-
-/**
- * Utility class which holds necessary utility methods required for persisting permissions in
- * registry.
- */
-public class PermissionUtils {
-
-    public static final String ADMIN_PERMISSION_REGISTRY_PATH = "/permission/admin";
-    public static final String PERMISSION_PROPERTY_NAME = "name";
-
-    public static Registry getGovernanceRegistry() throws PermissionManagementException {
-        try {
-            int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            return APIPublisherDataHolder.getInstance().getRegistryService()
-                    .getGovernanceSystemRegistry(
-                            tenantId);
-        } catch (RegistryException e) {
-            throw new PermissionManagementException(
-                    "Error in retrieving governance registry instance: " +
-                            e.getMessage(), e);
-        }
-    }
-
-    public static void addPermission(String permission) throws PermissionManagementException {
-        String resourcePermission = getAbsolutePermissionPath(permission);
-        try {
-            StringTokenizer tokenizer = new StringTokenizer(resourcePermission, "/");
-            String lastToken = "", currentToken, tempPath;
-            while (tokenizer.hasMoreTokens()) {
-                currentToken = tokenizer.nextToken();
-                tempPath = lastToken + "/" + currentToken;
-                if (!checkResourceExists(tempPath)) {
-                    createRegistryCollection(tempPath, currentToken);
-                }
-                lastToken = tempPath;
-            }
-        } catch (RegistryException e) {
-            throw new PermissionManagementException("Error occurred while persisting permission : " +
-                    resourcePermission, e);
-        }
-    }
-
-    public static void createRegistryCollection(String path, String resourceName)
-            throws PermissionManagementException,
-            RegistryException {
-        Resource resource = PermissionUtils.getGovernanceRegistry().newCollection();
-        resource.addProperty(PERMISSION_PROPERTY_NAME, resourceName);
-        PermissionUtils.getGovernanceRegistry().beginTransaction();
-        PermissionUtils.getGovernanceRegistry().put(path, resource);
-        PermissionUtils.getGovernanceRegistry().commitTransaction();
-    }
-
-    public static boolean checkResourceExists(String path)
-            throws PermissionManagementException,
-            org.wso2.carbon.registry.core.exceptions.RegistryException {
-        return PermissionUtils.getGovernanceRegistry().resourceExists(path);
-    }
-
-    private static String getAbsolutePermissionPath(String permissionPath) {
-        return PermissionUtils.ADMIN_PERMISSION_REGISTRY_PATH + permissionPath;
-    }
-
-}

components/apimgt-extensions/pom.xml

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

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -76,7 +76,7 @@
                                     <tasks>
                                         <copy todir="${basedir}/../../../repository/deployment/server/webapps" overwrite="true">
                                             <fileset dir="${basedir}/target">
-                                                <include name="api#scep-mgt#v1.0.war" />
+                                                <include name="api-scep-mgt-v1.0.war"/>
                                             </fileset>
                                         </copy>
                                     </tasks>
@@ -148,26 +148,6 @@
             <artifactId>org.wso2.carbon.logging</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.axis2.wso2</groupId>
-                    <artifactId>axis2-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.neethi.wso2</groupId>
-                    <artifactId>neethi</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>

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

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.certificate.mgt.jaxrs.beans.ErrorResponse;
 
 import javax.ws.rs.*;
@@ -46,7 +46,7 @@ public interface CertificateMgtService {
                             message = "Internal Server Error. \n Error occurred while retrieving signed certificate.",
                             response = ErrorResponse.class)
             })
-    @Permission(scope = "sign-csr", permissions = {"/permission/admin/device-mgt/scep/sign-csr"})
+    @Scope(key = "certificate:sign-csr", name = "Sign CSR", description = "")
     Response getSignedCertFromCSR(
             @ApiParam(
                     name = "If-Modified-Since",

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -72,7 +72,7 @@
                                     <tasks>
                                         <copy todir="${basedir}/../../../repository/deployment/server/webapps" overwrite="true">
                                             <fileset dir="${basedir}/target">
-                                                <include name="api#certificate-mgt#v1.0.war" />
+                                                <include name="api#certificate-mgt#v1.0.war"/>
                                             </fileset>
                                         </copy>
                                     </tasks>
@@ -144,26 +144,6 @@
             <artifactId>org.wso2.carbon.logging</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.axis2.wso2</groupId>
-                    <artifactId>axis2-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.neethi.wso2</groupId>
-                    <artifactId>neethi</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>

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

@@ -1,7 +1,8 @@
 package org.wso2.carbon.certificate.mgt.cert.jaxrs.api;
 
 import io.swagger.annotations.*;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.API;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.CertificateList;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.EnrollmentCertificate;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
@@ -11,6 +12,10 @@ import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+@API(name = "Certificate Management", version = "1.0.0",
+        context = "api/certificate-mgt/v1.0/admin/certificates",
+        tags = {"devicemgt_admin"})
+
 @Api(value = "Certificate Management", description = "This API carries all certificate management related operations " +
         "such as get all the available devices, etc.")
 @Path("/admin/certificates")
@@ -72,7 +77,7 @@ public interface CertificateManagementAdminService {
                             message = "Internal Server Error. \n Server error occurred while adding certificates.",
                             response = ErrorResponse.class)
             })
-    @Permission(scope = "certificate-modify", permissions = {"/permission/admin/device-mgt/certificate/save"})
+    @Scope(key = "certificate:manage", name = "Add certificates", description = "")
     Response addCertificate(
             @ApiParam(
                     name = "enrollmentCertificates",
@@ -130,7 +135,7 @@ public interface CertificateManagementAdminService {
                             "Server error occurred while retrieving information requested certificate.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "certificate-view", permissions = {"/permission/admin/device-mgt/certificate/view"})
+    @Scope(key = "certificate:view", name = "View certificates", description = "")
     Response getCertificate(
             @ApiParam(name = "serialNumber",
                     value = "Provide the serial number of the certificate that you wish to get the details of",
@@ -202,7 +207,7 @@ public interface CertificateManagementAdminService {
                             "Server error occurred while retrieving all certificates enrolled in the system.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "certificate-view", permissions = {"/permission/admin/device-mgt/certificate/view"})
+    @Scope(key = "certificate:view", name = "View certificates", description = "")
     Response getAllCertificates(
             @ApiParam(
                     name = "offset",
@@ -245,7 +250,7 @@ public interface CertificateManagementAdminService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while removing the certificate.",
                     response = ErrorResponse.class)})
-    @Permission(scope = "certificate-modify", permissions = {"/permission/admin/device-mgt/certificate/remove"})
+    @Scope(key = "certificate:manage", name = "Add certificates", description = "")
     Response removeCertificate(
             @ApiParam(
                     name = "serialNumber",

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

@@ -6,15 +6,14 @@ import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.CertificateManagementAdmin
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.CertificateList;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.EnrollmentCertificate;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.beans.ErrorResponse;
-import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util.DeviceMgtAPIUtils;
+import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util.CertificateMgtAPIUtils;
 import org.wso2.carbon.certificate.mgt.cert.jaxrs.api.util.RequestValidationUtil;
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
 import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
 import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
+import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
@@ -38,7 +37,7 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
         CertificateManagementService certificateService;
         List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
         org.wso2.carbon.certificate.mgt.core.bean.Certificate certificate;
-        certificateService = DeviceMgtAPIUtils.getCertificateManagementService();
+        certificateService = CertificateMgtAPIUtils.getCertificateManagementService();
         try {
             for (EnrollmentCertificate enrollmentCertificate : enrollmentCertificates) {
                 certificate = new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
@@ -70,7 +69,7 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
             @HeaderParam("If-Modified-Since") String ifModifiedSince) {
         RequestValidationUtil.validateSerialNumber(serialNumber);
 
-        CertificateManagementService certificateService = DeviceMgtAPIUtils.getCertificateManagementService();
+        CertificateManagementService certificateService = CertificateMgtAPIUtils.getCertificateManagementService();
         List<CertificateResponse> certificateResponse;
         try {
             certificateResponse = certificateService.searchCertificates(serialNumber);
@@ -96,11 +95,9 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
             @QueryParam("limit") int limit,
             @HeaderParam("If-Modified-Since") String ifModifiedSince) {
         RequestValidationUtil.validatePaginationInfo(offset, limit);
-
-        CertificateManagementService certificateService = DeviceMgtAPIUtils.getCertificateManagementService();
-        PaginationRequest paginationRequest = new PaginationRequest(offset, limit);
+        CertificateManagementService certificateService = CertificateMgtAPIUtils.getCertificateManagementService();
         try {
-            PaginationResult result = certificateService.getAllCertificates(paginationRequest);
+            PaginationResult result = certificateService.getAllCertificates(offset, limit);
             CertificateList certificates = new CertificateList();
             certificates.setCount(result.getRecordsTotal());
             certificates.setList((List<CertificateResponse>) result.getData());
@@ -118,15 +115,18 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
     public Response removeCertificate(@PathParam("serialNumber") String serialNumber) {
         RequestValidationUtil.validateSerialNumber(serialNumber);
 
-        CertificateManagementService certificateService = DeviceMgtAPIUtils.getCertificateManagementService();
+        CertificateManagementService certificateService = CertificateMgtAPIUtils.getCertificateManagementService();
         try {
             boolean status = certificateService.removeCertificate(serialNumber);
             if (!status) {
-                Response.status(Response.Status.NOT_FOUND).entity("No certificate is found with the given " +
-                        "serial number '" + serialNumber + "'");
+                return Response.status(Response.Status.NOT_FOUND).entity(
+                        "No certificate is found with the given " +
+                                "serial number '" + serialNumber + "'").build();
+            } else {
+                return Response.status(Response.Status.OK).entity(
+                        "Certificate that carries the serial number '" +
+                                serialNumber + "' has been removed").build();
             }
-            return Response.status(Response.Status.OK).entity("Certificate that carries the serial number '" +
-                    serialNumber + "' has been removed").build();
         } catch (CertificateManagementException e) {
             String msg = "Error occurred while converting PEM file to X509Certificate";
             log.error(msg, e);
@@ -135,4 +135,4 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
         }
     }
 
-}
+}

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

@@ -27,12 +27,12 @@ import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
 import javax.ws.rs.core.MediaType;
 
 /**
- * DMAPIUtils class provides utility function used by CDM REST-API classes.
+ * CertificateMgtAPIUtils class provides utility functions used by Certificate Mgt REST-API classes.
  */
-public class DeviceMgtAPIUtils {
+public class CertificateMgtAPIUtils {
 
     public static final MediaType DEFAULT_CONTENT_TYPE = MediaType.APPLICATION_JSON_TYPE;
-    private static Log log = LogFactory.getLog(DeviceMgtAPIUtils.class);
+    private static Log log = LogFactory.getLog(CertificateMgtAPIUtils.class);
 
     public static CertificateManagementService getCertificateManagementService() {
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -44,7 +44,7 @@
         <property name="version" value="1.0.0"/>
         <property name="host" value="localhost:9443"/>
         <property name="schemes" value="https" />
-        <property name="basePath" value="/api/certificate-mgt/v1.0"/>
+        <property name="basePath" value="/api-certificate-mgt-v1.0"/>
         <property name="title" value="Certificate Management Admin Service API Definitions"/>
         <property name="contact" value="dev@wso2.org"/>
         <property name="license" value="Apache 2.0"/>

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

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

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateConfigurationManager.java

@@ -34,11 +34,11 @@ import java.io.File;
  */
 public class CertificateConfigurationManager {
 
-    private CertificateManagementConfig currentPolicyConfig;
+    private CertificateManagementConfig certificateManagementConfig;
     private static CertificateConfigurationManager certificateConfigurationManager;
 
-    private final String deviceMgtConfigXMLPath = CarbonUtils.getCarbonConfigDirPath() + File.separator +
-                                                  CertificateManagementConstants.DEVICE_CONFIG_XML_NAME;
+    private final String certMgtConfigXMLPath = CarbonUtils.getCarbonConfigDirPath() + File.separator +
+                                                CertificateManagementConstants.CERTIFICATE_CONFIG_XML_FILE;
 
     public static CertificateConfigurationManager getInstance() {
         if (certificateConfigurationManager == null) {
@@ -53,24 +53,36 @@ public class CertificateConfigurationManager {
 
     public synchronized void initConfig() throws CertificateManagementException {
         try {
-            File deviceMgtConfig = new File(deviceMgtConfigXMLPath);
-            Document doc = CertificateManagerUtil.convertToDocument(deviceMgtConfig);
+            File certMgtConfig = new File(certMgtConfigXMLPath);
+            Document doc = CertificateManagerUtil.convertToDocument(certMgtConfig);
 
-            /* Un-marshaling Device Management configuration */
+            /* Un-marshaling Certificate Management configuration */
             JAXBContext rssContext = JAXBContext.newInstance(CertificateManagementConfig.class);
             Unmarshaller unmarshaller = rssContext.createUnmarshaller();
-            this.currentPolicyConfig = (CertificateManagementConfig) unmarshaller.unmarshal(doc);
+            this.certificateManagementConfig = (CertificateManagementConfig) unmarshaller.unmarshal(doc);
         } catch (Exception e) {
-            throw new CertificateManagementException("Error occurred while initializing device config", e);
+            throw new CertificateManagementException("Error occurred while initializing certificate config", e);
         }
     }
 
-    public CertificateManagementConfig getPolicyManagementConfig() {
-        return currentPolicyConfig;
+    public CertificateManagementConfig getCertificateManagementConfig() throws CertificateManagementException {
+        if (certificateManagementConfig == null) {
+            initConfig();
+        }
+        return certificateManagementConfig;
     }
 
-    public DataSourceConfig getDataSourceConfig() {
-        return currentPolicyConfig.getCertificateManagementRepository().getDataSourceConfig();
+    public DataSourceConfig getDataSourceConfig() throws CertificateManagementException {
+        if (certificateManagementConfig == null) {
+            initConfig();
+        }
+        return certificateManagementConfig.getCertificateManagementRepository().getDataSourceConfig();
     }
 
-}
+    public CertificateKeystoreConfig getCertificateKeyStoreConfig() throws CertificateManagementException {
+        if (certificateManagementConfig == null) {
+            initConfig();
+        }
+        return certificateManagementConfig.getCertificateKeystoreConfig();
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateKeystoreConfig.java

@@ -0,0 +1,107 @@
+/*
+ * 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.certificate.mgt.core.config;
+
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Class for holding CertificateKeystore data.
+ */
+@XmlRootElement(name = "CertificateKeystore")
+public class CertificateKeystoreConfig {
+
+    private String certificateKeystoreLocation;
+    private String certificateKeystoreType;
+    private String certificateKeystorePassword;
+    private String caCertAlias;
+    private String caPrivateKeyPassword;
+    private String raCertAlias;
+    private String raPrivateKeyPassword;
+
+    @XmlElement(name = "CertificateKeystoreLocation", required = true)
+    public String getCertificateKeystoreLocation() {
+        return certificateKeystoreLocation;
+    }
+
+    public void setCertificateKeystoreLocation(String certificateKeystoreLocation) {
+        if (certificateKeystoreLocation != null && certificateKeystoreLocation.toLowerCase().
+                contains(CertificateManagementConstants.CARBON_HOME_ENTRY)) {
+            certificateKeystoreLocation = certificateKeystoreLocation.replace(CertificateManagementConstants.CARBON_HOME_ENTRY,
+                                                                                   System.getProperty(CertificateManagementConstants.CARBON_HOME));
+        }
+        this.certificateKeystoreLocation = certificateKeystoreLocation;
+    }
+
+    @XmlElement(name = "CertificateKeystoreType", required = true)
+    public String getCertificateKeystoreType() {
+        return certificateKeystoreType;
+    }
+
+    public void setCertificateKeystoreType(String certificateKeystoreType) {
+        this.certificateKeystoreType = certificateKeystoreType;
+    }
+
+    @XmlElement(name = "CertificateKeystorePassword", required = true)
+    public String getCertificateKeystorePassword() {
+        return certificateKeystorePassword;
+    }
+
+    public void setCertificateKeystorePassword(String certificateKeystorePassword) {
+        this.certificateKeystorePassword = certificateKeystorePassword;
+    }
+
+    @XmlElement(name = "CACertAlias", required = true)
+    public String getCACertAlias() {
+        return caCertAlias;
+    }
+
+    public void setCACertAlias(String caCertAlias) {
+        this.caCertAlias = caCertAlias;
+    }
+
+    @XmlElement(name = "CAPrivateKeyPassword", required = true)
+    public String getCAPrivateKeyPassword() {
+        return caPrivateKeyPassword;
+    }
+
+    public void setCAPrivateKeyPassword(String caPrivateKeyPassword) {
+        this.caPrivateKeyPassword = caPrivateKeyPassword;
+    }
+
+    @XmlElement(name = "RACertAlias", required = true)
+    public String getRACertAlias() {
+        return raCertAlias;
+    }
+
+    public void setRACertAlias(String raCertAlias) {
+        this.raCertAlias = raCertAlias;
+    }
+
+    @XmlElement(name = "RAPrivateKeyPassword", required = true)
+    public String getRAPrivateKeyPassword() {
+        return raPrivateKeyPassword;
+    }
+
+    public void setRAPrivateKeyPassword(String raPrivateKeyPassword) {
+        this.raPrivateKeyPassword = raPrivateKeyPassword;
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java

@@ -22,20 +22,39 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * Represents Device Mgt configuration.
+ * Represents Certificate Mgt configuration.
  */
-@XmlRootElement(name = "DeviceMgtConfiguration")
+@XmlRootElement(name = "CertificateConfigurations")
 public final class CertificateManagementConfig {
 
+    private CertificateManagementRepository certificateManagementRepository;
+    private CertificateKeystoreConfig certificateKeystoreConfig;
+    private int defaultPageSize;
+
     public void setCertificateManagementRepository(CertificateManagementRepository certificateManagementRepository) {
         this.certificateManagementRepository = certificateManagementRepository;
     }
 
-    private CertificateManagementRepository certificateManagementRepository;
-
-    @XmlElement(name = "ManagementRepository", nillable = false)
+    @XmlElement(name = "ManagementRepository", required = true)
     public CertificateManagementRepository getCertificateManagementRepository() {
         return certificateManagementRepository;
     }
 
+    @XmlElement(name = "CertificateKeystore", required = true)
+    public CertificateKeystoreConfig getCertificateKeystoreConfig() {
+        return certificateKeystoreConfig;
+    }
+
+    public void setCertificateKeystoreConfig(CertificateKeystoreConfig certificateKeystoreConfig) {
+        this.certificateKeystoreConfig = certificateKeystoreConfig;
+    }
+
+    @XmlElement(name = "DefaultPageSize", required = true)
+    public int getDefaultPageSize() {
+        return defaultPageSize;
+    }
+
+    public void setDefaultPageSize(int defaultPageSize) {
+        this.defaultPageSize = defaultPageSize;
+    }
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java

@@ -24,14 +24,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * Class for holding management repository data
+ * Class for holding management repository data.
  */
 @XmlRootElement(name = "ManagementRepository")
 public class CertificateManagementRepository {
 
     private DataSourceConfig dataSourceConfig;
 
-    @XmlElement(name = "DataSourceConfiguration", nillable = false)
+    @XmlElement(name = "DataSourceConfiguration", required = true)
     public DataSourceConfig getDataSourceConfig() {
         return dataSourceConfig;
     }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java

@@ -20,8 +20,7 @@ package org.wso2.carbon.certificate.mgt.core.dao;
 
 import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
+import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
 
 import java.util.List;
 
@@ -55,12 +54,13 @@ public interface CertificateDAO {
     /**
      * Get all the certificates in a paginated manner.
      *
-     * @param request Request mentioning pagination details such as length and stating index.
+     * @param rowNum Stating index of the paginated result.
+     * @param limit Number of records to return.
      * @return Pagination result with data and the count of results.
      * @throws CertificateManagementDAOException
      *
      */
-    PaginationResult getAllCertificates(PaginationRequest request) throws CertificateManagementDAOException;
+    PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementDAOException;
 
     /**
      * Get all the certificates.
@@ -69,7 +69,7 @@ public interface CertificateDAO {
      * @throws CertificateManagementDAOException
      *
      */
-    public List<CertificateResponse> getAllCertificates() throws CertificateManagementDAOException;
+    List<CertificateResponse> getAllCertificates() throws CertificateManagementDAOException;
 
     /**
      * Delete a certificate identified by a serial number()
@@ -79,6 +79,6 @@ public interface CertificateDAO {
      */
     boolean removeCertificate(String serialNumber) throws CertificateManagementDAOException;
 
-    public List<CertificateResponse> searchCertificate(String serialNumber) throws CertificateManagementDAOException;
+    List<CertificateResponse> searchCertificate(String serialNumber) throws CertificateManagementDAOException;
 
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOFactory.java

@@ -23,9 +23,13 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.certificate.mgt.core.config.datasource.JNDILookupDefinition;
 import org.wso2.carbon.certificate.mgt.core.dao.impl.GenericCertificateDAOImpl;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.certificate.mgt.core.dao.impl.OracleCertificateDAOImpl;
+import org.wso2.carbon.certificate.mgt.core.dao.impl.PostgreSQLCertificateDAOImpl;
+import org.wso2.carbon.certificate.mgt.core.dao.impl.SQLServerCertificateDAOImpl;
+import org.wso2.carbon.certificate.mgt.core.exception.IllegalTransactionStateException;
+import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
+import org.wso2.carbon.certificate.mgt.core.exception.UnsupportedDatabaseEngineException;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -45,9 +49,23 @@ public class CertificateManagementDAOFactory {
         CONNECTION_NOT_BORROWED, CONNECTION_BORROWED, CONNECTION_CLOSED
     }
 
-
     public static CertificateDAO getCertificateDAO() {
-        return new GenericCertificateDAOImpl();
+        if (databaseEngine != null) {
+            switch (databaseEngine) {
+                case CertificateManagementConstants.DataBaseTypes.DB_TYPE_ORACLE:
+                    return new OracleCertificateDAOImpl();
+                case CertificateManagementConstants.DataBaseTypes.DB_TYPE_MSSQL:
+                    return new SQLServerCertificateDAOImpl();
+                case CertificateManagementConstants.DataBaseTypes.DB_TYPE_POSTGRESQL:
+                    return new PostgreSQLCertificateDAOImpl();
+                case CertificateManagementConstants.DataBaseTypes.DB_TYPE_H2:
+                case CertificateManagementConstants.DataBaseTypes.DB_TYPE_MYSQL:
+                    return new GenericCertificateDAOImpl();
+                default:
+                    throw new UnsupportedDatabaseEngineException("Unsupported database engine : " + databaseEngine);
+            }
+        }
+        throw new IllegalStateException("Database engine has not initialized properly.");
     }
 
     public static void init(DataSourceConfig config) {
@@ -72,8 +90,8 @@ public class CertificateManagementDAOFactory {
         Connection conn = currentConnection.get();
         if (conn != null) {
             throw new IllegalTransactionStateException("A transaction is already active within the context of " +
-                    "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
-                    "transaction is already active is a sign of improper transaction handling");
+                                                       "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
+                                                       "transaction is already active is a sign of improper transaction handling");
         }
         try {
             conn = dataSource.getConnection();

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java

@@ -0,0 +1,223 @@
+/*
+ * 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.certificate.mgt.core.dao.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
+import org.wso2.carbon.certificate.mgt.core.util.Serializer;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class holds the generic implementation of CertificateDAO which can be used to support ANSI db syntax.
+ */
+public abstract class AbstractCertificateDAOImpl implements CertificateDAO{
+
+    private static final Log log = LogFactory.getLog(GenericCertificateDAOImpl.class);
+
+    @Override
+    public void addCertificate(List<Certificate> certificates)
+            throws CertificateManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        try {
+            conn = this.getConnection();
+            stmt = conn.prepareStatement(
+                    "INSERT INTO DM_DEVICE_CERTIFICATE (SERIAL_NUMBER, CERTIFICATE, TENANT_ID, USERNAME)"
+                    + " VALUES (?,?,?,?)");
+            PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.
+                                                                                              getThreadLocalCarbonContext();
+            String username = threadLocalCarbonContext.getUsername();
+            for (Certificate certificate : certificates) {
+                // the serial number of the certificate used for its creation is set as its alias.
+                String serialNumber = certificate.getSerial();
+                if (serialNumber == null || serialNumber.isEmpty()) {
+                    serialNumber = String.valueOf(certificate.getCertificate().getSerialNumber());
+                }
+                byte[] bytes = Serializer.serialize(certificate.getCertificate());
+
+                stmt.setString(1, serialNumber);
+                stmt.setBytes(2, bytes);
+                stmt.setInt(3, certificate.getTenantId());
+                stmt.setString(4, username);
+                stmt.addBatch();
+            }
+            stmt.executeBatch();
+        } catch (SQLException | IOException e) {
+            throw new CertificateManagementDAOException("Error occurred while saving certificates. "
+                    , e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, null);
+        }
+    }
+
+    @Override
+    public CertificateResponse retrieveCertificate(String serialNumber)
+            throws CertificateManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        CertificateResponse certificateResponse = null;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            conn = this.getConnection();
+            String query =
+                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM"
+                    + " DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER = ? AND TENANT_ID = ? ";
+            stmt = conn.prepareStatement(query);
+            stmt.setString(1, serialNumber);
+            stmt.setInt(2, tenantId);
+            resultSet = stmt.executeQuery();
+
+            if (resultSet.next()) {
+                certificateResponse = new CertificateResponse();
+                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
+                certificateResponse.setCertificate(certificateBytes);
+                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
+                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
+                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
+            }
+        } catch (SQLException e) {
+            String errorMsg =
+                    "Unable to get the read the certificate with serial" + serialNumber;
+            log.error(errorMsg, e);
+            throw new CertificateManagementDAOException(errorMsg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+        return certificateResponse;
+    }
+
+    @Override
+    public List<CertificateResponse> searchCertificate(String serialNumber)
+            throws CertificateManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        CertificateResponse certificateResponse = null;
+        List<CertificateResponse> certificates = new ArrayList<>();
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            conn = this.getConnection();
+            String query =
+                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM DM_DEVICE_CERTIFICATE "
+                    + "WHERE SERIAL_NUMBER LIKE ? AND TENANT_ID = ? ";
+            stmt = conn.prepareStatement(query);
+            stmt.setString(1, "%" + serialNumber + "%");
+            stmt.setInt(2, tenantId);
+            resultSet = stmt.executeQuery();
+
+            while (resultSet.next()) {
+                certificateResponse = new CertificateResponse();
+                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
+                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
+                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
+                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
+                certificates.add(certificateResponse);
+            }
+        } catch (SQLException e) {
+            String errorMsg =
+                    "Unable to get the read the certificate with serial" + serialNumber;
+            log.error(errorMsg, e);
+            throw new CertificateManagementDAOException(errorMsg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+        return certificates;
+    }
+
+    @Override
+    public List<CertificateResponse> getAllCertificates() throws CertificateManagementDAOException {
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        CertificateResponse certificateResponse;
+        List<CertificateResponse> certificates = new ArrayList<>();
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            Connection conn = this.getConnection();
+            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME"
+                         + " FROM DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC";
+            stmt = conn.prepareStatement(sql);
+            stmt.setInt(1, tenantId);
+            resultSet = stmt.executeQuery();
+
+            while (resultSet.next()) {
+                certificateResponse = new CertificateResponse();
+                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
+                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
+                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
+                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
+                certificates.add(certificateResponse);
+            }
+        } catch (SQLException e) {
+            String errorMsg = "SQL error occurred while retrieving the certificates.";
+            log.error(errorMsg, e);
+            throw new CertificateManagementDAOException(errorMsg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+        return certificates;
+    }
+
+    @Override
+    public boolean removeCertificate(String serialNumber) throws CertificateManagementDAOException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            conn = this.getConnection();
+            String query =
+                    "DELETE FROM DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER = ?" +
+                    " AND TENANT_ID = ? ";
+            stmt = conn.prepareStatement(query);
+            stmt.setString(1, serialNumber);
+            stmt.setInt(2, tenantId);
+
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            String msg = "Unable to get the read the certificate with serial" + serialNumber;
+            log.error(msg, e);
+            throw new CertificateManagementDAOException(msg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+    }
+
+    private Connection getConnection() throws SQLException {
+        return CertificateManagementDAOFactory.getConnection();
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java

@@ -20,149 +20,36 @@ package org.wso2.carbon.certificate.mgt.core.dao.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.bean.Certificate;
-import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
 import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
-import org.wso2.carbon.certificate.mgt.core.util.CertificateManagerUtil;
-import org.wso2.carbon.certificate.mgt.core.util.Serializer;
+import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOUtil;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class GenericCertificateDAOImpl implements CertificateDAO {
+/**
+ * This class holds the generic implementation of CertificateDAO which can be used to support ANSI db syntax for pagination
+ * queries.
+ */
+public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
 
     private static final Log log = LogFactory.getLog(GenericCertificateDAOImpl.class);
 
-    @Override
-    public void addCertificate(List<Certificate> certificates)
-            throws CertificateManagementDAOException {
-        Connection conn;
-        PreparedStatement stmt = null;
-        try {
-            conn = this.getConnection();
-            stmt = conn.prepareStatement(
-                    "INSERT INTO DM_DEVICE_CERTIFICATE (SERIAL_NUMBER, CERTIFICATE, TENANT_ID, USERNAME)"
-                            + " VALUES (?,?,?,?)");
-            PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext();
-            String username = threadLocalCarbonContext.getUsername();
-            for (Certificate certificate : certificates) {
-                // the serial number of the certificate used for its creation is set as its alias.
-                String serialNumber = certificate.getSerial();
-                if (serialNumber == null || serialNumber.isEmpty()) {
-                    serialNumber = String.valueOf(certificate.getCertificate().getSerialNumber());
-                }
-                byte[] bytes = Serializer.serialize(certificate.getCertificate());
 
-                stmt.setString(1, serialNumber);
-                stmt.setBytes(2, bytes);
-                stmt.setInt(3, certificate.getTenantId());
-                stmt.setString(4, username);
-                stmt.addBatch();
-            }
-            stmt.executeBatch();
-        } catch (SQLException | IOException e) {
-            throw new CertificateManagementDAOException("Error occurred while saving certificates. "
-                    , e);
-        } finally {
-            CertificateManagementDAOUtil.cleanupResources(stmt, null);
-        }
+    private Connection getConnection() throws SQLException {
+        return CertificateManagementDAOFactory.getConnection();
     }
 
     @Override
-    public CertificateResponse retrieveCertificate(String serialNumber)
-            throws CertificateManagementDAOException {
-        Connection conn;
-        PreparedStatement stmt = null;
-        ResultSet resultSet = null;
-        CertificateResponse certificateResponse = null;
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        try {
-            conn = this.getConnection();
-            String query =
-                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM"
-                            + " DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER = ? AND TENANT_ID = ? ";
-            stmt = conn.prepareStatement(query);
-            stmt.setString(1, serialNumber);
-            stmt.setInt(2, tenantId);
-            resultSet = stmt.executeQuery();
-
-            if (resultSet.next()) {
-                certificateResponse = new CertificateResponse();
-                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
-                certificateResponse.setCertificate(certificateBytes);
-                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
-                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
-                certificateResponse.setUsername(resultSet.getString("USERNAME"));
-                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
-            }
-        } catch (SQLException e) {
-            String errorMsg =
-                    "Unable to get the read the certificate with serial" + serialNumber;
-            log.error(errorMsg, e);
-            throw new CertificateManagementDAOException(errorMsg, e);
-        } finally {
-            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
-        }
-        return certificateResponse;
-    }
-
-    @Override
-    public List<CertificateResponse> searchCertificate(String serialNumber)
-            throws CertificateManagementDAOException {
-        Connection conn;
-        PreparedStatement stmt = null;
-        ResultSet resultSet = null;
-        CertificateResponse certificateResponse = null;
-        List<CertificateResponse> certificates = new ArrayList<>();
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        try {
-            conn = this.getConnection();
-            String query =
-                    "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM DM_DEVICE_CERTIFICATE "
-                            + "WHERE SERIAL_NUMBER LIKE ? AND TENANT_ID = ? ";
-            stmt = conn.prepareStatement(query);
-            stmt.setString(1, "%" + serialNumber + "%");
-            stmt.setInt(2, tenantId);
-            resultSet = stmt.executeQuery();
-
-            while (resultSet.next()) {
-                certificateResponse = new CertificateResponse();
-                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
-                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
-                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
-                certificateResponse.setUsername(resultSet.getString("USERNAME"));
-                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
-                certificates.add(certificateResponse);
-            }
-        } catch (SQLException e) {
-            String errorMsg =
-                    "Unable to get the read the certificate with serial" + serialNumber;
-            log.error(errorMsg, e);
-            throw new CertificateManagementDAOException(errorMsg, e);
-        } finally {
-            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
-        }
-        return certificates;
-    }
-
-    @Override
-    public PaginationResult getAllCertificates(PaginationRequest request) throws CertificateManagementDAOException {
+    public PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementDAOException {
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
         CertificateResponse certificateResponse;
@@ -172,11 +59,11 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         try {
             Connection conn = this.getConnection();
             String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM "
-                    + "DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC LIMIT ?,?";
+                         + "DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC LIMIT ?,?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
-            stmt.setInt(2, request.getStartIndex());
-            stmt.setInt(3, request.getRowCount());
+            stmt.setInt(2, rowNum);
+            stmt.setInt(3, limit);
             resultSet = stmt.executeQuery();
 
             int resultCount = 0;
@@ -202,67 +89,4 @@ public class GenericCertificateDAOImpl implements CertificateDAO {
         }
         return paginationResult;
     }
-
-    @Override
-    public List<CertificateResponse> getAllCertificates() throws CertificateManagementDAOException {
-        PreparedStatement stmt = null;
-        ResultSet resultSet = null;
-        CertificateResponse certificateResponse;
-        List<CertificateResponse> certificates = new ArrayList<>();
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        try {
-            Connection conn = this.getConnection();
-            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME"
-                    + " FROM DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, tenantId);
-            resultSet = stmt.executeQuery();
-
-            while (resultSet.next()) {
-                certificateResponse = new CertificateResponse();
-                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
-                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
-                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
-                certificateResponse.setUsername(resultSet.getString("USERNAME"));
-                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
-                certificates.add(certificateResponse);
-            }
-        } catch (SQLException e) {
-            String errorMsg = "SQL error occurred while retrieving the certificates.";
-            log.error(errorMsg, e);
-            throw new CertificateManagementDAOException(errorMsg, e);
-        } finally {
-            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
-        }
-        return certificates;
-    }
-
-    @Override
-    public boolean removeCertificate(String serialNumber) throws CertificateManagementDAOException {
-        Connection conn;
-        PreparedStatement stmt = null;
-        ResultSet resultSet = null;
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-        try {
-            conn = this.getConnection();
-            String query =
-                    "DELETE FROM DM_DEVICE_CERTIFICATE WHERE SERIAL_NUMBER = ?" +
-                            " AND TENANT_ID = ? ";
-            stmt = conn.prepareStatement(query);
-            stmt.setString(1, serialNumber);
-            stmt.setInt(2, tenantId);
-
-            return stmt.executeUpdate() > 0;
-        } catch (SQLException e) {
-            String msg = "Unable to get the read the certificate with serial" + serialNumber;
-            log.error(msg, e);
-            throw new CertificateManagementDAOException(msg, e);
-        } finally {
-            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
-        }
-    }
-
-    private Connection getConnection() throws SQLException {
-        return CertificateManagementDAOFactory.getConnection();
-    }
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java

@@ -0,0 +1,91 @@
+/*
+ * 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.certificate.mgt.core.dao.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
+import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class holds the oracle sql implementation of CertificateDAO which can be used to support Oracle specific
+ * db syntax.
+ */
+public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
+
+    private static final Log log = LogFactory.getLog(OracleCertificateDAOImpl.class);
+
+    @Override
+    public PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementDAOException {
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        CertificateResponse certificateResponse;
+        List<CertificateResponse> certificates = new ArrayList<>();
+        PaginationResult paginationResult;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            Connection conn = this.getConnection();
+            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM "
+                         + "DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC WHERE OFFSET >= ? AND ROWNUM <= ?";
+            stmt = conn.prepareStatement(sql);
+            stmt.setInt(1, tenantId);
+            stmt.setInt(2, rowNum);
+            stmt.setInt(3, limit);
+            resultSet = stmt.executeQuery();
+
+            int resultCount = 0;
+            while (resultSet.next()) {
+                certificateResponse = new CertificateResponse();
+                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
+                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
+                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
+                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
+                certificates.add(certificateResponse);
+                resultCount++;
+            }
+            paginationResult = new PaginationResult();
+            paginationResult.setData(certificates);
+            paginationResult.setRecordsTotal(resultCount);
+        } catch (SQLException e) {
+            String errorMsg = "SQL error occurred while retrieving the certificates.";
+            log.error(errorMsg, e);
+            throw new CertificateManagementDAOException(errorMsg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+        return paginationResult;
+    }
+
+    private Connection getConnection() throws SQLException {
+        return CertificateManagementDAOFactory.getConnection();
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java

@@ -0,0 +1,91 @@
+/*
+ * 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.certificate.mgt.core.dao.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
+import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class holds the PostgreSQL implementation of CertificateDAO which can be used to support PostgreSQL specific
+ * db syntax.
+ */
+public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
+
+    private static final Log log = LogFactory.getLog(PostgreSQLCertificateDAOImpl.class);
+
+    @Override
+    public PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementDAOException {
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        CertificateResponse certificateResponse;
+        List<CertificateResponse> certificates = new ArrayList<>();
+        PaginationResult paginationResult;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            Connection conn = this.getConnection();
+            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM "
+                         + "DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC LIMIT ? OFFSET ?";
+            stmt = conn.prepareStatement(sql);
+            stmt.setInt(1, tenantId);
+            stmt.setInt(2, limit);
+            stmt.setInt(3, rowNum);
+            resultSet = stmt.executeQuery();
+
+            int resultCount = 0;
+            while (resultSet.next()) {
+                certificateResponse = new CertificateResponse();
+                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
+                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
+                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
+                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
+                certificates.add(certificateResponse);
+                resultCount++;
+            }
+            paginationResult = new PaginationResult();
+            paginationResult.setData(certificates);
+            paginationResult.setRecordsTotal(resultCount);
+        } catch (SQLException e) {
+            String errorMsg = "SQL error occurred while retrieving the certificates.";
+            log.error(errorMsg, e);
+            throw new CertificateManagementDAOException(errorMsg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+        return paginationResult;
+    }
+
+    private Connection getConnection() throws SQLException {
+        return CertificateManagementDAOFactory.getConnection();
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java

@@ -0,0 +1,91 @@
+/*
+ * 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.certificate.mgt.core.dao.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
+import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
+import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
+import org.wso2.carbon.certificate.mgt.core.service.PaginationResult;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class holds the SQLServer implementation of CertificateDAO which can be used to support SQLServer specific
+ * db syntax.
+ */
+public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
+
+    private static final Log log = LogFactory.getLog(SQLServerCertificateDAOImpl.class);
+
+    @Override
+    public PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementDAOException {
+        PreparedStatement stmt = null;
+        ResultSet resultSet = null;
+        CertificateResponse certificateResponse;
+        List<CertificateResponse> certificates = new ArrayList<>();
+        PaginationResult paginationResult;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+        try {
+            Connection conn = this.getConnection();
+            String sql = "SELECT CERTIFICATE, SERIAL_NUMBER, TENANT_ID, USERNAME FROM "
+                         + "DM_DEVICE_CERTIFICATE WHERE TENANT_ID = ? ORDER BY ID DESC OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+            stmt = conn.prepareStatement(sql);
+            stmt.setInt(1, tenantId);
+            stmt.setInt(2, rowNum);
+            stmt.setInt(3, limit);
+            resultSet = stmt.executeQuery();
+
+            int resultCount = 0;
+            while (resultSet.next()) {
+                certificateResponse = new CertificateResponse();
+                byte[] certificateBytes = resultSet.getBytes("CERTIFICATE");
+                certificateResponse.setSerialNumber(resultSet.getString("SERIAL_NUMBER"));
+                certificateResponse.setTenantId(resultSet.getInt("TENANT_ID"));
+                certificateResponse.setUsername(resultSet.getString("USERNAME"));
+                CertificateGenerator.extractCertificateDetails(certificateBytes, certificateResponse);
+                certificates.add(certificateResponse);
+                resultCount++;
+            }
+            paginationResult = new PaginationResult();
+            paginationResult.setData(certificates);
+            paginationResult.setRecordsTotal(resultCount);
+        } catch (SQLException e) {
+            String errorMsg = "SQL error occurred while retrieving the certificates.";
+            log.error(errorMsg, e);
+            throw new CertificateManagementDAOException(errorMsg, e);
+        } finally {
+            CertificateManagementDAOUtil.cleanupResources(stmt, resultSet);
+        }
+        return paginationResult;
+    }
+
+    private Connection getConnection() throws SQLException {
+        return CertificateManagementDAOFactory.getConnection();
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/IllegalTransactionStateException.java

@@ -0,0 +1,44 @@
+/*
+ * 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.certificate.mgt.core.exception;
+
+public class IllegalTransactionStateException extends RuntimeException {
+
+    private static final long serialVersionUID = -3151279331929070297L;
+
+    public IllegalTransactionStateException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+    }
+
+    public IllegalTransactionStateException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public IllegalTransactionStateException(String msg) {
+        super(msg);
+    }
+
+    public IllegalTransactionStateException() {
+        super();
+    }
+
+    public IllegalTransactionStateException(Throwable cause) {
+        super(cause);
+    }
+
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/TransactionManagementException.java

@@ -0,0 +1,44 @@
+/*
+ * 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.certificate.mgt.core.exception;
+
+public class TransactionManagementException extends Exception {
+
+    private static final long serialVersionUID = -3151279321929070297L;
+
+    public TransactionManagementException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+    }
+
+    public TransactionManagementException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public TransactionManagementException(String msg) {
+        super(msg);
+    }
+
+    public TransactionManagementException() {
+        super();
+    }
+
+    public TransactionManagementException(Throwable cause) {
+        super(cause);
+    }
+
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/exception/UnsupportedDatabaseEngineException.java

@@ -0,0 +1,48 @@
+/*
+ * 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.certificate.mgt.core.exception;
+
+/**
+ * This runtime exception will be thrown if the server has configured with unsupported DB engine.
+ */
+public class UnsupportedDatabaseEngineException extends RuntimeException {
+
+    private static final long serialVersionUID = -3151279311929070297L;
+
+    public UnsupportedDatabaseEngineException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+    }
+
+    public UnsupportedDatabaseEngineException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UnsupportedDatabaseEngineException(String msg) {
+        super(msg);
+    }
+
+    public UnsupportedDatabaseEngineException() {
+        super();
+    }
+
+    public UnsupportedDatabaseEngineException(Throwable cause) {
+        super(cause);
+    }
+
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java

@@ -57,11 +57,11 @@ import org.wso2.carbon.certificate.mgt.core.dto.CAStatus;
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
 import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
+import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
 import org.wso2.carbon.certificate.mgt.core.util.CommonUtil;
-import org.wso2.carbon.certificate.mgt.core.util.ConfigurationUtil;
 import org.wso2.carbon.certificate.mgt.core.util.Serializer;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
 
 import javax.security.auth.x500.X500Principal;
 import javax.xml.bind.DatatypeConverter;
@@ -115,7 +115,6 @@ public class CertificateGenerator {
             }
         } catch (ClassNotFoundException | IOException e) {
             String errorMsg = "Error while deserializing the certificate.";
-            log.error(errorMsg, e);
             throw new CertificateManagementDAOException(errorMsg, e);
         }
 
@@ -136,7 +135,7 @@ public class CertificateGenerator {
         InputStream raInputStream = null;
 
         try {
-            CertificateFactory certificateFactory = CertificateFactory.getInstance(ConfigurationUtil.X_509);
+            CertificateFactory certificateFactory = CertificateFactory.getInstance(CertificateManagementConstants.X_509);
             caInputStream = new ByteArrayInputStream(ca);
             raInputStream = new ByteArrayInputStream(ra);
 
@@ -147,7 +146,6 @@ public class CertificateGenerator {
             certificateList.add(raCert);
         } catch (CertificateException e) {
             String errorMsg = "Error occurred while fetching root certificates";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } finally {
             if (caInputStream != null) {
@@ -180,19 +178,19 @@ public class CertificateGenerator {
 
         try {
             KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(
-                    ConfigurationUtil.RSA, ConfigurationUtil.PROVIDER);
-            keyPairGenerator.initialize(ConfigurationUtil.RSA_KEY_LENGTH, new SecureRandom());
+                    CertificateManagementConstants.RSA, CertificateManagementConstants.PROVIDER);
+            keyPairGenerator.initialize(CertificateManagementConstants.RSA_KEY_LENGTH, new SecureRandom());
             KeyPair pair = keyPairGenerator.generateKeyPair();
-            X500Principal principal = new X500Principal(ConfigurationUtil.DEFAULT_PRINCIPAL);
+            X500Principal principal = new X500Principal(CertificateManagementConstants.DEFAULT_PRINCIPAL);
 
             X509v3CertificateBuilder certificateBuilder = new JcaX509v3CertificateBuilder(
                     principal, CommonUtil.generateSerialNumber(), validityBeginDate, validityEndDate,
                     principal, pair.getPublic());
-            ContentSigner contentSigner = new JcaContentSignerBuilder(ConfigurationUtil.SHA256_RSA)
-                    .setProvider(ConfigurationUtil.PROVIDER).build(
+            ContentSigner contentSigner = new JcaContentSignerBuilder(CertificateManagementConstants.SHA256_RSA)
+                    .setProvider(CertificateManagementConstants.PROVIDER).build(
                             pair.getPrivate());
             X509Certificate certificate = new JcaX509CertificateConverter()
-                    .setProvider(ConfigurationUtil.PROVIDER).getCertificate(
+                    .setProvider(CertificateManagementConstants.PROVIDER).getCertificate(
                             certificateBuilder.build(contentSigner));
 
             // cert.checkValidity();
@@ -210,35 +208,27 @@ public class CertificateGenerator {
             return certificate;
         } catch (NoSuchAlgorithmException e) {
             String errorMsg = "No such algorithm found when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (NoSuchProviderException e) {
             String errorMsg = "No such provider found when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (OperatorCreationException e) {
             String errorMsg = "Issue in operator creation when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateExpiredException e) {
             String errorMsg = "Certificate expired after generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateNotYetValidException e) {
             String errorMsg = "Certificate not yet valid when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateException e) {
             String errorMsg = "Certificate issue occurred when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (InvalidKeyException e) {
             String errorMsg = "Invalid key used when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (SignatureException e) {
             String errorMsg = "Signature related issue occurred when generating certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }
@@ -257,7 +247,7 @@ public class CertificateGenerator {
             X509Certificate certRA = (X509Certificate) keyStoreReader.getRACertificate();
             X509Certificate certCA = (X509Certificate) keyStoreReader.getCACertificate();
 
-            CertificateFactory certificateFactory = CertificateFactory.getInstance(ConfigurationUtil.X_509);
+            CertificateFactory certificateFactory = CertificateFactory.getInstance(CertificateManagementConstants.X_509);
             X509CertificateHolder holder = reqCerts.iterator().next();
             ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(holder.getEncoded());
             X509Certificate reqCert = (X509Certificate) certificateFactory.generateCertificate(byteArrayInputStream);
@@ -286,7 +276,7 @@ public class CertificateGenerator {
                 certRep = new CertRep(transId, senderNonce, recipientNonce, messageData);
             }
 
-            PkcsPkiEnvelopeEncoder envEncoder = new PkcsPkiEnvelopeEncoder(reqCert, ConfigurationUtil.DES_EDE);
+            PkcsPkiEnvelopeEncoder envEncoder = new PkcsPkiEnvelopeEncoder(reqCert, CertificateManagementConstants.DES_EDE);
             PkiMessageEncoder encoder = new PkiMessageEncoder(privateKeyRA, certRA, envEncoder);
             CMSSignedData cmsSignedData = encoder.encode(certRep);
 
@@ -294,23 +284,18 @@ public class CertificateGenerator {
 
         } catch (CertificateException e) {
             String errorMsg = "Certificate issue occurred when generating getPKIMessage";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (MessageEncodingException e) {
             String errorMsg = "Message encoding issue occurred when generating getPKIMessage";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (IOException e) {
             String errorMsg = "Input output issue occurred when generating getPKIMessage";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (MessageDecodingException e) {
             String errorMsg = "Message decoding issue occurred when generating getPKIMessage";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CMSException e) {
             String errorMsg = "CMS issue occurred when generating getPKIMessage";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }
@@ -386,7 +371,7 @@ public class CertificateGenerator {
             Collection<X509CertificateHolder> reqCerts = reqStore.getMatches(null);
 
             if (reqCerts != null && reqCerts.size() > 0) {
-                CertificateFactory certificateFactory = CertificateFactory.getInstance(ConfigurationUtil.X_509);
+                CertificateFactory certificateFactory = CertificateFactory.getInstance(CertificateManagementConstants.X_509);
                 X509CertificateHolder holder = reqCerts.iterator().next();
                 ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(holder.getEncoded());
                 X509Certificate reqCert = (X509Certificate) certificateFactory.
@@ -404,15 +389,12 @@ public class CertificateGenerator {
             }
         } catch (CMSException e) {
             String errorMsg = "CMSException when decoding certificate signature";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (IOException e) {
             String errorMsg = "IOException when decoding certificate signature";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateException e) {
             String errorMsg = "CertificateException when decoding certificate signature";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
 
@@ -428,7 +410,7 @@ public class CertificateGenerator {
         Date validityBeginDate = commonUtil.getValidityStartDate();
         Date validityEndDate = commonUtil.getValidityEndDate();
 
-        X500Name certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
+        X500Name certSubject = new X500Name(CertificateManagementConstants.DEFAULT_PRINCIPAL);
         //X500Name certSubject = request.getSubject();
 
         Attribute attributes[] = request.getAttributes();
@@ -487,10 +469,10 @@ public class CertificateGenerator {
                 }
             }
 
-            sigGen = new JcaContentSignerBuilder(ConfigurationUtil.SHA256_RSA)
-                    .setProvider(ConfigurationUtil.PROVIDER).build(privateKey);
+            sigGen = new JcaContentSignerBuilder(CertificateManagementConstants.SHA256_RSA)
+                    .setProvider(CertificateManagementConstants.PROVIDER).build(privateKey);
             issuedCert = new JcaX509CertificateConverter().setProvider(
-                    ConfigurationUtil.PROVIDER).getCertificate(
+                    CertificateManagementConstants.PROVIDER).getCertificate(
                     certificateBuilder.build(sigGen));
             org.wso2.carbon.certificate.mgt.core.bean.Certificate certificate =
                     new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
@@ -501,15 +483,12 @@ public class CertificateGenerator {
             saveCertInKeyStore(certificates);
         } catch (CertIOException e) {
             String errorMsg = "Certificate Input output issue occurred when generating generateCertificateFromCSR";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (OperatorCreationException e) {
             String errorMsg = "Operator creation issue occurred when generating generateCertificateFromCSR";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateException e) {
             String errorMsg = "Certificate issue occurred when generating generateCertificateFromCSR";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
 
@@ -540,11 +519,9 @@ public class CertificateGenerator {
             return generator.generate(new CMSAbsentContent());
         } catch (CertificateEncodingException e) {
             String errorMsg = "Certificate encoding issue occurred when generating getMessageData";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CMSException e) {
             String errorMsg = "Message decoding issue occurred when generating getMessageData";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }
@@ -563,30 +540,26 @@ public class CertificateGenerator {
 
             String temp = new String(keyBytes);
             String privateKeyPEM = temp.replace(
-                    ConfigurationUtil.RSA_PRIVATE_KEY_BEGIN_TEXT, ConfigurationUtil.EMPTY_TEXT);
+                    CertificateManagementConstants.RSA_PRIVATE_KEY_BEGIN_TEXT, CertificateManagementConstants.EMPTY_TEXT);
             privateKeyPEM = privateKeyPEM
-                    .replace(ConfigurationUtil.RSA_PRIVATE_KEY_END_TEXT, ConfigurationUtil.EMPTY_TEXT);
+                    .replace(CertificateManagementConstants.RSA_PRIVATE_KEY_END_TEXT, CertificateManagementConstants.EMPTY_TEXT);
 
             byte[] decoded = Base64.decodeBase64(privateKeyPEM);
             PKCS8EncodedKeySpec encodedKeySpec = new PKCS8EncodedKeySpec(decoded);
-            KeyFactory keyFactory = KeyFactory.getInstance(ConfigurationUtil.RSA);
+            KeyFactory keyFactory = KeyFactory.getInstance(CertificateManagementConstants.RSA);
 
             return keyFactory.generatePrivate(encodedKeySpec);
         } catch (FileNotFoundException e) {
             String errorMsg = "Private key file not found in getSignerKey";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (IOException e) {
             String errorMsg = "Input output issue in getSignerKey";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (NoSuchAlgorithmException e) {
             String errorMsg = "Algorithm not not found in getSignerKey";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (InvalidKeySpecException e) {
             String errorMsg = "Invalid key found in getSignerKey";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }
@@ -595,18 +568,16 @@ public class CertificateGenerator {
 
         X509Certificate certificate;
         try {
-            CertificateFactory certificateFactory = CertificateFactory.getInstance(ConfigurationUtil.X_509);
+            CertificateFactory certificateFactory = CertificateFactory.getInstance(CertificateManagementConstants.X_509);
             certificate = (X509Certificate) certificateFactory.generateCertificate(
                     new FileInputStream(signerCertificatePath));
 
             return certificate;
         } catch (CertificateException e) {
             String errorMsg = "Certificate related issue occurred in getSigner";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (FileNotFoundException e) {
             String errorMsg = "Signer certificate path not found in getSigner";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }
@@ -642,15 +613,12 @@ public class CertificateGenerator {
             return scepResponse;
         } catch (CertificateEncodingException e) {
             String errorMsg = "Certificate encoding issue occurred in getCACert";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CMSException e) {
             String errorMsg = "CMS issue occurred in getCACert";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (IOException e) {
             String errorMsg = "Input output issue occurred in getCACert";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }
@@ -669,12 +637,10 @@ public class CertificateGenerator {
             CertificateManagementDAOFactory.commitTransaction();
         } catch (CertificateManagementDAOException e) {
             String errorMsg = "Error occurred when saving the generated certificate";
-            log.error(errorMsg, e);
             CertificateManagementDAOFactory.rollbackTransaction();
             throw new KeystoreException(errorMsg, e);
         } catch (TransactionManagementException e) {
             String errorMsg = "Error occurred when saving the generated certificate";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         }
     }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/KeyStoreReader.java

@@ -19,11 +19,13 @@ package org.wso2.carbon.certificate.mgt.core.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.certificate.mgt.core.config.CertificateConfigurationManager;
+import org.wso2.carbon.certificate.mgt.core.config.CertificateKeystoreConfig;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
-import org.wso2.carbon.certificate.mgt.core.util.ConfigurationUtil;
+import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
 import org.wso2.carbon.certificate.mgt.core.util.Serializer;
 
@@ -54,28 +56,23 @@ public class KeyStoreReader {
         InputStream is = null;
         KeyStore keystore;
         try {
-            keystore = KeyStore.getInstance(ConfigurationUtil.getConfigEntry(configEntryKeyStoreType));
-            is = new FileInputStream(ConfigurationUtil.getConfigEntry(configEntryKeyStorePath));
-            keystore.load(is, ConfigurationUtil.getConfigEntry(configEntryKeyStorePassword).toCharArray());
+            keystore = KeyStore.getInstance(configEntryKeyStoreType);
+            is = new FileInputStream(configEntryKeyStorePath);
+            keystore.load(is, configEntryKeyStorePassword.toCharArray());
         } catch (KeyStoreException e) {
             String errorMsg = "KeyStore issue occurred when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (FileNotFoundException e) {
             String errorMsg = "KeyStore file not found when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (NoSuchAlgorithmException e) {
             String errorMsg = "Algorithm not found when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateException e) {
             String errorMsg = "CertificateException when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (IOException e) {
             String errorMsg = "Input output issue occurred when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } finally {
             try {
@@ -94,28 +91,22 @@ public class KeyStoreReader {
                                            String configEntryKeyStorePassword) throws KeystoreException {
         FileOutputStream os = null;
         try {
-            os = new FileOutputStream(
-                    ConfigurationUtil.getConfigEntry(configEntryKeyStorePath));
-            keyStore.store(os, ConfigurationUtil.getConfigEntry(configEntryKeyStorePassword).toCharArray());
+            os = new FileOutputStream(configEntryKeyStorePath);
+            keyStore.store(os, configEntryKeyStorePassword.toCharArray());
         } catch (KeyStoreException e) {
             String errorMsg = "KeyStore issue occurred when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (FileNotFoundException e) {
             String errorMsg = "KeyStore file not found when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (NoSuchAlgorithmException e) {
             String errorMsg = "Algorithm not found when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (CertificateException e) {
             String errorMsg = "CertificateException when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (IOException e) {
             String errorMsg = "Input output issue occurred when loading KeyStore";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } finally {
             try {
@@ -130,23 +121,44 @@ public class KeyStoreReader {
 
 
     KeyStore loadCertificateKeyStore() throws KeystoreException {
-        return loadKeyStore(ConfigurationUtil.CERTIFICATE_KEYSTORE, ConfigurationUtil.PATH_CERTIFICATE_KEYSTORE,
-                ConfigurationUtil.CERTIFICATE_KEYSTORE_PASSWORD);
+        KeyStore keyStore = null;
+        try {
+            CertificateKeystoreConfig certificateKeystoreConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateKeyStoreConfig();
+            keyStore = loadKeyStore(certificateKeystoreConfig.getCertificateKeystoreType(),
+                                    certificateKeystoreConfig.getCertificateKeystoreLocation(),
+                                    certificateKeystoreConfig.getCertificateKeystorePassword());
+        } catch (CertificateManagementException e) {
+            String errorMsg = "Unable to find KeyStore configuration in certificate-mgt.config file.";
+            throw new KeystoreException(errorMsg, e);
+        }
+        return keyStore;
     }
 
     void saveCertificateKeyStore(KeyStore keyStore) throws KeystoreException {
-        saveKeyStore(keyStore, ConfigurationUtil.PATH_CERTIFICATE_KEYSTORE,
-                ConfigurationUtil.CERTIFICATE_KEYSTORE_PASSWORD);
+        try {
+            CertificateKeystoreConfig certificateKeystoreConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateKeyStoreConfig();
+            saveKeyStore(keyStore, certificateKeystoreConfig.getCertificateKeystoreLocation(),
+                         certificateKeystoreConfig.getCertificateKeystorePassword());
+        } catch (CertificateManagementException e) {
+            String errorMsg = "Unable to find KeyStore configuration in certificate-mgt.config file.";
+            throw new KeystoreException(errorMsg, e);
+        }
     }
 
     public Certificate getCACertificate() throws KeystoreException {
         KeyStore keystore = loadCertificateKeyStore();
         Certificate caCertificate;
         try {
-            caCertificate = keystore.getCertificate(ConfigurationUtil.getConfigEntry(ConfigurationUtil.CA_CERT_ALIAS));
+            CertificateKeystoreConfig certificateKeystoreConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateKeyStoreConfig();
+            caCertificate = keystore.getCertificate(certificateKeystoreConfig.getCACertAlias());
         } catch (KeyStoreException e) {
             String errorMsg = "KeyStore issue occurred when loading KeyStore";
-            log.error(errorMsg, e);
+            throw new KeystoreException(errorMsg, e);
+        } catch (CertificateManagementException e) {
+            String errorMsg = "Unable to find KeyStore configuration in certificate-mgt.config file.";
             throw new KeystoreException(errorMsg, e);
         }
 
@@ -158,24 +170,25 @@ public class KeyStoreReader {
     }
 
     PrivateKey getCAPrivateKey() throws KeystoreException {
-
         KeyStore keyStore = loadCertificateKeyStore();
         PrivateKey caPrivateKey;
         try {
-            caPrivateKey = (PrivateKey) (keyStore.getKey(
-                    ConfigurationUtil.getConfigEntry(ConfigurationUtil.CA_CERT_ALIAS),
-                    ConfigurationUtil.getConfigEntry(ConfigurationUtil.KEYSTORE_CA_CERT_PRIV_PASSWORD).toCharArray()));
+            CertificateKeystoreConfig certificateKeystoreConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateKeyStoreConfig();
+            caPrivateKey = (PrivateKey) keyStore.getKey(certificateKeystoreConfig.getCACertAlias(), certificateKeystoreConfig
+                    .
+                            getCAPrivateKeyPassword().toCharArray());
         } catch (UnrecoverableKeyException e) {
             String errorMsg = "Key is unrecoverable when retrieving CA private key";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (KeyStoreException e) {
             String errorMsg = "KeyStore issue occurred when retrieving CA private key";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (NoSuchAlgorithmException e) {
             String errorMsg = "Algorithm not found when retrieving CA private key";
-            log.error(errorMsg, e);
+            throw new KeystoreException(errorMsg, e);
+        } catch (CertificateManagementException e) {
+            String errorMsg = "Unable to find KeyStore configuration in certificate-mgt.config file.";
             throw new KeystoreException(errorMsg, e);
         }
 
@@ -190,10 +203,14 @@ public class KeyStoreReader {
         KeyStore keystore = loadCertificateKeyStore();
         Certificate raCertificate;
         try {
-            raCertificate = keystore.getCertificate(ConfigurationUtil.getConfigEntry(ConfigurationUtil.RA_CERT_ALIAS));
+            CertificateKeystoreConfig certificateKeystoreConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateKeyStoreConfig();
+            raCertificate = keystore.getCertificate(certificateKeystoreConfig.getRACertAlias());
         } catch (KeyStoreException e) {
             String errorMsg = "KeyStore issue occurred when retrieving RA private key";
-            log.error(errorMsg, e);
+            throw new KeystoreException(errorMsg, e);
+        } catch (CertificateManagementException e) {
+            String errorMsg = "Unable to find KeyStore configuration in certificate-mgt.config file.";
             throw new KeystoreException(errorMsg, e);
         }
 
@@ -214,15 +231,12 @@ public class KeyStoreReader {
             }
         } catch (CertificateManagementDAOException e) {
             String errorMsg = "Error when retrieving certificate the the database for the alias " + alias;
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (ClassNotFoundException | IOException e) {
             String errorMsg = "Error when de-serializing saved certificate.";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (SQLException e) {
             String errorMsg = "Error when making a connection to the database.";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } finally {
             CertificateManagementDAOFactory.closeConnection();
@@ -234,20 +248,21 @@ public class KeyStoreReader {
         KeyStore keystore = loadCertificateKeyStore();
         PrivateKey raPrivateKey;
         try {
-            raPrivateKey = (PrivateKey) (keystore.getKey(
-                    ConfigurationUtil.getConfigEntry(ConfigurationUtil.RA_CERT_ALIAS),
-                    ConfigurationUtil.getConfigEntry(ConfigurationUtil.KEYSTORE_RA_CERT_PRIV_PASSWORD).toCharArray()));
+            CertificateKeystoreConfig certificateKeystoreConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateKeyStoreConfig();
+            raPrivateKey = (PrivateKey) keystore.getKey(certificateKeystoreConfig.getRACertAlias(),
+                                                        certificateKeystoreConfig.getRAPrivateKeyPassword().toCharArray());
         } catch (UnrecoverableKeyException e) {
             String errorMsg = "Key is unrecoverable when retrieving RA private key";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (KeyStoreException e) {
             String errorMsg = "KeyStore issue occurred when retrieving RA private key";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (NoSuchAlgorithmException e) {
             String errorMsg = "Algorithm not found when retrieving RA private key";
-            log.error(errorMsg, e);
+            throw new KeystoreException(errorMsg, e);
+        } catch (CertificateManagementException e) {
+            String errorMsg = "Unable to find KeyStore configuration in certificate-mgt.config file.";
             throw new KeystoreException(errorMsg, e);
         }
 
@@ -274,15 +289,12 @@ public class KeyStoreReader {
         } catch (CertificateManagementDAOException e) {
             String errorMsg = "Error when retrieving certificate from the the database for the serial number: " +
                     serialNumber;
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (SQLException e) {
             String errorMsg = "Error when making a connection to the database.";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } catch (ClassNotFoundException | IOException e) {
             String errorMsg = "Error when de-serializing saved certificate.";
-            log.error(errorMsg, e);
             throw new KeystoreException(errorMsg, e);
         } finally {
             CertificateManagementDAOFactory.closeConnection();

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/internal/CertificateManagementServiceComponent.java

@@ -26,8 +26,11 @@ import org.wso2.carbon.certificate.mgt.core.config.CertificateConfigurationManag
 import org.wso2.carbon.certificate.mgt.core.config.CertificateManagementConfig;
 import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
+import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
 import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
 import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementServiceImpl;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateMgtSchemaInitializer;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
 /**
@@ -50,15 +53,25 @@ public class CertificateManagementServiceComponent {
                 log.debug("Initializing certificate management core bundle");
             }
             CertificateConfigurationManager.getInstance().initConfig();
-            CertificateManagementConfig config = CertificateConfigurationManager.getInstance().getPolicyManagementConfig();
+            CertificateManagementConfig config = CertificateConfigurationManager.getInstance().getCertificateManagementConfig();
             DataSourceConfig dsConfig = config.getCertificateManagementRepository().getDataSourceConfig();
             CertificateManagementDAOFactory.init(dsConfig);
 
             BundleContext bundleContext = componentContext.getBundleContext();
+
+            /* If -Dsetup option enabled then create Certificate management database schema */
+            String setupOption =
+                    System.getProperty(CertificateManagementConstants.SETUP_PROPERTY);
+            if (setupOption != null) {
+                if (log.isDebugEnabled()) {
+                    log.debug("-Dsetup is enabled. Certificate management repository schema initialization is about to " +
+                              "begin");
+                }
+                this.setupDeviceManagementSchema(dsConfig);
+            }
             bundleContext.registerService(CertificateManagementService.class.getName(),
                     CertificateManagementServiceImpl.getInstance(), null);
 
-
             if (log.isDebugEnabled()) {
                 log.debug("Certificate management core bundle has been successfully initialized");
             }
@@ -86,4 +99,19 @@ public class CertificateManagementServiceComponent {
         CertificateManagementDataHolder.getInstance().setDeviceManagementService(null);
     }
 
+    private void setupDeviceManagementSchema(DataSourceConfig config) throws CertificateManagementException {
+        CertificateMgtSchemaInitializer initializer = new CertificateMgtSchemaInitializer(config);
+        log.info("Initializing Certificate management repository database schema");
+        try {
+            initializer.createRegistryDatabase();
+        } catch (Exception e) {
+            throw new CertificateManagementException(
+                    "Error occurred while initializing Certificate Management database schema", e);
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Certificate management metadata repository schema has been successfully initialized");
+        }
+    }
+
+
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java

@@ -22,8 +22,6 @@ import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementExcep
 import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
 import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
 
 import java.io.InputStream;
 import java.security.PrivateKey;
@@ -54,31 +52,31 @@ public interface CertificateManagementService {
 
     boolean verifySignature(String headerSignature) throws KeystoreException;
 
-    public CertificateResponse verifyPEMSignature(X509Certificate requestCertificate) throws KeystoreException;
+    CertificateResponse verifyPEMSignature(X509Certificate requestCertificate) throws KeystoreException;
 
-    public CertificateResponse verifySubjectDN(String requestDN) throws KeystoreException;
+    CertificateResponse verifySubjectDN(String requestDN) throws KeystoreException;
 
-    public X509Certificate extractCertificateFromSignature(String headerSignature) throws KeystoreException;
+    X509Certificate extractCertificateFromSignature(String headerSignature) throws KeystoreException;
 
     String extractChallengeToken(X509Certificate certificate);
 
     X509Certificate getSignedCertificateFromCSR(String binarySecurityToken) throws KeystoreException;
 
-    public CertificateResponse getCertificateBySerial(String serial) throws KeystoreException;
+    CertificateResponse getCertificateBySerial(String serial) throws KeystoreException;
 
-    public void saveCertificate(List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificate)
+    void saveCertificate(List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificate)
             throws KeystoreException;
 
-    public X509Certificate pemToX509Certificate(String pem) throws KeystoreException;
+    X509Certificate pemToX509Certificate(String pem) throws KeystoreException;
 
-    public CertificateResponse retrieveCertificate(String serialNumber) throws CertificateManagementException;
+    CertificateResponse retrieveCertificate(String serialNumber) throws CertificateManagementException;
 
-    public PaginationResult getAllCertificates(PaginationRequest request) throws CertificateManagementException;
+    PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementException;
 
     boolean removeCertificate(String serialNumber) throws CertificateManagementException;
 
-    public List<CertificateResponse> getCertificates() throws CertificateManagementException;
+    List<CertificateResponse> getCertificates() throws CertificateManagementException;
 
-    public List<CertificateResponse> searchCertificates(String serialNumber) throws CertificateManagementException;
+    List<CertificateResponse> searchCertificates(String serialNumber) throws CertificateManagementException;
 
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java

@@ -27,12 +27,11 @@ import org.wso2.carbon.certificate.mgt.core.dto.CertificateResponse;
 import org.wso2.carbon.certificate.mgt.core.dto.SCEPResponse;
 import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
+import org.wso2.carbon.certificate.mgt.core.exception.TransactionManagementException;
 import org.wso2.carbon.certificate.mgt.core.impl.CertificateGenerator;
 import org.wso2.carbon.certificate.mgt.core.impl.KeyStoreReader;
-import org.wso2.carbon.certificate.mgt.core.util.ConfigurationUtil;
-import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagerUtil;
 
 import java.io.InputStream;
 import java.security.PrivateKey;
@@ -81,7 +80,7 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe
     }
 
     public byte[] getCACapsSCEP() {
-        return ConfigurationUtil.POST_BODY_CA_CAPS.getBytes();
+        return CertificateManagementConstants.POST_BODY_CA_CAPS.getBytes();
     }
 
     public byte[] getPKIMessageSCEP(InputStream inputStream) throws KeystoreException {
@@ -144,30 +143,29 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe
             return certificateDAO.retrieveCertificate(serialNumber);
         } catch (SQLException e) {
             String msg = "Error occurred while opening a connection to the underlying data source";
-            log.error(msg, e);
             throw new CertificateManagementException(msg, e);
         } catch (CertificateManagementDAOException e) {
             String msg = "Error occurred while looking up for the certificate carrying the serial number '" +
                     serialNumber + "' in the underlying certificate repository";
-            log.error(msg, e);
             throw new CertificateManagementException(msg, e);
         } finally {
             CertificateManagementDAOFactory.closeConnection();
         }
     }
 
-    public PaginationResult getAllCertificates(PaginationRequest request) throws CertificateManagementException {
+    @Override
+    public PaginationResult getAllCertificates(int rowNum, int limit) throws CertificateManagementException {
         try {
             CertificateManagementDAOFactory.openConnection();
             CertificateDAO certificateDAO = CertificateManagementDAOFactory.getCertificateDAO();
-            return certificateDAO.getAllCertificates(request);
+            return certificateDAO.getAllCertificates(rowNum, CertificateManagerUtil.validateCertificateListPageSize(limit));
         } catch (SQLException e) {
             String msg = "Error occurred while opening a connection to the underlying data source";
             log.error(msg, e);
             throw new CertificateManagementException(msg, e);
         } catch (CertificateManagementDAOException e) {
             String msg = "Error occurred while looking up for the list of certificates managed in the underlying " +
-                    "certificate repository";
+                         "certificate repository";
             log.error(msg, e);
             throw new CertificateManagementException(msg, e);
         } finally {

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/PaginationResult.java

@@ -0,0 +1,79 @@
+/*
+ * 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.certificate.mgt.core.service;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * This class holds necessary data to represent a paginated result.
+ */
+@ApiModel(value = "PaginationResult", description = "This class carries all information related Pagination Result")
+public class PaginationResult implements Serializable {
+
+    private static final long serialVersionUID = 1998101711L;
+
+    @ApiModelProperty(name = "recordsTotal", value = "The total number of records that are given before filtering", required = true)
+    private int recordsTotal;
+
+    @ApiModelProperty(name = "recordsFiltered", value = "The total number of records that are given after filtering", required = true)
+    private int recordsFiltered;
+
+    @ApiModelProperty(name = "draw", value = "The draw counter that this object is a response to, from the draw parameter sent as part of the data request", required = true)
+    private int draw;
+
+    @ApiModelProperty(name = "data", value = "This holds the db records that matches given criteria", required = true)
+    private List<?> data;
+
+    public int getRecordsTotal() {
+        return recordsTotal;
+    }
+
+    public int getRecordsFiltered() {
+        return recordsFiltered;
+    }
+
+    public void setRecordsFiltered(int recordsFiltered) {
+        this.recordsFiltered = recordsFiltered;
+    }
+
+    public void setRecordsTotal(int recordsTotal) {
+        this.recordsTotal = recordsTotal;
+
+    }
+
+    public List<?> getData() {
+        return data;
+    }
+
+    public void setData(List<?> data) {
+        this.data = data;
+    }
+
+    public int getDraw() {
+        return draw;
+    }
+
+    public void setDraw(int draw) {
+        this.draw = draw;
+    }
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagementConstants.java

@@ -21,6 +21,34 @@ package org.wso2.carbon.certificate.mgt.core.util;
 
 public final class CertificateManagementConstants {
 
-    public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml";
+    public static final String CERTIFICATE_CONFIG_XML_FILE = "certificate-config.xml";
+    public static final String SETUP_PROPERTY = "setup";
+    public static final String CARBON_HOME = "carbon.home";
+    public static final String CARBON_HOME_ENTRY = "${carbon.home}";
 
+    public static final String PROVIDER = "BC";
+    public static final String CERTIFICATE_KEYSTORE = "CertificateKeystoreType";
+    public static final String RSA = "RSA";
+    public static final String SHA256_RSA = "SHA256WithRSAEncryption";
+    public static final String X_509 = "X.509";
+    public static final String POST_BODY_CA_CAPS = "POSTPKIOperation\nSHA-1\nDES3\n";
+    public static final String DES_EDE = "DESede";
+    public static final String CONF_LOCATION = "conf.location";
+    public static final String DEFAULT_PRINCIPAL = "O=WSO2, OU=Mobile, C=LK";
+    public static final String RSA_PRIVATE_KEY_BEGIN_TEXT = "-----BEGIN RSA PRIVATE KEY-----\n";
+    public static final String RSA_PRIVATE_KEY_END_TEXT = "-----END RSA PRIVATE KEY-----";
+    public static final String EMPTY_TEXT = "";
+    public static final int RSA_KEY_LENGTH = 1024;
+
+    public static final class DataBaseTypes {
+        private DataBaseTypes() {
+            throw new AssertionError();
+        }
+        public static final String DB_TYPE_MYSQL = "MySQL";
+        public static final String DB_TYPE_ORACLE = "Oracle";
+        public static final String DB_TYPE_MSSQL = "Microsoft SQL Server";
+        public static final String DB_TYPE_DB2 = "DB2";
+        public static final String DB_TYPE_H2 = "H2";
+        public static final String DB_TYPE_POSTGRESQL = "PostgreSQL";
+    }
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagerUtil.java

@@ -22,6 +22,8 @@ package org.wso2.carbon.certificate.mgt.core.util;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
+import org.wso2.carbon.certificate.mgt.core.config.CertificateConfigurationManager;
+import org.wso2.carbon.certificate.mgt.core.config.CertificateManagementConfig;
 import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.certificate.mgt.core.config.datasource.JNDILookupDefinition;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOUtil;
@@ -88,4 +90,18 @@ public class CertificateManagerUtil {
         return dataSource;
     }
 
-}
+    public static int validateCertificateListPageSize(int limit) throws CertificateManagementException {
+        if (limit == 0) {
+            CertificateManagementConfig certificateManagementConfig = CertificateConfigurationManager.getInstance().
+                    getCertificateManagementConfig();
+            if (certificateManagementConfig != null) {
+                return certificateManagementConfig.getDefaultPageSize();
+            } else {
+                throw new CertificateManagementException("Certificate-Mgt configuration has not initialized. Please check the " +
+                                                    "certificate-config.xml file.");
+            }
+        }
+        return limit;
+    }
+
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateMgtSchemaInitializer.java

@@ -0,0 +1,47 @@
+/*
+ * 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.certificate.mgt.core.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.utils.CarbonUtils;
+import org.wso2.carbon.utils.dbcreator.DatabaseCreator;
+
+import java.io.File;
+
+public final class CertificateMgtSchemaInitializer extends DatabaseCreator {
+
+	private static final Log log = LogFactory.getLog(CertificateMgtSchemaInitializer.class);
+	private static final String setupSQLScriptBaseLocation =
+			CarbonUtils.getCarbonHome() + File.separator + "dbscripts" + File.separator +  "certMgt" + File.separator;
+
+	public CertificateMgtSchemaInitializer(DataSourceConfig config) {
+		super(CertificateManagerUtil.resolveDataSource(config));
+	}
+
+	protected String getDbScriptLocation(String databaseType) {
+		String scriptName = databaseType + ".sql";
+		if (log.isDebugEnabled()) {
+			log.debug("Loading database script from :" + scriptName);
+		}
+		return setupSQLScriptBaseLocation.replaceFirst("DBTYPE", databaseType) + scriptName;
+	}
+
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CommonUtil.java

@@ -28,7 +28,6 @@ public class CommonUtil {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(targetDate);
         calendar.add(Calendar.DATE, -2);
-
         return calendar.getTime();
     }
 
@@ -37,7 +36,6 @@ public class CommonUtil {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(targetDate);
         calendar.add(Calendar.YEAR, 100);
-
         return calendar.getTime();
     }
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/ConfigurationUtil.java

@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2015, 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.certificate.mgt.core.util;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.xml.sax.SAXException;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ConfigurationUtil {
-
-	public static final String PATH_CERTIFICATE_KEYSTORE = "CertificateKeystoreLocation";
-	public static final String CERTIFICATE_KEYSTORE_PASSWORD = "CertificateKeystorePassword";
-	public static final String KEYSTORE_CA_CERT_PRIV_PASSWORD = "CAPrivateKeyPassword";
-	public static final String KEYSTORE_RA_CERT_PRIV_PASSWORD = "RAPrivateKeyPassword";
-	public static final String CA_CERT_ALIAS = "CACertAlias";
-	public static final String RA_CERT_ALIAS = "RACertAlias";
-	public static final String SIGNATURE_ALGORITHM = "SHA1withRSA";
-	public static final String PROVIDER = "BC";
-	public static final String KEYSTORE = "Type";
-	public static final String CERTIFICATE_KEYSTORE = "CertificateKeystoreType";
-	public static final String RSA = "RSA";
-	public static final String UTF_8 = "UTF-8";
-	public static final String SHA256_RSA = "SHA256WithRSAEncryption";
-	public static final String X_509 = "X.509";
-	public static final String POST_BODY_CA_CAPS = "POSTPKIOperation\nSHA-1\nDES3\n";
-	public static final String DES_EDE = "DESede";
-	public static final String CONF_LOCATION = "conf.location";
-    public static final String DEFAULT_PRINCIPAL = "O=WSO2, OU=Mobile, C=LK";
-    public static final String RSA_PRIVATE_KEY_BEGIN_TEXT = "-----BEGIN RSA PRIVATE KEY-----\n";
-    public static final String RSA_PRIVATE_KEY_END_TEXT = "-----END RSA PRIVATE KEY-----";
-    public static final String EMPTY_TEXT = "";
-	public static final int RSA_KEY_LENGTH = 1024;
-	public static final long MILLI_SECONDS = 1000L * 60 * 60 * 24;
-	private static final String CARBON_HOME = "carbon.home";
-	private static final String CERTIFICATE_CONFIG_XML = "certificate-config.xml";
-	private static final String CARBON_HOME_ENTRY = "${carbon.home}";
-	private static final String[] certificateConfigEntryNames = { CA_CERT_ALIAS, RA_CERT_ALIAS,
-			CERTIFICATE_KEYSTORE, PATH_CERTIFICATE_KEYSTORE, CERTIFICATE_KEYSTORE_PASSWORD,
-			KEYSTORE_CA_CERT_PRIV_PASSWORD, KEYSTORE_RA_CERT_PRIV_PASSWORD };
-	private static ConfigurationUtil configurationUtil;
-	private static Map<String, String> configMap;
-
-	private static Map<String, String> readCertificateConfigurations() throws KeystoreException {
-
-		String certConfLocation = System.getProperty(CONF_LOCATION) + File.separator + CERTIFICATE_CONFIG_XML;
-
-		if (configurationUtil == null || configMap == null) {
-
-			configurationUtil = new ConfigurationUtil();
-			configMap = new HashMap<String, String>();
-
-			Document document;
-			try {
-				File fXmlFile = new File(certConfLocation);
-				DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
-				documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-				DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-				document = documentBuilder.parse(fXmlFile);
-			} catch (ParserConfigurationException e) {
-				throw new KeystoreException("Error parsing configuration in certificate-config.xml file");
-			} catch (SAXException e) {
-                throw new KeystoreException("SAX exception in certificate-config.xml file");
-            } catch (IOException e) {
-                throw new KeystoreException("Error reading certificate-config.xml file");
-            }
-
-			for (String configEntry : certificateConfigEntryNames) {
-				NodeList elements = document.getElementsByTagName(configEntry);
-				if (elements != null && elements.getLength() > 0) {
-					configMap.put(configEntry, elements.item(0).getTextContent());
-				}
-			}
-
-			String certKeyStoreLocation = replaceCarbonHomeEnvEntry(configMap.get(PATH_CERTIFICATE_KEYSTORE));
-			if (certKeyStoreLocation != null) {
-				configMap.put(PATH_CERTIFICATE_KEYSTORE, certKeyStoreLocation);
-			}
-		}
-
-		return configMap;
-	}
-
-	public static String getConfigEntry(final String entry) throws KeystoreException {
-
-		Map<String, String> configurationMap = readCertificateConfigurations();
-		String configValue = configurationMap.get(entry);
-
-		if (configValue == null) {
-			throw new KeystoreException(String.format("Configuration entry %s not available", entry));
-		}
-
-		return configValue.trim();
-	}
-
-	private static String replaceCarbonHomeEnvEntry(String entry) {
-		if (entry != null && entry.toLowerCase().contains(CARBON_HOME_ENTRY)) {
-			return entry.replace(CARBON_HOME_ENTRY, System.getProperty(CARBON_HOME));
-		}
-
-		return null;
-	}
-
-    public static ConfigurationUtil getInstance() {
-        if (configurationUtil == null) {
-            synchronized (ConfigurationUtil.class) {
-                if (configurationUtil == null) {
-                    configurationUtil = new ConfigurationUtil();
-                }
-            }
-        }
-        return configurationUtil;
-    }
-}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/TenantUtil.java

@@ -1,15 +0,0 @@
-package org.wso2.carbon.certificate.mgt.core.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.certificate.mgt.core.exception.CertificateManagementException;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-
-public class TenantUtil {
-
-    private static final Log log = LogFactory.getLog(TenantUtil.class);
-
-    public static int getTenanntId(String tenantDomain) throws CertificateManagementException {
-        return PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-    }
-}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGeneratorTestSuite.java

@@ -6,7 +6,7 @@ import org.apache.commons.logging.LogFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.wso2.carbon.certificate.mgt.core.exception.KeystoreException;
-import org.wso2.carbon.certificate.mgt.core.util.ConfigurationUtil;
+import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,8 +34,8 @@ public class CertificateGeneratorTestSuite {
             List<X509Certificate> rootCertificates = certificateGenerator.getRootCertificates(ca, ra);
             Assert.assertNotNull(rootCertificates, "Root certificates retrieved");
 
-            Assert.assertEquals(rootCertificates.get(0).getType(), ConfigurationUtil.X_509);
-            Assert.assertEquals(rootCertificates.get(1).getType(), ConfigurationUtil.X_509);
+            Assert.assertEquals(rootCertificates.get(0).getType(), CertificateManagementConstants.X_509);
+            Assert.assertEquals(rootCertificates.get(1).getType(), CertificateManagementConstants.X_509);
         } catch (IOException e) {
             Assert.fail("Error reading byte streams for CA and RA ", e);
         } catch (KeystoreException e) {

components/certificate-mgt/pom.xml

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

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

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

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

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

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

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

components/device-mgt-extensions/pom.xml

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

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

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

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

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

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

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -110,14 +110,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -237,6 +240,7 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>

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

@@ -20,7 +20,8 @@ package org.wso2.carbon.device.mgt.jaxrs.beans;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.wso2.carbon.user.mgt.common.UIPermissionNode;
+
+import java.util.List;
 
 @ApiModel(value = "RoleInfo", description = "Role details including permission and the users in the roles are " +
         "wrapped here.")
@@ -28,19 +29,12 @@ public class RoleInfo {
 
     @ApiModelProperty(name = "roleName", value = "The name of the role.", required = true)
     private String roleName;
-    @ApiModelProperty(name = "permissions", value = "Lists out all the permissions associated with roles.",
+    @ApiModelProperty(name = "scopes", value = "Lists out all the scopes associated with roles.",
             required = true, dataType = "List[java.lang.String]")
-    private String[] permissions;
+    private List<String> scopes;
     @ApiModelProperty(name = "users", value = "The list of users assigned to the selected role.",
             required = true, dataType = "List[java.lang.String]")
     private String[] users;
-    @ApiModelProperty(name = "permissionList", value = "This contain the following, " +
-            "\n resourcePath\tThe path related to the API.\n " +
-            "displayName\tThe name of the permission that is shown " +
-            "in the UI.\n" +
-            "nodeList\tLists out the nested permissions.",
-            required = true)
-    private UIPermissionNode permissionList;
 
     public String getRoleName() {
         return roleName;
@@ -50,12 +44,12 @@ public class RoleInfo {
         this.roleName = roleName;
     }
 
-    public String[] getPermissions() {
-        return permissions;
+    public List<String> getScopes() {
+        return scopes;
     }
 
-    public void setPermissions(String[] permissions) {
-        this.permissions = permissions;
+    public void setScopes(List<String> scopes) {
+        this.scopes = scopes;
     }
 
     public String[] getUsers() {
@@ -66,11 +60,4 @@ public class RoleInfo {
         this.users = users;
     }
 
-    public UIPermissionNode getPermissionList() {
-        return permissionList;
-    }
-
-    public void setPermissionList(UIPermissionNode permissionList) {
-        this.permissionList = permissionList;
-    }
 }

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

@@ -0,0 +1,71 @@
+/*
+* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+* 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.
+*/
+package org.wso2.carbon.device.mgt.jaxrs.beans;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel(value = "Scope", description = "Template of the authorization scope")
+public class Scope {
+
+    @ApiModelProperty(name = "scope key", value = "An unique string as a key.", required = true)
+    private String key;
+
+    @ApiModelProperty(name = "scope name", value = "Scope name.", required = true)
+    private String name;
+
+    @ApiModelProperty(name = "roles", value = "List of roles to be associated with the scope", required = true)
+    private String roles;
+
+    @ApiModelProperty(name = "scope description", value = "A description of the scope", required = true)
+    private String description;
+
+    public Scope() {
+    }
+
+    public String getKey() {
+        return this.key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRoles() {
+        return this.roles;
+    }
+
+    public void setRoles(String roles) {
+        this.roles = roles;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ActivityList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
@@ -33,7 +33,7 @@ import javax.ws.rs.core.Response;
 /**
  * Activity related REST-API implementation.
  */
-@API(name = "Activities", version = "1.0.0", context = "/devicemgt_admin/activities", tags = {"devicemgt_admin"})
+@API(name = "Activity Info Provider", version = "1.0.0", context = "/api/device-mgt/v1.0/activities", tags = {"devicemgt_admin"})
 
 @Path("/activities")
 @Api(value = "Activity Info Provider", description = "Activity related information manipulation. For example operation details " +
@@ -92,10 +92,7 @@ public interface ActivityInfoProviderService {
                     message = "Internal Server Error. \n Server error occurred while fetching activity data.",
                     response = ErrorResponse.class)
     })
-    @Permission(
-            scope = "activity-view",
-            permissions = {"/permission/admin/device-mgt/admin/activities/view"}
-    )
+    @Scope(key = "activity:view", name = "View Activities", description = "")
     Response getActivity(
             @ApiParam(
                     name = "id",
@@ -156,10 +153,7 @@ public interface ActivityInfoProviderService {
                     message = "Internal Server Error. \n Server error occurred while fetching activity data.",
                     response = ErrorResponse.class)
     })
-    @Permission(
-            scope = "activity-view",
-            permissions = {"/permission/admin/device-mgt/admin/activities/view"}
-    )
+    @Scope(key = "activity:view", name = "View Activities", description = "")
     Response getActivities(
             @ApiParam(
                     name = "since",

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 
@@ -31,7 +31,7 @@ import javax.ws.rs.core.Response;
 /**
  * General Tenant Configuration REST-API.
  */
-@API(name = "Configuration", version = "1.0.0", context = "/devicemgt_admin/configuration", tags = {"devicemgt_admin"})
+@API(name = "Configuration Management", version = "1.0.0", context = "/api/device-mgt/v1.0/configuration", tags = {"devicemgt_admin"})
 
 @Path("/configuration")
 @Api(value = "Configuration Management", description = "General Tenant Configuration management capabilities are exposed " +
@@ -80,12 +80,8 @@ public interface ConfigurationManagementService {
                     message = "Internal Server Error. \n Server error occurred while fetching the general " +
                             "platform configuration.",
                     response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "configuration-view",
-            permissions = {"/permission/admin/device-mgt/admin/platform-configs/view"}
-    )
+    })
+    @Scope(key = "configuration:view", name = "View Configurations", description = "")
     Response getConfiguration(
             @ApiParam(
                     name = "If-Modified-Since",
@@ -130,12 +126,8 @@ public interface ConfigurationManagementService {
                     message = "Internal Server Error. \n " +
                             "Server error occurred while modifying general platform configuration.",
                     response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "configuration-modify",
-            permissions = {"/permission/admin/device-mgt/admin/platform-configs/modify"}
-    )
+    })
+    @Scope(key = "configuration:modify", name = "Modify Configurations", description = "")
     Response updateConfiguration(
             @ApiParam(
                     name = "configuration",

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
@@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
 /**
  * Device related REST-API. This can be used to manipulated device related details.
  */
-@API(name = "Device", version = "1.0.0", context = "/api/device-mgt/admin/devices", tags = {"devicemgt_admin"})
+@API(name = "Device Management", version = "1.0.0", context = "/api/device-mgt/v1.0/devices", tags = {"devicemgt_admin"})
 
 @Path("/devices")
 @Api(value = "Device Management", description = "This API carries all device management related operations " +
@@ -92,10 +92,7 @@ public interface DeviceManagementService {
                     message = "Internal Server Error. \n Server error occurred while fetching the device list.",
                     response = ErrorResponse.class)
     })
-    @Permission(
-            scope = "device-list",
-            permissions = {"/permission/admin/device-mgt/admin/devices/list"}
-    )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response getDevices(
             @ApiParam(
                     name = "name",
@@ -115,15 +112,7 @@ public interface DeviceManagementService {
                     value = "Username of owner of the devices.",
                     required = false)
             @QueryParam("user")
-            @Size(max = 45)
-            String user,
-            @ApiParam(
-                    name = "roleName",
-                    value = "Role name of the devices to be fetched.",
-                    required = false)
-            @QueryParam("roleName")
-            @Size(max = 45)
-            String roleName,
+                    String user,
             @ApiParam(
                     name = "ownership",
                     allowableValues = "BYOD, COPE",
@@ -210,13 +199,7 @@ public interface DeviceManagementService {
                                     "Server error occurred while retrieving information requested device.",
                             response = ErrorResponse.class)
             })
-    @Permission(
-            scope = "device-view",
-            permissions = {
-                    "/permission/admin/device-mgt/admin/devices/view",
-                    "/permission/admin/device-mgt/user/devices/view"
-            }
-    )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response getDevice(
             @ApiParam(
                     name = "type",
@@ -298,12 +281,7 @@ public interface DeviceManagementService {
                                     "Server error occurred while retrieving feature list of the device.",
                             response = ErrorResponse.class)
             })
-    @Permission(
-            scope = "device-search",
-            permissions = {"/permission/admin/device-mgt/admin/devices/view",
-                    "/permission/admin/device-mgt/user/devices/view"
-            }
-    )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response getFeaturesOfDevice(
             @ApiParam(
                     name = "type",
@@ -379,10 +357,7 @@ public interface DeviceManagementService {
                                     "Server error occurred while enrolling the device.",
                             response = ErrorResponse.class)
             })
-    @Permission(
-            scope = "device-search",
-            permissions = {"/permission/admin/device-mgt/admin/devices/list"}
-    )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response searchDevices(
             @ApiParam(
                     name = "offset",
@@ -398,7 +373,7 @@ public interface DeviceManagementService {
             int limit,
             @ApiParam(
                     name = "searchContext",
-                    value = "List of search conditions.",
+                    value = "List of device properties  as search conditions.",
                     required = true)
             SearchContext searchContext);
 
@@ -461,13 +436,8 @@ public interface DeviceManagementService {
                                     "Server error occurred while retrieving installed application list of the device.",
                             response = ErrorResponse.class)
             })
-    @Permission(
-            scope = "operation-view",
-            permissions = {
-                    "/permission/admin/device-mgt/admin/devices/view",
-                    "/permission/admin/device-mgt/user/devices/view"
-            }
-    )
+    @Scope(key = "device:view", name = "View Devices", description = "")
+
     Response getInstalledApplications(
             @ApiParam(
                     name = "type",
@@ -563,13 +533,7 @@ public interface DeviceManagementService {
                                     "Server error occurred while retrieving operation list scheduled for the device.",
                             response = ErrorResponse.class)
             })
-    @Permission(
-            scope = "operation-view",
-            permissions = {
-                    "/permission/admin/device-mgt/admin/devices/view",
-                    "/permission/admin/device-mgt/user/devices/view"
-            }
-    )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response getDeviceOperations(
             @ApiParam(
                     name = "type",
@@ -667,6 +631,7 @@ public interface DeviceManagementService {
                             response = ErrorResponse.class)
             }
     )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response getEffectivePolicyOfDevice(
             @ApiParam(
                     name = "type",
@@ -718,6 +683,7 @@ public interface DeviceManagementService {
                             response = ErrorResponse.class)
             }
     )
+    @Scope(key = "device:view", name = "View Devices", description = "")
     Response getComplianceDataOfDevice(
             @ApiParam(
                     name = "type",

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

@@ -16,11 +16,11 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
+package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceTypeList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 
@@ -28,9 +28,9 @@ import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@API(name = "Device Type Management", version = "1.0.0", context = "/admin/device-types", tags = {"devicemgt_admin"})
+@API(name = "Device Type Management", version = "1.0.0", context = "/api/device-mgt/v1.0/admin/device-types", tags = {"devicemgt_admin"})
 
-@Path("/admin/device-types")
+@Path("/device-types")
 @Api(value = "Device Type Management", description = "This API corresponds to all tasks related to device " +
         "type management")
 @Produces(MediaType.APPLICATION_JSON)
@@ -78,10 +78,7 @@ public interface DeviceTypeManagementService {
                             response = ErrorResponse.class)
             }
     )
-    @Permission(
-            scope = "read:device-types",
-            permissions = {"/permission/admin/device-mgt/admin/device-types/view"}
-    )
+    @Scope(key = "device-type:admin:view", name = "View device types", description = "")
     Response getDeviceTypes(
             @ApiParam(
                     name = "If-Modified-Since",

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

@@ -18,7 +18,7 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
 import org.wso2.carbon.device.mgt.jaxrs.NotificationList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
@@ -34,7 +34,7 @@ import javax.ws.rs.core.Response;
 /**
  * Notifications related REST-API.
  */
-@API(name = "Device Notification Management API", version = "1.0.0", context = "/devicemgt_admin/notifications",
+@API(name = "Device Notification Management", version = "1.0.0", context = "/api/device-mgt/v1.0/notifications",
         tags = {"devicemgt_admin"})
 @Api(value = "Device Notification Management", description = "Device notification related operations can be found here.")
 @Path("/notifications")
@@ -89,14 +89,8 @@ public interface NotificationManagementService {
                             message = "Internal Server Error. " +
                                     "\n Server error occurred while fetching the notification list.",
                             response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "device-notification-view",
-            permissions = {
-            "/permission/admin/device-mgt/admin/notifications/view",
-            "/permission/admin/device-mgt/user/notifications/view" }
-    )
+            })
+    @Scope(key = "notification:view", name = "View and manage notifications", description = "")
     Response getNotifications(
             @ApiParam(
                     name = "status",
@@ -148,10 +142,7 @@ public interface NotificationManagementService {
                             message = "Error occurred while updating notification status.")
             }
     )
-    @Permission(
-            scope = "",
-            permissions = { "" }
-    )
+    @Scope(key = "notification:view", name = "View and manage notifications", description = "")
     Response updateNotificationStatus(
             @ApiParam(
                     name = "id",

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

@@ -19,7 +19,8 @@
 package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.API;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PolicyWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PriorityUpdatedPolicyWrapper;
@@ -35,6 +36,9 @@ import java.util.List;
  * Policy related REST-API. This can be used to manipulated policies and associate them with devices, users, roles,
  * groups.
  */
+@API(name = "Device Policy Management", version = "1.0.0", context = "/api/device-mgt/v1.0/policies",
+        tags = {"devicemgt_admin"})
+
 @Api(value = "Device Policy Management", description = "This API carries all the necessary functionalities " +
         "around device policy management")
 @Path("/policies")
@@ -95,12 +99,8 @@ public interface PolicyManagementService {
                             message = "Internal Server Error. \n " +
                                     "Server error occurred while adding a new policy.",
                             response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-modify",
-            permissions = {"/permission/admin/device-mgt/admin/policies/add"}
-    )
+            })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response addPolicy(
             @ApiParam(
                     name = "policy",
@@ -153,12 +153,8 @@ public interface PolicyManagementService {
                             message = ("Internal Server Error. \n Server error occurred while fetching " +
                                     "policies."),
                             response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-view",
-            permissions = {"/permission/admin/device-mgt/admin/policies/list"}
-    )
+            })
+    @Scope(key = "policy:view", name = "Views policies", description = "")
     Response getPolicies(
             @ApiParam(
                     name = "If-Modified-Since",
@@ -224,10 +220,7 @@ public interface PolicyManagementService {
                                     "policy.",
                             response = ErrorResponse.class)
             })
-    @Permission(
-            scope = "policy-view",
-            permissions = {"/permission/admin/device-mgt/admin/policies/list"}
-    )
+    @Scope(key = "policy:view", name = "View policies", description = "")
     Response getPolicy(
             @ApiParam(
                     name = "id",
@@ -290,12 +283,8 @@ public interface PolicyManagementService {
                             message = "Internal Server Error. \n " +
                                     "Server error occurred while updating the policy.",
                             response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-modify",
-            permissions = {"/permission/admin/device-mgt/admin/policies/update"}
-    )
+            })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response updatePolicy(
             @ApiParam(
                     name = "id",
@@ -340,12 +329,8 @@ public interface PolicyManagementService {
                             message = "Internal Server Error. \n " +
                                     "Server error occurred while bulk removing policies.",
                             response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-modify",
-            permissions = {"/permission/admin/device-mgt/admin/policies/remove"}
-    )
+            })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response removePolicies(
             @ApiParam(
                     name = "policyIds",
@@ -380,13 +365,8 @@ public interface PolicyManagementService {
                             code = 500,
                             message = "ErrorResponse in activating policies.",
                             response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-modify", permissions = {
-            "/permission/admin/device-mgt/admin/policies/update",
-            "/permission/admin/device-mgt/admin/policies/add"}
-    )
+            })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response activatePolicies(
             @ApiParam(
                     name = "policyIds",
@@ -394,7 +374,7 @@ public interface PolicyManagementService {
                     required = true)
                     List<Integer> policyIds);
 
-    @POST
+    @PUT
     @Path("/deactivate-policy")
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,
@@ -421,14 +401,8 @@ public interface PolicyManagementService {
                     code = 500,
                     message = "ErrorResponse in deactivating policies.",
                     response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-modify",
-            permissions = {
-            "/permission/admin/device-mgt/admin/policies/update",
-            "/permission/admin/device-mgt/admin/policies/add"}
-    )
+    })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response deactivatePolicies(
             @ApiParam(
                     name = "policyIds",
@@ -460,12 +434,8 @@ public interface PolicyManagementService {
                     code = 500,
                     message = "ErrorResponse in deactivating policies.",
                     response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "policy-modify",
-            permissions = {"/permission/admin/device-mgt/admin/policies/update"}
-    )
+    })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response applyChanges();
 
 
@@ -493,11 +463,8 @@ public interface PolicyManagementService {
                     code = 500,
                     message = "Exception in updating policy priorities.",
                     response = ErrorResponse.class)
-            }
-    )
-    @Permission(
-            scope = "",
-            permissions = {})
+    })
+    @Scope(key = "policy:manage", name = "Add policies", description = "")
     Response updatePolicyPriorities(
             @ApiParam(
                     name = "priorityUpdatedPolicies",

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

@@ -20,18 +20,17 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
-import org.wso2.carbon.user.mgt.common.UIPermissionNode;
+import org.wso2.carbon.device.mgt.jaxrs.beans.Scope;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
 
-@API(name = "Role", version = "1.0.0", context = "/devicemgt_admin/roles", tags = {"devicemgt_admin"})
+@API(name = "Role Management", version = "1.0.0", context = "/api/device-mgt/v1.0/roles", tags = {"devicemgt_admin"})
 
 @Path("/roles")
 @Api(value = "Role Management", description = "Role management related operations can be found here.")
@@ -77,11 +76,7 @@ public interface RoleManagementService {
                             message = "Internal Server Error. \n Server error occurred while fetching requested list of roles.",
                             response = ErrorResponse.class)
             })
-    @Permission(scope = "roles-view", permissions = {
-            "/permission/admin/device-mgt/admin/roles/list",
-            "/permission/admin/device-mgt/admin/users/view",
-            "/permission/admin/device-mgt/admin/policies/add",
-            "/permission/admin/device-mgt/admin/policies/update"})
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:view", name = "View roles", description = "")
     Response getRoles(
             @ApiParam(
                     name = "filter",
@@ -110,16 +105,16 @@ public interface RoleManagementService {
             @QueryParam("limit") int limit);
 
     @GET
-    @Path("/{roleName}/permissions")
+    @Path("/scopes")
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "GET",
-            value = "Getting permission details of a role.",
+            value = "Getting authorization scopes.",
             notes = "In an organization an individual is associated a with set of responsibilities based on their " +
-                    "role. In  EMM you are able to configure permissions based on the responsibilities carried " +
-                    "out by a role. Therefore if you wish to retrieve the permission details of a role, you can do " +
+                    "role. In  EMM you are able to configure scopes based on the responsibilities carried " +
+                    "out by a role. Therefore if you wish to retrieve the scopes details of roles, you can do " +
                     "so using this REST API.",
-            response = UIPermissionNode.class,
+            response = List.class,
             responseContainer = "List",
             tags = "Role Management"
     )
@@ -127,8 +122,8 @@ public interface RoleManagementService {
             value = {
                     @ApiResponse(
                             code = 200,
-                            message = "OK. \n Successfully fetched the permission list of the given role.",
-                            response = UIPermissionNode.class,
+                            message = "OK. \n Successfully fetched the scopes list.",
+                            response = List.class,
                             responseContainer = "List",
                             responseHeaders = {
                                     @ResponseHeader(
@@ -163,13 +158,8 @@ public interface RoleManagementService {
                             message = "Internal Server ErrorResponse. \n Server error occurred while fetching the permission list of the requested role.",
                             response = ErrorResponse.class)
             })
-    @Permission(scope = "roles-view", permissions = {"/permission/admin/device-mgt/admin/roles/list"})
-    Response getPermissionsOfRole(
-            @ApiParam(
-                    name = "roleName",
-                    value = "Name of the role.",
-                    required = true)
-            @PathParam("roleName") String roleName,
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:view", name = "View roles", description = "")
+    Response getScopes(
             @ApiParam(
                     name = "If-Modified-Since",
                     value = "Validates if the requested variant has not been modified since the time specified",
@@ -226,7 +216,7 @@ public interface RoleManagementService {
                                     "requested role.",
                             response = ErrorResponse.class)
     })
-    @Permission(scope = "roles-view", permissions = {"/permission/admin/device-mgt/admin/roles/list"})
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:view", name = "View roles", description = "")
     Response getRole(
             @ApiParam(
                     name = "roleName",
@@ -286,7 +276,7 @@ public interface RoleManagementService {
                     message = "Internal Server Error. \n Server error occurred while adding a new role.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "roles-modify", permissions = {"/permission/admin/device-mgt/admin/roles/add"})
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:manage", name = "Add roles", description = "")
     Response addRole(
             @ApiParam(
                     name = "role",
@@ -336,7 +326,7 @@ public interface RoleManagementService {
                     message = "Internal Server Error. \n Server error occurred while updating the role.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "roles-modify", permissions = {"/permission/admin/device-mgt/admin/roles/update"})
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:manage", name = "Add roles", description = "")
     Response updateRole(
             @ApiParam(
                     name = "roleName",
@@ -373,7 +363,7 @@ public interface RoleManagementService {
                     message = "Internal Server Error. \n Server error occurred while removing the role.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "roles-modify", permissions = {"/permission/admin/device-mgt/admin/roles/remove"})
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:manage", name = "Add roles", description = "")
     Response deleteRole(
             @ApiParam(
                     name = "roleName",
@@ -431,7 +421,7 @@ public interface RoleManagementService {
                                     "Server error occurred while updating the user list of the role.",
                             response = ErrorResponse.class)
     })
-    @Permission(scope = "roles-modify", permissions = {"/permission/admin/device-mgt/admin/roles/update"})
+    @org.wso2.carbon.apimgt.annotations.api.Scope(key = "role:manage", name = "Add roles", description = "")
     Response updateUsersOfRole(
             @ApiParam(
                     name = "roleName",

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.*;
 
 import javax.ws.rs.*;
@@ -29,7 +29,7 @@ import javax.ws.rs.core.Response;
 import java.util.List;
 
 
-@API(name = "User Management API", version = "1.0.0", context = "/devicemgt_admin/users", tags = {"devicemgt_admin"})
+@API(name = "User Management", version = "1.0.0", context = "/api/device-mgt/v1.0/users", tags = {"devicemgt_admin"})
 
 @Path("/users")
 @Api(value = "User Management", description = "User management related operations can be found here.")
@@ -83,7 +83,7 @@ public interface UserManagementService {
                             message = "Internal Server Error. \n Server error occurred while adding a new user.",
                             response = ErrorResponse.class)
             })
-    @Permission(scope = "user-modify", permissions = {"/permission/admin/device-mgt/admin/user/add"})
+    @Scope(key = "user:manage", name = "Add users", description = "")
     Response addUser(
             @ApiParam(
                     name = "user",
@@ -135,7 +135,7 @@ public interface UserManagementService {
                             " fetching the requested user.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-view", permissions = {"/permission/admin/device-mgt/admin/user/view"})
+    @Scope(key = "user:view", name = "View users", description = "")
     Response getUser(
             @ApiParam(
                     name = "username",
@@ -192,7 +192,7 @@ public interface UserManagementService {
                             "Server error occurred while updating the user.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-modify", permissions = {"/permission/admin/device-mgt/admin/user/update"})
+    @Scope(key = "user:manage", name = "Add users", description = "")
     Response updateUser(
             @ApiParam(
                     name = "username",
@@ -227,7 +227,7 @@ public interface UserManagementService {
                     response = ErrorResponse.class
             )
     })
-    @Permission(scope = "user-modify", permissions = {"/permission/admin/device-mgt/admin/user/remove"})
+    @Scope(key = "user:manage", name = "Add users", description = "")
     Response removeUser(
             @ApiParam(name = "username", value = "Username of the user to be deleted.", required = true)
             @PathParam("username") String username);
@@ -276,7 +276,7 @@ public interface UserManagementService {
                             " assigned to the user.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-view", permissions = {"/permission/admin/device-mgt/admin/user/view"})
+    @Scope(key = "user:view", name = "View users", description = "")
     Response getRolesOfUser(
             @ApiParam(name = "username", value = "Username of the user.", required = true)
             @PathParam("username") String username);
@@ -319,7 +319,7 @@ public interface UserManagementService {
                     message = "Internal Server Error. \n Server error occurred while fetching the user list.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-view", permissions = {"/permission/admin/device-mgt/admin/user/list"})
+    @Scope(key = "user:view", name = "View users", description = "")
     Response getUsers(
             @ApiParam(
                     name = "filter",
@@ -386,7 +386,7 @@ public interface UserManagementService {
                             "list that matches the given filter.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-view", permissions = {"/permission/admin/device-mgt/admin/user/list"})
+    @Scope(key = "user:view", name = "View users", description = "")
     Response getUserNames(
             @ApiParam(
                     name = "filter",
@@ -440,7 +440,7 @@ public interface UserManagementService {
                             "Server error occurred while updating credentials of the user.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-modify", permissions = {"/permission/admin/login"})
+    @Scope(key = "user:view", name = "View users", description = "")
     Response resetPassword(
             @ApiParam(
                     name = "username",
@@ -483,7 +483,7 @@ public interface UserManagementService {
                             "Server error occurred while updating credentials of the user.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-invite", permissions = {"/permission/admin/device-mgt/admin/user/invite"})
+    @Scope(key = "user:manage", name = "Add users", description = "")
     Response inviteExistingUsersToEnrollDevice(
             @ApiParam(
                     name = "users",

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

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ApplicationWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
@@ -31,7 +32,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@API(name = "Application", version = "1.0.0", context = "/devicemgt_admin/applications", tags = {"devicemgt_admin"})
+@API(name = "Application Management Admin", version = "1.0.0", context = "/api/device-mgt/v1.0/admin/applications", tags = {"devicemgt_admin"})
 
 @Path("/admin/applications")
 @Api(value = "Application Management Administrative Service", description = "This an  API intended to be used by " +
@@ -73,6 +74,7 @@ public interface ApplicationManagementAdminService {
                             "a given set of devices.",
                     response = ErrorResponse.class)
     })
+    @Scope(key = "application:manage", name = "Install/Uninstall applications", description = "")
     Response installApplication(
             @ApiParam(
                     name = "applicationWrapper",
@@ -111,6 +113,7 @@ public interface ApplicationManagementAdminService {
                             "a given set of devices.",
                     response = ErrorResponse.class)
     })
+    @Scope(key = "application:manage", name = "Install/Uninstall applications", description = "")
     Response uninstallApplication(
             @ApiParam(
                     name = "applicationWrapper",

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

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
 
 import io.swagger.annotations.*;
 import org.wso2.carbon.apimgt.annotations.api.API;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 
@@ -28,7 +29,7 @@ import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-@API(name = "DeviceManagementAdmin", version = "1.0.0", context = "/devicemgt_admin/applications",
+@API(name = "Device Management Admin", version = "1.0.0", context = "/api/device-mgt/v1.0/admin/devices",
         tags = {"devicemgt_admin"})
 @Path("/admin/devices")
 @Api(value = "Device Management Administrative Service", description = "This an  API intended to be used by " +
@@ -84,6 +85,7 @@ public interface DeviceManagementAdminService {
                     message = "Internal Server Error. \n Server error occurred while fetching the device list.",
                     response = ErrorResponse.class)
     })
+    @Scope(key = "device:admin:view", name = "View Devices", description = "")
     Response getDevicesByName(
             @ApiParam(
                     name = "name",

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

@@ -19,7 +19,7 @@
 package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
 
 import io.swagger.annotations.*;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.policy.mgt.common.DeviceGroupWrapper;
 
 import javax.ws.rs.*;

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

@@ -19,7 +19,8 @@
 package org.wso2.carbon.device.mgt.jaxrs.service.api.admin;
 
 import io.swagger.annotations.*;
-import org.wso2.carbon.apimgt.annotations.api.Permission;
+import org.wso2.carbon.apimgt.annotations.api.API;
+import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PasswordResetWrapper;
 
@@ -28,6 +29,8 @@ import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+@API(name = "User Management Admin", version = "1.0.0", context = "/api/device-mgt/v1.0/admin/users", tags = {"devicemgt_admin"})
+
 @Path("/admin/users")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
@@ -65,7 +68,7 @@ public interface UserManagementAdminService {
                             "Server error occurred while updating credentials of the user.",
                     response = ErrorResponse.class)
     })
-    @Permission(scope = "user-modify", permissions = {"/permission/admin/login"})
+    @Scope(key = "user:admin:reset-password", name = "View users", description = "")
     Response resetUserPassword(
             @ApiParam(
                     name = "username",

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

@@ -63,12 +63,11 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
     @GET
     @Override
     public Response getDevices(
-            @QueryParam("name") @Size(max = 45) String name,
-            @QueryParam("type") @Size(max = 45) String type,
-            @QueryParam("user") @Size(max = 45) String user,
-            @QueryParam("roleName") @Size(max = 45) String roleName,
-            @QueryParam("ownership") @Size(max = 45) String ownership,
-            @QueryParam("status") @Size(max = 45) String status,
+            @QueryParam("name") String name,
+            @QueryParam("type") String type,
+            @QueryParam("user") String user,
+            @QueryParam("ownership") String ownership,
+            @QueryParam("status") String status,
             @QueryParam("since") String since,
             @HeaderParam("If-Modified-Since") String ifModifiedSince,
             @QueryParam("offset") int offset,

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

@@ -16,14 +16,14 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.jaxrs.service.impl.admin;
+package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceTypeList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
-import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceTypeManagementService;
+import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceTypeManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 
 import javax.ws.rs.GET;
@@ -32,7 +32,7 @@ import javax.ws.rs.Path;
 import javax.ws.rs.core.Response;
 import java.util.List;
 
-@Path("/admin/device-types")
+@Path("/device-types")
 public class DeviceTypeManagementServiceImpl implements DeviceTypeManagementService {
 
     private static Log log = LogFactory.getLog(DeviceTypeManagementServiceImpl.class);

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

@@ -20,21 +20,23 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.base.MultitenantConstants;
+import org.wso2.carbon.device.mgt.common.scope.mgt.ScopeManagementException;
+import org.wso2.carbon.device.mgt.common.scope.mgt.ScopeManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.RoleList;
+import org.wso2.carbon.device.mgt.jaxrs.beans.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.RoleManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.FilteringUtil;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
+import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.SetReferenceTransformer;
-import org.wso2.carbon.user.api.*;
+import org.wso2.carbon.user.api.AuthorizationManager;
+import org.wso2.carbon.user.api.UserRealm;
+import org.wso2.carbon.user.api.UserStoreException;
+import org.wso2.carbon.user.api.UserStoreManager;
 import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
-import org.wso2.carbon.user.mgt.UserRealmProxy;
-import org.wso2.carbon.user.mgt.common.UIPermissionNode;
-import org.wso2.carbon.user.mgt.common.UserAdminException;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -88,66 +90,28 @@ public class RoleManagementServiceImpl implements RoleManagementService {
     }
 
     @GET
-    @Path("/{roleName}/permissions")
+    @Path("/scopes")
     @Override
-    public Response getPermissionsOfRole(
-            @PathParam("roleName") String roleName,
+    public Response getScopes(
             @HeaderParam("If-Modified-Since") String ifModifiedSince) {
-        RequestValidationUtil.validateRoleName(roleName);
+
+        List<Scope> scopes = new ArrayList<>();
         try {
-            final UserRealm userRealm = DeviceMgtAPIUtils.getUserRealm();
-            if (!userRealm.getUserStoreManager().isExistingRole(roleName)) {
-                return Response.status(Response.Status.NOT_FOUND).entity(new ErrorResponse.ErrorResponseBuilder().setMessage(
-                        "No role exists with the name '" + roleName + "'").build()).build();
+            ScopeManagementService scopeManagementService = DeviceMgtAPIUtils.getScopeManagementService();
+            if (scopeManagementService == null) {
+                log.error("Scope management service initialization is failed, hence scopes will not be retrieved");
+            } else {
+                scopes = DeviceMgtUtil.convertAPIScopestoScopes(scopeManagementService.getAllScopes());
             }
-
-            final UIPermissionNode rolePermissions = this.getUIPermissionNode(roleName, userRealm);
-            if (rolePermissions == null) {
-                if (log.isDebugEnabled()) {
-                    log.debug("No permissions found for the role '" + roleName + "'");
-                }
-            }
-            return Response.status(Response.Status.OK).entity(rolePermissions).build();
-        } catch (UserAdminException e) {
-            String msg = "Error occurred while retrieving the permissions of role '" + roleName + "'";
-            log.error(msg, e);
-            return Response.serverError().entity(
-                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
-        } catch (UserStoreException e) {
-            String msg = "Error occurred while retrieving the underlying user realm attached to the " +
-                    "current logged in user";
+            return Response.status(Response.Status.OK).entity(scopes).build();
+        } catch (ScopeManagementException e) {
+            String msg = "Error occurred while retrieving the scopes";
             log.error(msg, e);
             return Response.serverError().entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
         }
     }
 
-    private UIPermissionNode getUIPermissionNode(String roleName, UserRealm userRealm)
-            throws UserAdminException {
-        org.wso2.carbon.user.core.UserRealm userRealmCore = null;
-        if (userRealm instanceof org.wso2.carbon.user.core.UserRealm) {
-            userRealmCore = (org.wso2.carbon.user.core.UserRealm) userRealm;
-        }
-        final UserRealmProxy userRealmProxy = new UserRealmProxy(userRealmCore);
-        final UIPermissionNode rolePermissions =
-                userRealmProxy.getRolePermissions(roleName, MultitenantConstants.SUPER_TENANT_ID);
-        UIPermissionNode[] deviceMgtPermissions = new UIPermissionNode[2];
-
-        for (UIPermissionNode permissionNode : rolePermissions.getNodeList()) {
-            if ("/permission/admin".equals(permissionNode.getResourcePath())) {
-                for (UIPermissionNode node : permissionNode.getNodeList()) {
-                    if ("/permission/admin/device-mgt".equals(node.getResourcePath())) {
-                        deviceMgtPermissions[0] = node;
-                    } else if ("/permission/admin/login".equals(node.getResourcePath())) {
-                        deviceMgtPermissions[1] = node;
-                    }
-                }
-            }
-        }
-        rolePermissions.setNodeList(deviceMgtPermissions);
-        return rolePermissions;
-    }
-
     @GET
     @Path("/{roleName}")
     @Override
@@ -158,62 +122,49 @@ public class RoleManagementServiceImpl implements RoleManagementService {
         }
         RequestValidationUtil.validateRoleName(roleName);
         RoleInfo roleInfo = new RoleInfo();
+        List<String> scopes = new ArrayList<>();
         try {
             final UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
-            final UserRealm userRealm = DeviceMgtAPIUtils.getUserRealm();
             if (!userStoreManager.isExistingRole(roleName)) {
                 return Response.status(Response.Status.NOT_FOUND).entity(
                         new ErrorResponse.ErrorResponseBuilder().setMessage("No role exists with the name '" +
                                 roleName + "'").build()).build();
             }
+            ScopeManagementService scopeManagementService = DeviceMgtAPIUtils.getScopeManagementService();
+            if (scopeManagementService == null) {
+                log.error("Scope management service initialization is failed, hence scopes will not be retrieved");
+            } else {
+                scopes = DeviceMgtUtil.convertAPIScopesToScopeKeys(scopeManagementService.getScopesOfRole(roleName));
+            }
             roleInfo.setRoleName(roleName);
             roleInfo.setUsers(userStoreManager.getUserListOfRole(roleName));
-            // Get the permission nodes and hand picking only device management and login perms
-            final UIPermissionNode rolePermissions = this.getUIPermissionNode(roleName, userRealm);
-            List<String> permList = new ArrayList<>();
-            this.iteratePermissions(rolePermissions, permList);
-            roleInfo.setPermissionList(rolePermissions);
-            String[] permListAr = new String[permList.size()];
-            roleInfo.setPermissions(permList.toArray(permListAr));
-
+            roleInfo.setScopes(scopes);
             return Response.status(Response.Status.OK).entity(roleInfo).build();
-        } catch (UserStoreException | UserAdminException e) {
+        } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving the user role '" + roleName + "'";
             log.error(msg, e);
             return Response.serverError().entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+        } catch (ScopeManagementException e) {
+            String msg = "Error occurred while retrieving the scopes";
+            log.error(msg, e);
+            return Response.serverError().entity(
+                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
         }
     }
 
-    private List<String> iteratePermissions(UIPermissionNode uiPermissionNode, List<String> list) {
-        for (UIPermissionNode permissionNode : uiPermissionNode.getNodeList()) {
-            list.add(permissionNode.getResourcePath());
-            if (permissionNode.getNodeList() != null && permissionNode.getNodeList().length > 0) {
-                iteratePermissions(permissionNode, list);
-            }
-        }
-        return list;
-    }
-
     @POST
     @Override
     public Response addRole(RoleInfo roleInfo) {
         RequestValidationUtil.validateRoleDetails(roleInfo);
         RequestValidationUtil.validateRoleName(roleInfo.getRoleName());
+
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
             if (log.isDebugEnabled()) {
                 log.debug("Persisting the role in the underlying user store");
             }
-            Permission[] permissions = null;
-            if (roleInfo.getPermissions() != null && roleInfo.getPermissions().length > 0) {
-                permissions = new Permission[roleInfo.getPermissions().length];
-                for (int i = 0; i < permissions.length; i++) {
-                    String permission = roleInfo.getPermissions()[i];
-                    permissions[i] = new Permission(permission, CarbonConstants.UI_PERMISSION_ACTION);
-                }
-            }
-            userStoreManager.addRole(roleInfo.getRoleName(), roleInfo.getUsers(), permissions);
+            userStoreManager.addRole(roleInfo.getRoleName(), roleInfo.getUsers(), null);
 
             //TODO fix what's returned in the entity
             return Response.created(new URI(API_BASE_PATH + "/" + roleInfo.getRoleName())).entity(
@@ -269,14 +220,12 @@ public class RoleManagementServiceImpl implements RoleManagementService {
                 userStoreManager.updateUserListOfRole(newRoleName, usersToDelete, usersToAdd);
             }
 
-            if (roleInfo.getPermissions() != null) {
-                // Delete all authorizations for the current role before authorizing the permission tree
-                authorizationManager.clearRoleAuthorization(roleName);
-                if (roleInfo.getPermissions().length > 0) {
-                    for (int i = 0; i < roleInfo.getPermissions().length; i++) {
-                        String permission = roleInfo.getPermissions()[i];
-                        authorizationManager.authorizeRole(roleName, permission, CarbonConstants.UI_PERMISSION_ACTION);
-                    }
+            if (roleInfo.getScopes() != null) {
+                ScopeManagementService scopeManagementService = DeviceMgtAPIUtils.getScopeManagementService();
+                if (scopeManagementService == null) {
+                    log.error("Scope management service initialization is failed, hence scopes will not be updated");
+                } else {
+                    scopeManagementService.updateScopes(roleInfo.getScopes(), roleName);
                 }
             }
             //TODO: Need to send the updated role information in the entity back to the client
@@ -287,6 +236,11 @@ public class RoleManagementServiceImpl implements RoleManagementService {
             log.error(msg, e);
             return Response.serverError().entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+        } catch (ScopeManagementException e) {
+            String msg = "Error occurred while updating scopes of role '" + roleName + "'";
+            log.error(msg, e);
+            return Response.serverError().entity(
+                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
         }
     }
 
@@ -295,6 +249,7 @@ public class RoleManagementServiceImpl implements RoleManagementService {
     @Override
     public Response deleteRole(@PathParam("roleName") String roleName) {
         RequestValidationUtil.validateRoleName(roleName);
+
         try {
             final UserRealm userRealm = DeviceMgtAPIUtils.getUserRealm();
             final UserStoreManager userStoreManager = userRealm.getUserStoreManager();
@@ -312,12 +267,26 @@ public class RoleManagementServiceImpl implements RoleManagementService {
             // Delete all authorizations for the current role before deleting
             authorizationManager.clearRoleAuthorization(roleName);
 
-            return Response.status(Response.Status.OK).build();
+            //removing scopes
+            ScopeManagementService scopeManagementService = DeviceMgtAPIUtils.getScopeManagementService();
+            if (scopeManagementService == null) {
+                log.error("Scope management service initialization is failed, hence scopes will not be updated");
+            } else {
+                scopeManagementService.removeScopes(roleName);
+            }
+
+            return Response.status(Response.Status.OK).entity("Role '" + roleName + "' has " +
+                    "successfully been deleted").build();
         } catch (UserStoreException e) {
             String msg = "Error occurred while deleting the role '" + roleName + "'";
             log.error(msg, e);
             return Response.serverError().entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+        } catch (ScopeManagementException e) {
+            String msg = "Error occurred while deleting scopes of role '" + roleName + "'";
+            log.error(msg, e);
+            return Response.serverError().entity(
+                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
         }
     }
 

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

@@ -134,14 +134,14 @@ public class UserManagementServiceImpl implements UserManagementService {
     public Response updateUser(@PathParam("username") String username, UserInfo userInfo) {
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
-            if (!userStoreManager.isExistingUser(userInfo.getUsername())) {
+            if (!userStoreManager.isExistingUser(username)) {
                 if (log.isDebugEnabled()) {
-                    log.debug("User by username: " + userInfo.getUsername() +
-                            " doesn't exists. Therefore, request made to update user was refused.");
+                    log.debug("User by username: " + username +
+                              " doesn't exists. Therefore, request made to update user was refused.");
                 }
                 return Response.status(Response.Status.NOT_FOUND).entity(
                         new ErrorResponse.ErrorResponseBuilder().setMessage("User by username: " +
-                                userInfo.getUsername() + " doesn't  exist.").build()).build();
+                                                                            username + " doesn't  exist.").build()).build();
             }
 
             Map<String, String> defaultUserClaims =
@@ -149,11 +149,11 @@ public class UserManagementServiceImpl implements UserManagementService {
                             userInfo.getEmailAddress());
             if (StringUtils.isNotEmpty(userInfo.getPassword())) {
                 // Decoding Base64 encoded password
-                userStoreManager.updateCredentialByAdmin(userInfo.getUsername(),
-                        userInfo.getPassword());
-                log.debug("User credential of username: " + userInfo.getUsername() + " has been changed");
+                userStoreManager.updateCredentialByAdmin(username,
+                                                         userInfo.getPassword());
+                log.debug("User credential of username: " + username + " has been changed");
             }
-            List<String> currentRoles = this.getFilteredRoles(userStoreManager, userInfo.getUsername());
+            List<String> currentRoles = this.getFilteredRoles(userStoreManager, username);
             List<String> newRoles = Arrays.asList(userInfo.getRoles());
 
             List<String> rolesToAdd = new ArrayList<>(newRoles);
@@ -167,19 +167,19 @@ public class UserManagementServiceImpl implements UserManagementService {
                 }
             }
             rolesToDelete.remove(ROLE_EVERYONE);
-            userStoreManager.updateRoleListOfUser(userInfo.getUsername(),
-                    rolesToDelete.toArray(new String[rolesToDelete.size()]),
-                    rolesToAdd.toArray(new String[rolesToAdd.size()]));
-            userStoreManager.setUserClaimValues(userInfo.getUsername(), defaultUserClaims, null);
+            userStoreManager.updateRoleListOfUser(username,
+                                                  rolesToDelete.toArray(new String[rolesToDelete.size()]),
+                                                  rolesToAdd.toArray(new String[rolesToAdd.size()]));
+            userStoreManager.setUserClaimValues(username, defaultUserClaims, null);
             // Outputting debug message upon successful addition of user
             if (log.isDebugEnabled()) {
-                log.debug("User by username: " + userInfo.getUsername() + " was successfully updated.");
+                log.debug("User by username: " + username + " was successfully updated.");
             }
 
             BasicUserInfo updatedUserInfo = this.getBasicUserInfo(username);
             return Response.ok().entity(updatedUserInfo).build();
         } catch (UserStoreException e) {
-            String msg = "Error occurred while trying to update user '" + userInfo.getUsername() + "'";
+            String msg = "Error occurred while trying to update user '" + username + "'";
             log.error(msg, e);
             return Response.serverError().entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
@@ -264,16 +264,20 @@ public class UserManagementServiceImpl implements UserManagementService {
         if (log.isDebugEnabled()) {
             log.debug("Getting the list of users with all user-related information");
         }
-        List<BasicUserInfo> userList, offsetList;
+
         RequestValidationUtil.validatePaginationParameters(offset, limit);
-        String appliedFilter = ((filter == null) || filter.isEmpty() ? "*" : filter);
-        int appliedLimit = (limit <= 0) ? -1 : (limit + offset);
+
+        List<BasicUserInfo> userList, offsetList;
+        String appliedFilter = ((filter == null) || filter.isEmpty() ? "*" : filter + "*");
+        // to get whole set of users, appliedLimit is set to -1
+        // by default, this whole set is limited to 100 - MaxUserNameListLength of user-mgt.xml
+        int appliedLimit = -1;
 
         try {
             UserStoreManager userStoreManager = DeviceMgtAPIUtils.getUserStoreManager();
 
             //As the listUsers function accepts limit only to accommodate offset we are passing offset + limit
-            String[] users = userStoreManager.listUsers(appliedFilter + "*", appliedLimit);
+            String[] users = userStoreManager.listUsers(appliedFilter, appliedLimit);
             userList = new ArrayList<>(users.length);
             BasicUserInfo user;
             for (String username : users) {
@@ -285,14 +289,23 @@ public class UserManagementServiceImpl implements UserManagementService {
                 userList.add(user);
             }
 
-            if (offset <= userList.size()) {
-                offsetList = userList.subList(offset, userList.size());
+            int toIndex = offset + limit;
+            int listSize = userList.size();
+            int lastIndex = listSize - 1;
+
+            if (offset <= lastIndex) {
+                if (toIndex <= listSize) {
+                    offsetList = userList.subList(offset, toIndex);
+                } else {
+                    offsetList = userList.subList(offset, listSize);
+                }
             } else {
                 offsetList = new ArrayList<>();
             }
+
             BasicUserInfoList result = new BasicUserInfoList();
             result.setList(offsetList);
-            result.setCount(offsetList.size());
+            result.setCount(users.length);
 
             return Response.status(Response.Status.OK).entity(result).build();
         } catch (UserStoreException e) {

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

@@ -32,7 +32,7 @@ public class FilteringUtil {
      * This is used to filter from the cached policies.
      */
     public static <T> List<T> getFilteredList(List<T> sourceList, int offset, int limit) {
-        if(sourceList == null || sourceList.size() < offset){
+        if (sourceList == null || sourceList.size() < offset) {
             return Collections.emptyList();
         }
         return sourceList.subList(offset, Math.min(offset + limit, sourceList.size()));

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

@@ -18,6 +18,7 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.impl.util;
 
+import org.wso2.carbon.device.mgt.jaxrs.beans.Scope;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
@@ -308,8 +309,20 @@ public class RequestValidationUtil {
     public static void validateRoleDetails(RoleInfo roleInfo) {
         if (roleInfo == null) {
             throw new InputValidationException(
-                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request body is incorrect or" +
-                            " empty").build());
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request body is "
+                            + "empty").build());
+        } else if (roleInfo.getRoleName() == null) {
+            throw new InputValidationException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request body is "
+                            + "incorrect").build());
+        }
+    }
+
+    public static void validateScopes(List<Scope> scopes) {
+        if (scopes == null || scopes.isEmpty()) {
+            throw new InputValidationException(
+                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Scope details of the request body" +
+                            " is incorrect or empty").build());
         }
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/swagger/extension/SecurityDefinitionConfigurator.java

@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @SwaggerDefinition(
-        basePath = "/api/device-mgt/v1.0",
+        basePath = "/api-device-mgt-v1.0",
         host = "localhost:9443"
 )
 public class SecurityDefinitionConfigurator implements ReaderListener {

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

@@ -28,6 +28,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;
 import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService;
+import org.wso2.carbon.device.mgt.common.scope.mgt.ScopeManagementService;
 import org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
 import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
 import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
@@ -248,6 +249,16 @@ public class DeviceMgtAPIUtils {
         return gadgetDataService;
     }
 
+    public static ScopeManagementService getScopeManagementService() {
+        PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        ScopeManagementService scopeManagementService =
+                (ScopeManagementService) ctx.getOSGiService(ScopeManagementService.class, null);
+        if (scopeManagementService == null) {
+            throw new IllegalStateException("Scope Management Service has not been initialized.");
+        }
+        return scopeManagementService;
+    }
+
     public static int getTenantId(String tenantDomain) throws DeviceManagementException {
         RealmService realmService =
                 (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);

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

@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.device.mgt.jaxrs.util;
 
+import org.wso2.carbon.apimgt.api.model.Scope;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorListItem;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ProfileFeature;
@@ -64,6 +65,38 @@ public class DeviceMgtUtil {
 
     }
 
+    public static List<Scope> convertScopesListToAPIScopes(List<String> scopes, String roleName) {
+        List<Scope> convertedScopes = new ArrayList<>();
+        Scope convertedScope;
+        for (String scope : scopes) {
+            convertedScope = new Scope();
+            convertedScope.setKey(scope);
+            convertedScope.setRoles(roleName);
+            convertedScopes.add(convertedScope);
+        }
+        return convertedScopes;
+    }
+
+    public static List<org.wso2.carbon.device.mgt.jaxrs.beans.Scope> convertAPIScopestoScopes(List<Scope> scopes) {
+        List<org.wso2.carbon.device.mgt.jaxrs.beans.Scope> convertedScopes = new ArrayList<>();
+        org.wso2.carbon.device.mgt.jaxrs.beans.Scope convertedScope;
+        for (Scope scope : scopes) {
+            convertedScope = new org.wso2.carbon.device.mgt.jaxrs.beans.Scope();
+            convertedScope.setKey(scope.getKey());
+            convertedScope.setName(scope.getName());
+            convertedScope.setDescription(scope.getDescription());
+            convertedScopes.add(convertedScope);
+        }
+        return convertedScopes;
+    }
+
+    public static List<String> convertAPIScopesToScopeKeys(List<Scope> scopes) {
+        List<String> convertedScopes = new ArrayList<>();
+        for (Scope scope : scopes) {
+            convertedScopes.add(scope.getKey());
+        }
+        return convertedScopes;
+    }
     /**
      * Returns a new BadRequestException
      *

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -79,7 +79,7 @@
     <bean id="groupManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.admin.GroupManagementAdminServiceImpl"/>
     <bean id="userManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.admin.UserManagementAdminServiceImpl"/>
     <bean id="dashboardServiceBean" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.DashboardImpl"/>
-    <bean id="deviceTypeManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.admin.DeviceTypeManagementServiceImpl"/>
+    <bean id="deviceTypeManagementAdminService" class="org.wso2.carbon.device.mgt.jaxrs.service.impl.DeviceTypeManagementServiceImpl"/>
     <bean id="jsonProvider" class="org.wso2.carbon.device.mgt.jaxrs.common.GsonMessageBodyHandler"/>
 
     <!--<bean id="errorHandler" class="org.wso2.carbon.device.mgt.jaxrs.common.ErrorHandler"/>-->

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

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -50,6 +50,7 @@
                         <Import-Package>
                             javax.xml.bind.annotation,
                             com.fasterxml.jackson.annotation,
+                            org.wso2.carbon.apimgt.api.model,
                             io.swagger.annotations.*;resolution:=optional
                         </Import-Package>
                     </instructions>
@@ -68,6 +69,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.apimgt</groupId>
+            <artifactId>org.wso2.carbon.apimgt.api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -40,11 +40,9 @@ public class EnrolmentInfo implements Serializable {
     @ApiModelProperty(name = "id", value = "ID of the device in the WSO2 EMM device information database.",
                       required = true)
     private int id;
-    @ApiModelProperty(name = "device", value = "Enrolled device.", required = true)
-    private Device device;
-    @ApiModelProperty(name = "dateOfEnrolment", value = "Date of the device enrollment.", required = true )
+    @ApiModelProperty(name = "dateOfEnrolment", value = "Date of the device enrollment. This value is not necessary.", required = false )
     private Long dateOfEnrolment;
-    @ApiModelProperty(name = "dateOfLastUpdate", value = "Date of the device's last update.", required = true )
+    @ApiModelProperty(name = "dateOfLastUpdate", value = "Date of the device's last update. This value is not necessary.", required = false )
     private Long dateOfLastUpdate;
     @ApiModelProperty(name = "ownership", value = "Defines the ownership details. The ownership type can be any of the" +
                                                   " following values.\n" +
@@ -60,8 +58,7 @@ public class EnrolmentInfo implements Serializable {
     public EnrolmentInfo() {
     }
 
-    public EnrolmentInfo(Device device, String owner, OwnerShip ownership, Status status) {
-        this.device = device;
+    public EnrolmentInfo(String owner, OwnerShip ownership, Status status) {
         this.owner = owner;
         this.ownership = ownership;
         this.status = status;
@@ -115,14 +112,6 @@ public class EnrolmentInfo implements Serializable {
         this.owner = owner;
     }
 
-    public Device getDevice() {
-        return device;
-    }
-
-    public void setDevice(Device device) {
-        this.device = device;
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof EnrolmentInfo) {

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

@@ -0,0 +1,43 @@
+/*
+ *   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.common;
+
+public class InvalidDeviceException extends Exception {
+    private static final long serialVersionUID = -3151279311929070297L;
+
+    public InvalidDeviceException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+    }
+
+    public InvalidDeviceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidDeviceException(String msg) {
+        super(msg);
+    }
+
+    public InvalidDeviceException() {
+        super();
+    }
+
+    public InvalidDeviceException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -41,7 +41,7 @@ public class PaginationResult implements Serializable {
     @ApiModelProperty(name = "draw", value = "The draw counter that this object is a response to, from the draw parameter sent as part of the data request", required = true)
     private int draw;
 
-    @ApiModelProperty(name = "data", value = "The details of the SSL certificate", required = true)
+    @ApiModelProperty(name = "data", value = "This holds the database records that matches given criteria", required = true)
     private List<?> data;
 
     public int getRecordsTotal() {

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

@@ -150,6 +150,9 @@ public class Application implements Serializable {
         if (applicationIdentifier != null ? !applicationIdentifier.equals(that.applicationIdentifier) : that.applicationIdentifier != null) {
             return false;
         }
+        if (version != null ? !version.equals(that.version) : that.version != null) {
+            return false;
+        }
         return true;
     }
 

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

@@ -32,10 +32,11 @@ public interface OperationManager {
      *
      * @param operation Operation to be added
      * @param devices   List of DeviceIdentifiers to execute the operation
-     * @throws OperationManagementException If some unusual behaviour is observed while adding the
-     *                                      operation
+     * @throws OperationManagementException If some unusual behaviour is observed while adding the operation
+     *         InvalidDeviceException       If addOperation request contains Invalid DeviceIdentifiers.
      */
-    Activity addOperation(Operation operation, List<DeviceIdentifier> devices) throws OperationManagementException;
+    Activity addOperation(Operation operation, List<DeviceIdentifier> devices) throws OperationManagementException,
+            InvalidDeviceException;
 
     /**
      * Method to retrieve the list of all operations to a device.
@@ -49,8 +50,8 @@ public interface OperationManager {
     /**
      * Method to retrieve all the operations applied to a device with pagination support.
      *
-     * @param deviceId       DeviceIdentifier of the device
-     * @param request        PaginationRequest object holding the data for pagination
+     * @param deviceId DeviceIdentifier of the device
+     * @param request  PaginationRequest object holding the data for pagination
      * @return PaginationResult - Result including the required parameters necessary to do pagination.
      * @throws OperationManagementException If some unusual behaviour is observed while fetching the
      *                                      operation list.

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

@@ -24,47 +24,25 @@ import javax.xml.bind.annotation.XmlRootElement;
 /**
  * This class represents the information related to permission.
  */
-@XmlRootElement (name = "Permission")
 public class Permission {
 
-    private String name; // permission name
-    private String path; // permission string
     private String url; // url of the resource
+    private String urlTemplate; // resource template
     private String method; // http method
-    private String scope; //scope of the resource
+    private String context;
 
-    public String getName() {
-        return name;
+    public String getContext() {
+        return context;
     }
 
-    @XmlElement (name = "name", required = true)
-    public void setName(String name) {
-        this.name = name;
+    public void setContext(String context) {
+        this.context = context;
     }
 
-    public String getPath() {
-        return path;
-    }
-
-    @XmlElement (name = "path", required = true)
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getScope() {
-        return scope;
-    }
-
-    @XmlElement(name = "scope", required = false)
-	public void setScope(String scope) {
-		this.scope = scope;
-	}
-
     public String getUrl() {
         return url;
     }
 
-    @XmlElement (name = "url", required = true)
     public void setUrl(String url) {
         this.url = url;
     }
@@ -73,8 +51,15 @@ public class Permission {
         return method;
     }
 
-    @XmlElement (name = "method", required = true)
     public void setMethod(String method) {
         this.method = method;
     }
+
+    public String getUrlTemplate() {
+        return urlTemplate;
+    }
+
+    public void setUrlTemplate(String urlTemplate) {
+        this.urlTemplate = urlTemplate;
+    }
 }

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

@@ -29,11 +29,10 @@ public interface PermissionManagerService {
     /**
      *
      * @param permission - Permission to be added
-     * @return The status of the operation.
      * @throws PermissionManagementException If some unusual behaviour is observed while adding the
      * permission.
      */
-    boolean addPermission(Permission permission) throws PermissionManagementException;
+    void addPermission(Permission permission) throws PermissionManagementException;
 
     /**
      *

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

@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+* 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.
+*/
+package org.wso2.carbon.device.mgt.common.scope.mgt;
+
+/**
+ * This exception is used to throw when there is an issue in scope management service.
+ */
+public class ScopeManagementException extends Exception {
+
+    private static final long serialVersionUID = -315127931137779899L;
+
+    private String errorMessage;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public ScopeManagementException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+        setErrorMessage(msg);
+    }
+
+    public ScopeManagementException(String message, Throwable cause) {
+        super(message, cause);
+        setErrorMessage(message);
+    }
+
+    public ScopeManagementException(String msg) {
+        super(msg);
+        setErrorMessage(msg);
+    }
+
+    public ScopeManagementException() {
+        super();
+    }
+
+    public ScopeManagementException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -0,0 +1,78 @@
+/*
+*  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.common.scope.mgt;
+
+import java.util.List;
+import org.wso2.carbon.apimgt.api.model.Scope;
+
+/**
+ * This interface contains the basic operations related to scope management.
+ */
+public interface ScopeManagementService {
+
+    /**
+     * This method is used to update the given list of scopes.
+     *
+     * @param scopes List of scopes to be updated.
+     * @throws ScopeManagementException
+     */
+    void updateScopes(List<Scope> scopes) throws ScopeManagementException;
+
+    /**
+     * This method is used to update the given list of scopes keys with the role name.
+     *
+     * @param scopeKeys List of scopes to be updated.
+     * @param roleName Role name
+     * @throws ScopeManagementException
+     */
+    void updateScopes(List<String> scopeKeys, String roleName) throws ScopeManagementException;
+
+    /**
+     * This method is used to retrieve all the scopes.
+     *
+     * @return List of scopes.
+     * @throws ScopeManagementException
+     */
+    List<Scope> getAllScopes() throws ScopeManagementException;
+
+    /**
+     * This method is to retrieve the roles of the given scope
+     * @param scopeKey key of the scope
+     * @return List of roles
+     * @throws ScopeManagementException
+     */
+    String getRolesOfScope(String scopeKey) throws ScopeManagementException;
+
+    /**
+     * This method is to retrieve the scopes of the given role
+     * @param roleName key of the scope
+     * @return List of scopes
+     * @throws ScopeManagementException
+     */
+    List<Scope> getScopesOfRole(String roleName) throws ScopeManagementException;
+
+    /**
+     * This method is used to remove the scopes of a given user role.
+     *
+     * @param roleName Role name
+     * @throws ScopeManagementException
+     */
+    void removeScopes(String roleName) throws ScopeManagementException;
+
+}

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -91,6 +91,10 @@
                             !org.wso2.carbon.device.mgt.core.internal,
                             org.wso2.carbon.device.mgt.core.*
                         </Export-Package>
+                        <Embed-Dependency>
+                            javax.ws.rs-api,
+                            scribe;scope=compile|runtime;inline=false;
+                        </Embed-Dependency>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>
@@ -228,6 +232,7 @@
             <groupId>commons-collections.wso2</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.email.sender.core</artifactId>
@@ -236,15 +241,12 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.34</version>
             <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>1.7.1</version>
         </dependency>
 
         <dependency>
@@ -253,6 +255,26 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.wso2.orbit.org.scannotation</groupId>
+            <artifactId>scannotation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -26,7 +26,7 @@ public final class DeviceManagementConstants {
             throw new AssertionError();
         }
 
-        public static final String PROPERTY_SETUP = "setup";
+        public static final String SETUP_PROPERTY = "setup";
         public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "license-config.xml";
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java

@@ -97,8 +97,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             if (deviceIds.size() > 0) {
                 type = deviceIds.get(0).getType().toLowerCase();
             }
-            Activity activity =  DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
-                   addOperation(type, operation, deviceIds);
+            Activity activity = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
+                    addOperation(type, operation, deviceIds);
             DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().notifyOperationToDevices
                     (operation, deviceIds);
             return activity;
@@ -106,6 +106,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             throw new ApplicationManagementException("Error in add operation at app installation", e);
         } catch (DeviceManagementException e) {
             throw new ApplicationManagementException("Error in notify operation at app installation", e);
+        } catch (InvalidDeviceException e) {
+            throw new ApplicationManagementException("Invalid DeviceIdentifiers found.", e);
         }
     }
 
@@ -140,6 +142,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
 
             return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider()
                     .addOperation(type, operation, deviceIdentifierList);
+        } catch (InvalidDeviceException e) {
+            throw new ApplicationManagementException("Invalid DeviceIdentifiers found.", e);
         } catch (DeviceManagementException e) {
             throw new ApplicationManagementException("Error in get devices for user: " + userName +
                     " in app installation", e);
@@ -179,6 +183,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             }
             return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().addOperation(type, operation,
                     deviceIdentifierList);
+        } catch (InvalidDeviceException e) {
+            throw new ApplicationManagementException("Invalid DeviceIdentifiers found.", e);
         } catch (DeviceManagementException e) {
             throw new ApplicationManagementException("Error in get devices for user role " + userRole +
                     " in app installation", e);
@@ -217,13 +223,14 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
                     appIdsToRemove.add(installedApp.getId());
                 }
             }
-
+            applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove, tenantId);
             Application installedApp;
             List<Integer> applicationIds = new ArrayList<>();
 
             for (Application application : applications) {
                 if (!installedAppList.contains(application)) {
-                    installedApp = applicationDAO.getApplication(application.getApplicationIdentifier(), tenantId);
+                    installedApp = applicationDAO.getApplication(application.getApplicationIdentifier(),
+                            application.getVersion(), tenantId);
                     if (installedApp == null) {
                         appsToAdd.add(application);
                     } else {
@@ -244,7 +251,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             if (log.isDebugEnabled()) {
                 log.debug("num of remove app Ids:" + appIdsToRemove.size());
             }
-            applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove, tenantId);
+
             DeviceManagementDAOFactory.commitTransaction();
         } catch (DeviceManagementDAOException e) {
             DeviceManagementDAOFactory.rollbackTransaction();

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java

@@ -243,9 +243,7 @@ public class DeviceAccessAuthorizationServiceImpl implements DeviceAccessAuthori
     }
 
     private boolean addAdminPermissionToRegistry() throws PermissionManagementException {
-        Permission permission = new Permission();
-        permission.setPath(PermissionUtils.getAbsolutePermissionPath(CDM_ADMIN_PERMISSION));
-        return PermissionUtils.putPermission(permission);
+        return PermissionUtils.putPermission(PermissionUtils.getAbsolutePermissionPath(CDM_ADMIN_PERMISSION));
     }
 
     private Map<String, String> getOwnershipOfDevices(List<Device> devices) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java

@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2015, 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.config.permission;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.scannotation.AnnotationDB;
+import org.wso2.carbon.apimgt.annotations.api.API;
+
+import javax.servlet.ServletContext;
+import javax.ws.rs.*;
+import java.io.File;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+public class AnnotationProcessor {
+
+    private static final Log log = LogFactory.getLog(AnnotationProcessor.class);
+
+    private static final String PACKAGE_ORG_APACHE = "org.apache";
+    private static final String PACKAGE_ORG_CODEHAUS = "org.codehaus";
+    private static final String PACKAGE_ORG_SPRINGFRAMEWORK = "org.springframework";
+    private static final String WILD_CARD = "/*";
+    private static final String URL_SEPARATOR = "/";
+
+    private static final String STRING_ARR = "string_arr";
+    private static final String STRING = "string";
+
+    private Method[] pathClazzMethods;
+    private Class<Path> pathClazz;
+    Class<API> apiClazz;
+    private ClassLoader classLoader;
+    private ServletContext servletContext;
+
+
+    public AnnotationProcessor(final StandardContext context) {
+        servletContext = context.getServletContext();
+        classLoader = servletContext.getClassLoader();
+    }
+
+    /**
+     * Scan the context for classes with annotations
+     *
+     * @return
+     * @throws IOException
+     */
+    public Set<String> scanStandardContext(String className) throws IOException {
+        ExtendedAnnotationDB db = new ExtendedAnnotationDB();
+        db.addIgnoredPackages(PACKAGE_ORG_APACHE);
+        db.addIgnoredPackages(PACKAGE_ORG_CODEHAUS);
+        db.addIgnoredPackages(PACKAGE_ORG_SPRINGFRAMEWORK);
+        URL classPath = findWebInfClassesPath(servletContext);
+        db.scanArchives(classPath);
+
+        //Returns a list of classes with given Annotation
+        return db.getAnnotationIndex().get(className);
+    }
+
+    /**
+     * Method identifies the URL templates and context by reading the annotations of a class
+     *
+     * @param entityClasses
+     * @return
+     */
+    public List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission>
+        extractPermissions(Set<String> entityClasses) {
+
+        List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission> permissions = new ArrayList<>();
+
+        if (entityClasses != null && !entityClasses.isEmpty()) {
+
+            for (final String className : entityClasses) {
+
+                List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission> resourcePermissions =
+                        AccessController.doPrivileged(new PrivilegedAction<List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission>>() {
+                            public List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission> run() {
+                                Class<?> clazz;
+                                List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission> apiPermissions =
+                                        new ArrayList<>();
+                                try {
+                                    clazz = classLoader.loadClass(className);
+
+                                    apiClazz = (Class<API>)
+                                            classLoader.loadClass(org.wso2.carbon.apimgt.annotations.api.API
+                                                    .class.getName());
+
+                                    Annotation apiAnno = clazz.getAnnotation(apiClazz);
+                                    List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission> resourceList;
+
+                                    if (apiAnno != null) {
+
+                                        if (log.isDebugEnabled()) {
+                                            log.debug("Application Context root = " + servletContext.getContextPath());
+                                        }
+
+                                        try {
+                                            String rootContext = servletContext.getContextPath();
+                                            pathClazz = (Class<Path>) classLoader.loadClass(Path.class.getName());
+                                            pathClazzMethods = pathClazz.getMethods();
+
+                                            Annotation rootContectAnno = clazz.getAnnotation(pathClazz);
+                                            String subContext = "";
+                                            if (rootContectAnno != null) {
+                                                subContext = invokeMethod(pathClazzMethods[0], rootContectAnno, STRING);
+                                                if (subContext != null && !subContext.isEmpty()) {
+                                                    if (subContext.trim().startsWith("/")) {
+                                                        rootContext = rootContext + subContext;
+                                                    } else {
+                                                        rootContext = rootContext + "/" + subContext;
+                                                    }
+                                                }
+                                                if (log.isDebugEnabled()) {
+                                                    log.debug("API Root  Context = " + rootContext);
+                                                }
+                                            }
+
+                                            Method[] annotatedMethods = clazz.getDeclaredMethods();
+                                            apiPermissions = getApiResources(rootContext, annotatedMethods);
+                                        } catch (Throwable throwable) {
+                                            log.error("Error encountered while scanning for annotations", throwable);
+                                        }
+                                    }
+                                } catch (ClassNotFoundException e) {
+                                    log.error("Error when passing the api annotation for device type apis.");
+                                }
+                                return apiPermissions;
+                            }
+                        });
+                permissions.addAll(resourcePermissions);
+            }
+        }
+        return permissions;
+    }
+
+
+    /**
+     * Get Resources for each API
+     *
+     * @param resourceRootContext
+     * @param annotatedMethods
+     * @return
+     * @throws Throwable
+     */
+    private List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission>
+        getApiResources(String resourceRootContext, Method[] annotatedMethods) throws Throwable {
+
+        List<org.wso2.carbon.device.mgt.common.permission.mgt.Permission> permissions = new ArrayList<>();
+        String subCtx;
+        for (Method method : annotatedMethods) {
+            Annotation[] annotations = method.getDeclaredAnnotations();
+            org.wso2.carbon.device.mgt.common.permission.mgt.Permission permission =
+                    new org.wso2.carbon.device.mgt.common.permission.mgt.Permission();
+
+            if (isHttpMethodAvailable(annotations)) {
+                Annotation methodContextAnno = method.getAnnotation(pathClazz);
+                if (methodContextAnno != null) {
+                    subCtx = invokeMethod(pathClazzMethods[0], methodContextAnno, STRING);
+                } else {
+                    subCtx = WILD_CARD;
+                }
+                permission.setContext(makeContextURLReady(resourceRootContext));
+                permission.setUrlTemplate(makeContextURLReady(subCtx));
+
+                // this check is added to avoid url resolving conflict which happens due
+                // to adding of '*' notation for dynamic path variables.
+                if (WILD_CARD.equals(subCtx)) {
+                    subCtx = makeContextURLReady(resourceRootContext);
+                } else {
+                    subCtx = makeContextURLReady(resourceRootContext) + makeContextURLReady(subCtx);
+                }
+                permission.setUrl(replaceDynamicPathVariables(subCtx));
+                String httpMethod;
+                for (int i = 0; i < annotations.length; i++) {
+                    httpMethod = getHTTPMethodAnnotation(annotations[i]);
+                    if (httpMethod != null) {
+                        permission.setMethod(httpMethod);
+                        break;
+                    }
+                }
+                permissions.add(permission);
+            }
+        }
+        return permissions;
+    }
+
+    /**
+     * Read Method annotations indicating HTTP Methods
+     * @param annotation
+     */
+    private String getHTTPMethodAnnotation(Annotation annotation) {
+        if (annotation.annotationType().getName().equals(GET.class.getName())) {
+            return HttpMethod.GET;
+        } else if (annotation.annotationType().getName().equals(POST.class.getName())) {
+            return HttpMethod.POST;
+        } else if (annotation.annotationType().getName().equals(OPTIONS.class.getName())) {
+            return HttpMethod.OPTIONS;
+        } else if (annotation.annotationType().getName().equals(DELETE.class.getName())) {
+            return HttpMethod.DELETE;
+        } else if (annotation.annotationType().getName().equals(PUT.class.getName())) {
+            return HttpMethod.PUT;
+        }
+        return null;
+    }
+
+    private boolean isHttpMethodAvailable(Annotation[] annotations) {
+        for (Annotation annotation : annotations) {
+            if (annotation.annotationType().getName().equals(GET.class.getName())) {
+                return true;
+            } else if (annotation.annotationType().getName().equals(POST.class.getName())) {
+                return true;
+            } else if (annotation.annotationType().getName().equals(OPTIONS.class.getName())) {
+                return true;
+            } else if (annotation.annotationType().getName().equals(DELETE.class.getName())) {
+                return true;
+            } else if (annotation.annotationType().getName().equals(PUT.class.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Append '/' to the context and make it URL ready
+     *
+     * @param context
+     * @return
+     */
+    private String makeContextURLReady(String context) {
+        if (context != null && ! context.isEmpty()) {
+            if (context.startsWith("/")) {
+                return context;
+            } else {
+                return "/" + context;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * When an annotation and method is passed, this method invokes that executes said method against the annotation
+     *
+     * @param method
+     * @param annotation
+     * @param returnType
+     * @return
+     * @throws Throwable
+     */
+    private String invokeMethod(Method method, Annotation annotation, String returnType) throws Throwable {
+        InvocationHandler methodHandler = Proxy.getInvocationHandler(annotation);
+        switch (returnType) {
+            case STRING:
+                return (String) methodHandler.invoke(annotation, method, null);
+            case STRING_ARR:
+                return ((String[]) methodHandler.invoke(annotation, method, null))[0];
+            default:
+                return null;
+        }
+    }
+
+
+    /**
+     * Find the URL pointing to "/WEB-INF/classes"  This method may not work in conjunction with IteratorFactory
+     * if your servlet container does not extract the /WEB-INF/classes into a real file-based directory
+     *
+     * @param servletContext
+     * @return null if cannot determin /WEB-INF/classes
+     */
+    public static URL findWebInfClassesPath(ServletContext servletContext)
+    {
+        String path = servletContext.getRealPath("/WEB-INF/classes");
+        if (path == null) return null;
+        File fp = new File(path);
+        if (fp.exists() == false) return null;
+        try
+        {
+            URI uri = fp.toURI();
+            return uri.toURL();
+        }
+        catch (MalformedURLException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String replaceDynamicPathVariables(String path) {
+        StringBuilder replacedPath = new StringBuilder();
+        StringTokenizer st = new StringTokenizer(path, URL_SEPARATOR);
+        String currentToken;
+        while (st.hasMoreTokens()) {
+            currentToken = st.nextToken();
+            if (currentToken.charAt(0) == '{') {
+                if (currentToken.charAt(currentToken.length() - 1) == '}') {
+                    replacedPath.append(WILD_CARD);
+                }
+            } else {
+                replacedPath.append(URL_SEPARATOR);
+                replacedPath.append(currentToken);
+            }
+        }
+        return replacedPath.toString();
+    }
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/ExtendedAnnotationDB.java

@@ -0,0 +1,92 @@
+/*
+* Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+*
+* 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.
+*/
+package org.wso2.carbon.device.mgt.core.config.permission;
+
+import org.scannotation.AnnotationDB;
+import org.scannotation.archiveiterator.Filter;
+import org.scannotation.archiveiterator.StreamIterator;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+public class ExtendedAnnotationDB extends AnnotationDB {
+
+    public ExtendedAnnotationDB() {
+        super();
+    }
+
+    public void scanArchives(URL... urls) throws IOException {
+        URL[] arr$ = urls;
+        int len$ = urls.length;
+
+        for(int i$ = 0; i$ < len$; ++i$) {
+            URL url = arr$[i$];
+            Filter filter = new Filter() {
+                public boolean accepts(String filename) {
+                    if(filename.endsWith(".class")) {
+                        if(filename.startsWith("/") || filename.startsWith("\\")) {
+                            filename = filename.substring(1);
+                        }
+
+                        if(!ExtendedAnnotationDB.this.ignoreScan(filename.replace('/', '.'))) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            };
+            StreamIterator it = ExtendedIteratorFactory.create(url, filter);
+
+            InputStream stream;
+            while((stream = it.next()) != null) {
+                this.scanClass(stream);
+            }
+        }
+
+    }
+
+    private boolean ignoreScan(String intf) {
+        String[] arr$;
+        int len$;
+        int i$;
+        String ignored;
+        if(this.scanPackages != null) {
+            arr$ = this.scanPackages;
+            len$ = arr$.length;
+
+            for(i$ = 0; i$ < len$; ++i$) {
+                ignored = arr$[i$];
+                if(intf.startsWith(ignored + ".")) {
+                    return false;
+                }
+            }
+
+            return true;
+        } else {
+            arr$ = this.ignoredPackages;
+            len$ = arr$.length;
+
+            for(i$ = 0; i$ < len$; ++i$) {
+                ignored = arr$[i$];
+                if(intf.startsWith(ignored + ".")) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}