Initialize application management DAOs

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

@@ -214,6 +214,11 @@
             <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/beans/ErrorListItem.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.device.application.mgt.api.beans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+@ApiModel(description = "Error List Item")
+public class ErrorListItem {
+
+    @NotNull
+    private String code = null;
+    @NotNull
+    private String message = null;
+
+    @ApiModelProperty(required = true, value = "")
+    @JsonProperty("code")
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public ErrorListItem() {
+    }
+
+    public ErrorListItem(String code, String msg) {
+        this.code = code;
+        this.message = msg;
+    }
+
+
+    /**
+     * Description about individual errors occurred
+     */
+    @ApiModelProperty(required = true, value = "Description about individual errors occurred")
+    @JsonProperty("message")
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("errorItem {\n");
+
+        sb.append("  code: ").append(code).append("\n");
+        sb.append("  message: ").append(message).append("\n");
+        sb.append("}\n");
+        return sb.toString();
+    }
+
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/beans/ErrorResponse.java

@@ -0,0 +1,150 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.api.beans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiModel(description = "Error Response")
+public class ErrorResponse {
+
+    private Long code = null;
+    private String message = null;
+    private String description = null;
+    private String moreInfo = null;
+    private List<ErrorListItem> errorItems = new ArrayList<>();
+
+    private ErrorResponse() {
+    }
+
+    @JsonProperty(value = "code")
+    @ApiModelProperty(required = true, value = "")
+    public Long getCode() {
+        return code;
+    }
+
+    public void setCode(Long code) {
+        this.code = code;
+    }
+
+    @JsonProperty(value = "message")
+    @ApiModelProperty(required = true, value = "ErrorResponse message.")
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @JsonProperty(value = "description")
+    @ApiModelProperty(value = "A detail description about the error message.")
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @JsonProperty(value = "moreInfo")
+    @ApiModelProperty(value = "Preferably an url with more details about the error.")
+    public String getMoreInfo() {
+        return moreInfo;
+    }
+
+    public void setMoreInfo(String moreInfo) {
+        this.moreInfo = moreInfo;
+    }
+
+    public void addErrorListItem(ErrorListItem item) {
+        this.errorItems.add(item);
+    }
+
+    /**
+     * If there are more than one error list them out. \nFor example, list out validation errors by each field.
+     */
+    @JsonProperty(value = "errorItems")
+    @ApiModelProperty(value = "If there are more than one error list them out. \n" +
+            "For example, list out validation errors by each field.")
+    public List<ErrorListItem> getErrorItems() {
+        return errorItems;
+    }
+
+    public void setErrorItems(List<ErrorListItem> error) {
+        this.errorItems = error;
+    }
+
+    public static class ErrorResponseBuilder {
+
+        private Long code = null;
+        private String message = null;
+        private String description = null;
+        private String moreInfo = null;
+        private List<ErrorListItem> error;
+
+
+        public ErrorResponseBuilder() {
+            this.error = new ArrayList<>();
+        }
+
+        public ErrorResponseBuilder setCode(long code) {
+            this.code = code;
+            return this;
+        }
+
+        public ErrorResponseBuilder setMessage(String message) {
+            this.message = message;
+            return this;
+        }
+
+        public ErrorResponseBuilder setDescription(String description) {
+            this.description = description;
+            return this;
+        }
+
+        public ErrorResponseBuilder setMoreInfo(String moreInfo) {
+            this.moreInfo = moreInfo;
+            return this;
+        }
+
+        public ErrorResponseBuilder addErrorItem(String code, String msg) {
+            ErrorListItem item = new ErrorListItem();
+            item.setCode(code);
+            item.setMessage(msg);
+            this.error.add(item);
+            return this;
+        }
+
+        public ErrorResponse build() {
+            ErrorResponse errorResponse = new ErrorResponse();
+            errorResponse.setCode(code);
+            errorResponse.setMessage(message);
+            errorResponse.setErrorItems(error);
+            errorResponse.setDescription(description);
+            errorResponse.setMoreInfo(moreInfo);
+            return errorResponse;
+        }
+    }
+
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/common/ErrorHandler.java

@@ -0,0 +1,33 @@
+/*
+ * 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.application.mgt.api.common;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+
+@Produces({ "application/json", "application/xml" })
+public class ErrorHandler implements ExceptionMapper<MDMAPIException> {
+
+    public Response toResponse(MDMAPIException exception) {
+        ErrorMessage errorMessage = new ErrorMessage();
+        errorMessage.setErrorMessage(exception.getErrorMessage());
+        return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errorMessage).build();
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/common/ErrorMessage.java

@@ -0,0 +1,42 @@
+/*
+ * 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.application.mgt.api.common;
+
+
+public class ErrorMessage {
+
+    private String errorMessage;
+    private String errorCode;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/common/GsonMessageBodyHandler.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.device.application.mgt.api.common;
+
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import java.io.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+
+@Provider
+@Produces(APPLICATION_JSON)
+@Consumes(APPLICATION_JSON)
+public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, MessageBodyReader<Object> {
+
+    private Gson gson;
+    private static final String UTF_8 = "UTF-8";
+
+    public boolean isReadable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    private Gson getGson() {
+        if (gson == null) {
+            final GsonBuilder gsonBuilder = new GsonBuilder();
+            gson = gsonBuilder.create();
+        }
+        return gson;
+    }
+
+    public Object readFrom(Class<Object> objectClass, Type type, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, String> stringStringMultivaluedMap, InputStream entityStream)
+            throws IOException, WebApplicationException {
+
+        InputStreamReader reader = new InputStreamReader(entityStream, "UTF-8");
+
+        try {
+            return getGson().fromJson(reader, type);
+        } finally {
+            reader.close();
+        }
+    }
+
+    public boolean isWriteable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return true;
+    }
+
+    public long getSize(Object o, Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType) {
+        return -1;
+    }
+
+    public void writeTo(Object object, Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType,
+            MultivaluedMap<String, Object> stringObjectMultivaluedMap, OutputStream entityStream)
+            throws IOException, WebApplicationException {
+
+        OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
+        try {
+            getGson().toJson(object, type, writer);
+        } finally {
+            writer.close();
+        }
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/common/MDMAPIException.java

@@ -0,0 +1,59 @@
+/*
+ * 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.application.mgt.api.common;
+
+/**
+ * Custom exception class for handling CDM API related exceptions.
+ */
+public class MDMAPIException extends Exception {
+
+	private static final long serialVersionUID = 7950151650447893900L;
+	private String errorMessage;
+
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+
+	public MDMAPIException(String msg, Exception e) {
+		super(msg, e);
+		setErrorMessage(msg);
+	}
+
+	public MDMAPIException(String msg, Throwable cause) {
+		super(msg, cause);
+		setErrorMessage(msg);
+	}
+
+	public MDMAPIException(String msg) {
+		super(msg);
+		setErrorMessage(msg);
+	}
+
+	public MDMAPIException() {
+		super();
+	}
+
+	public MDMAPIException(Throwable cause) {
+		super(cause);
+	}
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ApplicationManagementService.java

@@ -0,0 +1,117 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.api.services;
+
+import io.swagger.annotations.*;
+import org.wso2.carbon.device.application.mgt.api.beans.ErrorResponse;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/applications")
+@Api(value = "Application Management", description = "This API carries all device management related operations " +
+        "such as get all the available devices, etc.")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public interface ApplicationManagementService {
+
+    public final static String SCOPE = "scope";
+
+    @POST
+    @Path("/")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    @ApiOperation(
+            consumes = MediaType.TEXT_PLAIN,
+            produces = MediaType.TEXT_PLAIN,
+            httpMethod = "POST",
+            value = "Creates new application",
+            notes = "This will create a new application",
+            tags = "Application Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:create-application")
+                    })
+            }
+    )
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            code = 200,
+                            message = "OK. \n Successfully fetched the device location.",
+                            response = String.class),
+                    @ApiResponse(
+                            code = 304,
+                            message = "Not Modified. \n " +
+                                    "Empty body because the client already has the latest version of the requested resource."),
+                    @ApiResponse(
+                            code = 500,
+                            message = "Internal Server Error. \n Error occurred while retrieving signed certificate.",
+                            response = ErrorResponse.class)
+            })
+    Response createApplication(
+            @ApiParam(
+                    name = "If-Modified-Since",
+                    value = "Validates if the requested variant has not been modified since the time specified",
+                    required = false)
+            @HeaderParam("If-Modified-Since") String ifModifiedSince,
+            String name);
+
+    @GET
+    @Path("/")
+    @Produces(MediaType.TEXT_PLAIN)
+    @Consumes(MediaType.TEXT_PLAIN)
+    @ApiOperation(
+            consumes = MediaType.TEXT_PLAIN,
+            produces = MediaType.TEXT_PLAIN,
+            httpMethod = "POST",
+            value = "get all applications",
+            notes = "This will get all applications",
+            tags = "Application Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:get-application")
+                    })
+            }
+    )
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            code = 200,
+                            message = "OK. \n Successfully got application list.",
+                            response = String.class),
+                    @ApiResponse(
+                            code = 304,
+                            message = "Not Modified. \n " +
+                                    "Empty body because the client already has the latest version of the requested resource."),
+                    @ApiResponse(
+                            code = 500,
+                            message = "Internal Server Error. \n Error occurred while getting the application list.",
+                            response = ErrorResponse.class)
+            })
+    Response getApplications(
+            @ApiParam(
+                    name = "If-Modified-Since",
+                    value = "Validates if the requested variant has not been modified since the time specified",
+                    required = false)
+            @HeaderParam("If-Modified-Since") String ifModifiedSince);
+
+
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementServiceImpl.java

@@ -0,0 +1,42 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.api.services.impl;
+
+import org.wso2.carbon.device.application.mgt.api.services.ApplicationManagementService;
+import org.wso2.carbon.device.application.mgt.core.components.ApplicationManager;
+import org.wso2.carbon.device.application.mgt.core.util.ApplicationManagementUtil;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.core.Response;
+
+public class ApplicationManagementServiceImpl implements ApplicationManagementService {
+
+    @POST
+    @Override
+    public Response createApplication(String ifModifiedSince, String name) {
+        ApplicationManager applicationManager = ApplicationManagementUtil.getApplicationManager();
+        return null;
+    }
+
+    @Override
+    public Response getApplications(String ifModifiedSince) {
+        ApplicationManager applicationManager = ApplicationManagementUtil.getApplicationManager();
+        return Response.ok().entity(applicationManager.getApplications().get(0).getName()).build();
+    }
+}

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

@@ -1,66 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:cxf="http://cxf.apache.org/core"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-         http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
 
-    <jaxrs:server id="services" address="/">
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="
+         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+         http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+
+    <jaxrs:server id="applicationMgtService" address="/">
         <jaxrs:serviceBeans>
-            <ref bean="applicationManagementService"/>
-            <ref bean="swaggerResource"/>
+            <ref bean="applicationMgtServiceBean"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <ref bean="jsonProvider"/>
-            <!--<ref bean="errorHandler"/>-->
-            <ref bean="swaggerWriter"/>
+            <ref bean="errorHandler"/>
         </jaxrs:providers>
     </jaxrs:server>
 
-    <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
-    <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
-    <bean id="ValidationInterceptor" class="org.wso2.carbon.application.mgt.jaxrs.exception.ValidationInterceptor"/>
-    <bean id="GlobalExceptionMapper" class="org.wso2.carbon.application.mgt.jaxrs.exception.GlobalThrowableMapper"/>
-
-    <bean id="swaggerConfig" class="io.swagger.jaxrs.config.BeanConfig">
-        <property name="resourcePackage" value="org.wso2.carbon.application.mgt.jaxrs"/>
-        <property name="version" value="1.0"/>
-        <property name="host" value="localhost:9443"/>
-        <property name="schemes" value="https" />
-        <property name="basePath" value="/api/application-mgt/v1.0"/>
-        <property name="title" value="Application Management Admin Service API Definitions"/>
-        <property name="contact" value="dev@wso2.org"/>
-        <property name="license" value="Apache 2.0"/>
-        <property name="licenseUrl" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
-        <property name="scan" value="true"/>
-    </bean>
-
-    <bean id="applicationManagementService" class="org.wso2.carbon.application.mgt.api.service.ApplicationManagementService"/>
-	<bean id="jsonProvider" class="org.wso2.carbon.application.mgt.jaxrs.common.GsonMessageBodyHandler"/>
-
-    <!--<bean id="errorHandler" class="org.wso2.carbon.device.mgt.jaxrs.common.ErrorHandler"/>-->
-    <cxf:bus>
-        <cxf:inInterceptors>
-            <ref bean="ValidationInterceptor"/>
-        </cxf:inInterceptors>
-    </cxf:bus>
+    <bean id="applicationMgtServiceBean" class="org.wso2.carbon.device.application.mgt.api.services.impl.ApplicationManagementServiceImpl"/>
+    <bean id="jsonProvider" class="org.wso2.carbon.device.application.mgt.api.common.GsonMessageBodyHandler"/>
+    <bean id="errorHandler" class="org.wso2.carbon.device.application.mgt.api.common.ErrorHandler"/>
 
-</beans>
+</beans>

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

@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
-    <display-name>Admin-Webapp</display-name>
+    <display-name>Application Management Webapp</display-name>
     <servlet>
         <description>JAX-WS/JAX-RS Application Management Endpoint</description>
         <display-name>JAX-WS/JAX-RS Servlet</display-name>
@@ -25,12 +25,6 @@
         <servlet-class>
             org.apache.cxf.transport.servlet.CXFServlet
         </servlet-class>
-        <!-- configure a security filter -->
-        <init-param>
-            <param-name>swagger.security.filter</param-name>
-            <param-value>ApiAuthorizationFilterImpl</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>
         <servlet-name>CXFServlet</servlet-name>
@@ -39,10 +33,9 @@
     <session-config>
         <session-timeout>60</session-timeout>
     </session-config>
-
     <context-param>
         <param-name>doAuthentication</param-name>
-        <param-value>true</param-value>
+        <param-value>false</param-value>
     </context-param>
 
     <!--publish to apim-->
@@ -59,61 +52,4 @@
         <param-value>true</param-value>
     </context-param>
 
-    <!-- Below configuration is used to redirect http requests to https -->
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>ApplicationMgt-Admin</web-resource-name>
-            <url-pattern>/*</url-pattern>
-        </web-resource-collection>
-        <user-data-constraint>
-            <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-        </user-data-constraint>
-    </security-constraint>
-
-    <filter>
-        <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.application.mgt.jaxrs.ApiOriginFilter</filter-class>
-    </filter>
-
-    <filter>
-        <filter-name>HttpHeaderSecurityFilter</filter-name>
-        <filter-class>org.apache.catalina.filters.HttpHeaderSecurityFilter</filter-class>
-        <init-param>
-            <param-name>hstsEnabled</param-name>
-            <param-value>false</param-value>
-        </init-param>
-    </filter>
-
-    <filter>
-        <filter-name>ContentTypeBasedCachePreventionFilter</filter-name>
-        <filter-class>org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter</filter-class>
-        <init-param>
-            <param-name>patterns</param-name>
-            <param-value>text/html" ,application/json" ,text/plain</param-value>
-        </init-param>
-        <init-param>
-            <param-name>filterAction</param-name>
-            <param-value>enforce</param-value>
-        </init-param>
-        <init-param>
-            <param-name>httpHeaders</param-name>
-            <param-value>Cache-Control: no-store, no-cache, must-revalidate, private</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>HttpHeaderSecurityFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>ContentTypeBasedCachePreventionFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>ApiOriginFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
 </web-app>

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

@@ -18,7 +18,6 @@
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>application-mgt</artifactId>
@@ -28,6 +27,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
+    <version>2.0.45-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Application Management Core</name>
     <description>WSO2 Carbon - Application Management Core</description>
@@ -42,6 +42,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -49,61 +50,63 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                         <Bundle-Description>Device Management Core Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.application.mgt.core.internal</Private-Package>
+                        <Private-Package>
+                            org.wso2.carbon.device.application.mgt.core.internal
+                        </Private-Package>
                         <Import-Package>
-                            org.apache.axis2.*;version="${axis2.osgi.version.range}",
-                            org.apache.axiom.*; version="${axiom.osgi.version.range}",
                             org.osgi.framework,
                             org.osgi.service.component,
                             org.apache.commons.logging,
-                            javax.naming,
+                            javax.security.auth.x500,
                             javax.xml.*,
                             javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
-                            javax.servlet.*,
-                            org.xml.sax,
-                            javax.sql.*,
-                            org.wso2.carbon.context,
-                            org.wso2.carbon.core,
-                            org.wso2.carbon.utils.*,
-                            org.wso2.carbon.application.mgt.common.*,
+                            org.apache.commons.codec.binary;version="${commons-codec.wso2.osgi.version.range}",
+                            org.bouncycastle.asn1,
+                            org.bouncycastle.asn1.x500,
+                            org.bouncycastle.asn1.x509,
+                            org.bouncycastle.asn1.pkcs,
+                            org.bouncycastle.cert; version="${bcprov.wso2.version.range}",
+                            org.bouncycastle.cert.jcajce; version="${bcprov.wso2.version.range}",
+                            org.bouncycastle.cms,
+                            org.bouncycastle.jce.provider,
+                            org.bouncycastle.operator,
+                            org.bouncycastle.operator.jcajce,
+                            org.bouncycastle.asn1.x500.style,
+                            org.bouncycastle.pkcs,
+                            org.wso2.carbon.user.core.tenant,
                             org.wso2.carbon.user.api,
-                            org.wso2.carbon.user.core.*,
-                            org.wso2.carbon.registry.core.service,
-                            org.wso2.carbon.registry.core,
-                            org.wso2.carbon.registry.core.exceptions,
-                            org.wso2.carbon.registry.core.session,
-                            org.wso2.carbon.registry.api,
+                            org.wso2.carbon.user.core.service,
+                            <!--org.bouncycastle.openssl,-->
+                            org.bouncycastle.util,
+                            org.jscep.message,
+                            org.wso2.carbon.context,
+                            org.jscep.transaction,
                             org.w3c.dom,
-                            org.wso2.carbon.identity.oauth.stub,
-                            org.wso2.carbon.identity.oauth.stub.dto,
-                            org.wso2.carbon.ndatasource.core,
-                            org.wso2.carbon.ntask.core.*,
-                            org.wso2.carbon.ntask.common,
-                            org.apache.catalina,
-                            org.apache.catalina.core,
-                            org.apache.commons.collections,
-                            org.wso2.carbon.email.sender.*,
+                            org.xml.sax,
+                            javax.sql,
+                            <!--javax.cache,-->
+                            javax.naming,
+                            javax.xml.bind.annotation,
+                            javax.xml.bind,
+                            org.wso2.carbon.utils.*,
+                            org.wso2.carbon.device.mgt.common.*,
                             io.swagger.annotations.*;resolution:=optional,
-                            org.wso2.carbon,
-                            org.wso2.carbon.base,
-                            org.scannotation.*
+                            org.wso2.carbon.device.mgt.core.*,
+                            org.wso2.carbon.registry.indexing.*,
+                            <!--org.bouncycastle.pkcs.jcajce-->
                         </Import-Package>
                         <Export-Package>
-                            !org.wso2.carbon.application.mgt.core.internal,
-                            org.wso2.carbon.application.mgt.core.*
+                            !org.wso2.carbon.device.application.mgt.core.internal.*,
+                            org.wso2.carbon.device.application.mgt.core.*
                         </Export-Package>
-                        <Embed-Dependency>
-                            javax.ws.rs-api,
-                            scribe;scope=compile|runtime;inline=false,
-							javassist;inline=false
-                        </Embed-Dependency>
-                        <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18</version>
                 <configuration>
                     <systemPropertyVariables>
                         <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
@@ -113,6 +116,7 @@
                     </suiteXmlFiles>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 
@@ -122,43 +126,8 @@
             <artifactId>org.eclipse.osgi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi.services</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>org.wso2.orbit.org.scannotation</groupId>
-			<artifactId>scannotation</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.utils</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-lang</groupId>
-                    <artifactId>commons-lang</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database.wso2</groupId>
-            <artifactId>h2-database-engine</artifactId>
-            <scope>test</scope>
+            <groupId>org.eclipse.equinox</groupId>
+            <artifactId>org.eclipse.equinox.common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -166,116 +135,58 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.user.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.user.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.registry.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.wso2</groupId>
-            <artifactId>jdbc-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.governance</groupId>
-            <artifactId>org.wso2.carbon.governance.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2.transport</groupId>
-            <artifactId>axis2-transport-mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom</artifactId>
-        </dependency>
-        <!--dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom-impl</artifactId>
+            <artifactId>org.wso2.carbon.logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-            <artifactId>axiom</artifactId>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.axis2.wso2</groupId>
-            <artifactId>axis2</artifactId>
+            <groupId>org.wso2.orbit.org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
-            <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
+            <groupId>org.wso2.orbit.org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.tomcat</groupId>
-            <artifactId>tomcat</artifactId>
+            <groupId>org.wso2.orbit.com.google.code.jscep</groupId>
+            <artifactId>jscep</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.tomcat</groupId>
-            <artifactId>tomcat-servlet-api</artifactId>
+            <groupId>commons-codec.wso2</groupId>
+            <artifactId>commons-codec</artifactId>
         </dependency>
-
-        <!--Ntask dependencies-->
         <dependency>
-            <groupId>org.wso2.carbon.commons</groupId>
-            <artifactId>org.wso2.carbon.ntask.core</artifactId>
+            <groupId>commons-io.wso2</groupId>
+            <artifactId>commons-io</artifactId>
         </dependency>
-
-
         <dependency>
-            <groupId>commons-collections.wso2</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.email.sender.core</artifactId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
         </dependency>
-
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.user.core</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>org.wso2.carbon.registry</groupId>
+            <artifactId>org.wso2.carbon.registry.indexing</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
         </dependency>
-		<dependency>
-			<groupId>javassist</groupId>
-			<artifactId>javassist</artifactId>
-		</dependency>
     </dependencies>
-
 </project>
 

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

@@ -16,12 +16,17 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.application.mgt.core.dao;
+package org.wso2.carbon.device.application.mgt.core.components;
 
-import org.wso2.carbon.application.mgt.core.dto.Application;
+import org.wso2.carbon.device.application.mgt.core.dto.Application;
 
-public interface ApplicationDAO {
+import java.util.ArrayList;
+import java.util.List;
+
+public interface ApplicationManager {
 
     public void createApplication(Application application);
 
+    public List<Application> getApplications();
+
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/components/impl/ApplicationManagerImpl.java

@@ -0,0 +1,75 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.components.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.application.mgt.core.components.ApplicationManager;
+import org.wso2.carbon.device.application.mgt.core.dao.ApplicationManagementDAO;
+import org.wso2.carbon.device.application.mgt.core.dao.ApplicationManagementDAOException;
+import org.wso2.carbon.device.application.mgt.core.dao.ApplicationManagementDAOImpl;
+import org.wso2.carbon.device.application.mgt.core.dto.Application;
+import org.wso2.carbon.device.application.mgt.core.internal.ApplicationManagementDataHolder;
+import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApplicationManagerImpl implements ApplicationManager {
+
+    private static final Log log = LogFactory.getLog(ApplicationManagerImpl.class);
+
+
+    private static ApplicationManagerImpl applicationManager = new ApplicationManagerImpl();
+
+    private ApplicationManagerImpl(){
+
+    }
+
+    public static ApplicationManagerImpl getInstance(){
+        return applicationManager;
+    }
+
+
+    @Override
+    public void createApplication(Application application) {
+
+    }
+
+    @Override
+    public List<Application> getApplications() {
+        ApplicationManagementDataHolder dataHolder = ApplicationManagementDataHolder.getInstance();
+        try {
+            ConnectionManagerUtil.openConnection();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        ApplicationManagementDAO applicationManagementDAO = dataHolder.getApplicationManagementDAO();
+        List<Application> applications = null;
+        try {
+            applications = applicationManagementDAO.getApplications();
+        } catch (ApplicationManagementDAOException e) {
+            log.error(e);
+        }
+
+        ConnectionManagerUtil.closeConnection();
+        return applications;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/ApplicationConfigurationManager.java

@@ -0,0 +1,80 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.config;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagerException;
+import org.wso2.carbon.device.application.mgt.core.util.ApplicationManagementUtil;
+import org.wso2.carbon.device.application.mgt.core.util.ApplicationManagerConstants;
+import org.wso2.carbon.utils.CarbonUtils;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import java.io.File;
+
+public class ApplicationConfigurationManager {
+
+    private final String applicationMgtConfigXMLPath = CarbonUtils.getCarbonConfigDirPath() + File.separator +
+            ApplicationManagerConstants.APPLICATION_CONFIG_XML_FILE;
+
+    private static final Log log = LogFactory.getLog(ApplicationConfigurationManager.class);
+
+    private ApplicationManagementConfigurations applicationManagerConfiguration;
+
+
+    private static ApplicationConfigurationManager applicationConfigurationManager;
+
+    private ApplicationConfigurationManager() {
+
+    }
+
+    public static ApplicationConfigurationManager getInstance() {
+        if (applicationConfigurationManager == null) {
+            applicationConfigurationManager = new ApplicationConfigurationManager();
+            try {
+                applicationConfigurationManager.initConfig();
+            } catch (ApplicationManagerException e) {
+                log.error(e);
+            }
+        }
+
+        return applicationConfigurationManager;
+    }
+
+
+    public synchronized void initConfig() throws ApplicationManagerException {
+        try {
+            File appMgtConfig = new File(applicationMgtConfigXMLPath);
+            Document doc = ApplicationManagementUtil.convertToDocument(appMgtConfig);
+
+            /* Un-marshaling Certificate Management configuration */
+            JAXBContext jaxbContext = JAXBContext.newInstance(ApplicationManagementConfigurations.class);
+            Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+            this.applicationManagerConfiguration = (ApplicationManagementConfigurations) unmarshaller.unmarshal(doc);
+        } catch (Exception e) {
+            throw new ApplicationManagerException("Error occurred while initializing application config");
+        }
+    }
+
+    public ApplicationManagementConfigurations getApplicationManagerConfiguration() {
+        return applicationManagerConfiguration;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/ApplicationManagementConfigurations.java

@@ -0,0 +1,39 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "ApplicationManagementConfigurations")
+public class ApplicationManagementConfigurations {
+
+    private ApplicationManagementRepository applicationManagerRepository;
+
+    @XmlElement(name = "ManagementRepository", required = true)
+    public ApplicationManagementRepository getApplicationManagerRepository() {
+        return applicationManagerRepository;
+    }
+
+    public void setApplicationManagerRepository(ApplicationManagementRepository applicationManagerRepository) {
+        this.applicationManagerRepository = applicationManagerRepository;
+    }
+}
+
+

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/ApplicationManagementRepository.java

@@ -0,0 +1,40 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.config;
+
+
+import org.wso2.carbon.device.application.mgt.core.config.datasource.DataSourceConfig;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "ManagementRepository")
+public class ApplicationManagementRepository {
+
+    private DataSourceConfig dataSourceConfig;
+
+    @XmlElement(name = "DataSourceConfiguration", required = true)
+    public DataSourceConfig getDataSourceConfig() {
+        return dataSourceConfig;
+    }
+
+    public void setDataSourceConfig(DataSourceConfig dataSourceConfig) {
+        this.dataSourceConfig = dataSourceConfig;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/datasource/DataSourceConfig.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014, 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.application.mgt.core.config.datasource;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Class for holding data source configuration in cdm-config.xml at parsing with JAXB
+ */
+@XmlRootElement(name = "DataSourceConfiguration")
+public class DataSourceConfig {
+
+    private JNDILookupDefinition jndiLookupDefinition;
+
+    @XmlElement(name = "JndiLookupDefinition", nillable = true)
+    public JNDILookupDefinition getJndiLookupDefinition() {
+        return jndiLookupDefinition;
+    }
+
+    public void setJndiLookupDefinition(JNDILookupDefinition jndiLookupDefinition) {
+        this.jndiLookupDefinition = jndiLookupDefinition;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/datasource/JNDILookupDefinition.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2014, 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.application.mgt.core.config.datasource;
+
+import javax.xml.bind.annotation.*;
+import java.util.List;
+
+/**
+ * Class for hold JndiLookupDefinition of cdm-config.xml at parsing with JAXB
+ */
+@XmlRootElement(name = "JndiLookupDefinition")
+public class JNDILookupDefinition {
+
+    private String jndiName;
+    private List<JNDIProperty> jndiProperties;
+
+    @XmlElement(name = "Name", nillable = false)
+    public String getJndiName() {
+        return jndiName;
+    }
+
+    public void setJndiName(String jndiName) {
+        this.jndiName = jndiName;
+    }
+
+    @XmlElementWrapper(name = "Environment", nillable = false)
+    @XmlElement(name = "Property", nillable = false)
+    public List<JNDIProperty> getJndiProperties() {
+        return jndiProperties;
+    }
+
+    public void setJndiProperties(List<JNDIProperty> jndiProperties) {
+        this.jndiProperties = jndiProperties;
+    }
+
+    @XmlRootElement(name = "Property")
+    public static class JNDIProperty {
+
+        private String name;
+
+        private String value;
+
+        @XmlAttribute(name = "Name")
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        @XmlValue
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+    }
+
+}
+

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ApplicationManagementDAO.java

@@ -0,0 +1,64 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.dao;
+
+import org.apache.axis2.databinding.types.Day;
+import org.wso2.carbon.device.application.mgt.core.dto.Application;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface ApplicationManagementDAO {
+
+    public enum DatabaseType {
+
+        H2("H2"),
+        MYSQL("MySQL"),
+        ORACLE("Oracle"),
+        POSTGRESQL("PostgreSQL"),
+        MSSQL("Microsoft SQL Server");
+
+        private final String value;
+        private static final Map<String, DatabaseType> lookup = new HashMap<String, DatabaseType>();
+
+        static {
+            for (DatabaseType databaseType : DatabaseType.values()) {
+                lookup.put(databaseType.getValue(), databaseType);
+            }
+        }
+
+        DatabaseType(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static DatabaseType lookup(String value) {
+            return lookup.get(value);
+        }
+    }
+
+    public void createApplication(Application application) throws ApplicationManagementDAOException;
+
+    public List<Application> getApplications() throws ApplicationManagementDAOException;
+
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ApplicationManagementDAOException.java

@@ -16,10 +16,27 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.application.mgt.api.service.impl;
+package org.wso2.carbon.device.application.mgt.core.dao;
 
-import org.wso2.carbon.device.application.mgt.api.service.api.ApplicationManagementService;
+public class ApplicationManagementDAOException extends Exception {
 
-public class ApplicationManagementServiceImpl implements ApplicationManagementService {
+    String message;
 
+    public ApplicationManagementDAOException(String message){
+        this.message = message;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ApplicationManagementDAOImpl.java

@@ -0,0 +1,90 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.dao;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.application.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
+import org.wso2.carbon.device.application.mgt.core.dto.Application;
+
+import javax.sql.DataSource;
+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 ApplicationManagementDAOImpl implements ApplicationManagementDAO {
+
+    private DatabaseType databaseType;
+    private static DataSource dataSource;
+
+    private static final Log log = LogFactory.getLog(ApplicationManagementDAOImpl.class);
+
+    public ApplicationManagementDAOImpl(DataSourceConfig dataSourceConfig) {
+        dataSource = ConnectionManagerUtil.resolveDataSource(dataSourceConfig);
+        ConnectionManagerUtil.setDataSource(dataSource);
+        String databaseEngine = "H2";
+        try {
+            databaseEngine = dataSource.getConnection().getMetaData().getDatabaseProductName();
+        } catch (SQLException e) {
+            log.error("Error occurred while retrieving config.datasource connection", e);
+        }
+        this.databaseType = DatabaseType.lookup(databaseEngine);
+    }
+
+    @Override
+    public void createApplication(Application application) throws ApplicationManagementDAOException {
+
+    }
+
+    @Override
+    public List<Application> getApplications() throws ApplicationManagementDAOException {
+
+        Connection conn = null;
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        String sql = null;
+        List<Application> applications;
+
+        try {
+            conn = ConnectionManagerUtil.getCurrentConnection().get();
+            switch (databaseType) {
+                case H2:
+                case MYSQL:
+                    sql = "SELECT * FROM APPM_APPLICATION";
+            }
+
+            stmt = conn.prepareStatement(sql);
+            rs = stmt.executeQuery();
+            applications = new ArrayList<>();
+            while (rs.next()) {
+                applications.add(ApplicationManagementDAOUtil.loadApplication(rs));
+            }
+
+        } catch (SQLException e) {
+            throw new ApplicationManagementDAOException("Error occurred while getting application List");
+        } finally {
+            ApplicationManagementDAOUtil.cleanupResources(stmt, rs);
+        }
+        return applications;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/ApplicationManagementDAOUtil.java

@@ -0,0 +1,61 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.dao;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.application.mgt.core.dto.Application;
+import org.wso2.carbon.device.application.mgt.core.dto.ApplicationType;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class ApplicationManagementDAOUtil {
+
+    private static final Log log = LogFactory.getLog(ApplicationManagementDAOUtil.class);
+
+    public static Application loadApplication(ResultSet rs) throws SQLException {
+        ApplicationType applicationType = new ApplicationType();
+        Application application = new Application();
+        application.setId(rs.getInt("ID"));
+        application.setName(rs.getString("NAME"));
+        application.setUuId(rs.getString("UUID"));
+        application.setDescription(rs.getString("DESCRIPTION"));
+        applicationType.setId(rs.getInt("APPLICATION_TYPE_ID"));
+        application.setApplicationType(applicationType);
+        return application;
+    }
+
+    public static void cleanupResources(PreparedStatement stmt, ResultSet rs) {
+        if (rs != null) {
+            try {
+                rs.close();
+            } catch (SQLException e) {
+                log.warn("Error occurred while closing result set", e);
+            }
+        }
+        if (stmt != null) {
+            try {
+                stmt.close();
+            } catch (SQLException e) {
+                log.warn("Error occurred while closing prepared statement", e);
+            }
+        }
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Application.java

@@ -16,20 +16,20 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.application.mgt.core.dto;
+package org.wso2.carbon.device.application.mgt.core.dto;
 
 import java.util.List;
 
 public class Application{
 
     private int id;
-
     private String uuId;
-
-    private String type;
-
+    private String name;
+    private String description;
+    private ApplicationType applicationType;
     private List<String> properties;
 
+
     public int getId() {
         return id;
     }
@@ -46,12 +46,28 @@ public class Application{
         this.uuId = uuId;
     }
 
-    public String getType() {
-        return type;
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public ApplicationType getApplicationType() {
+        return applicationType;
     }
 
-    public void setType(String type) {
-        this.type = type;
+    public void setApplicationType(ApplicationType applicationType) {
+        this.applicationType = applicationType;
     }
 
     public List<String> getProperties() {

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/ApplicationType.java

@@ -0,0 +1,51 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.dto;
+
+public class ApplicationType {
+
+    private int id;
+    private String name;
+    private String code;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagerException.java

@@ -16,15 +16,27 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.application.mgt.core.util;
+package org.wso2.carbon.device.application.mgt.core.exception;
 
-public class AppManagementPlugin {
+public class ApplicationManagerException extends Exception {
 
-    public void registerPlugins(){
+    String message;
 
+    public ApplicationManagerException(String message){
+        this.message = message;
     }
 
-    public void unregisterPlugins(){
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
 
+    @Override
+    public String toString() {
+        return super.toString();
     }
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/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.device.application.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/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/KeystoreException.java

@@ -0,0 +1,55 @@
+/*
+ * 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.application.mgt.core.exception;
+
+public class KeystoreException extends Exception {
+
+    private static final long serialVersionUID = -8935640983869122660L;
+    private String errorMessage;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public KeystoreException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+        setErrorMessage(msg);
+    }
+
+    public KeystoreException(String message, Throwable cause) {
+        super(message, cause);
+        setErrorMessage(message);
+    }
+
+    public KeystoreException(String msg) {
+        super(msg);
+        setErrorMessage(msg);
+    }
+
+    public KeystoreException() {
+        super();
+    }
+
+    public KeystoreException(Throwable cause) {
+        super(cause);
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/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.device.application.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/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/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.device.application.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/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ApplicationManagementDataHolder.java

@@ -0,0 +1,54 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.internal;
+
+import org.wso2.carbon.device.application.mgt.core.dao.ApplicationManagementDAO;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+
+public class ApplicationManagementDataHolder {
+
+    private DeviceManagementProviderService deviceManagementService;
+    private ApplicationManagementDAO applicationManagementDAO;
+
+    private static final ApplicationManagementDataHolder applicationMgtDataHolder = new ApplicationManagementDataHolder();
+
+    private ApplicationManagementDataHolder(){
+
+    }
+
+    public static ApplicationManagementDataHolder getInstance() {
+        return applicationMgtDataHolder;
+    }
+
+    public DeviceManagementProviderService getDeviceManagementService() {
+        return deviceManagementService;
+    }
+
+    public void setDeviceManagementService(DeviceManagementProviderService deviceManagementService) {
+        this.deviceManagementService = deviceManagementService;
+    }
+
+    public ApplicationManagementDAO getApplicationManagementDAO() {
+        return applicationManagementDAO;
+    }
+
+    public void setApplicationManagementDAO(ApplicationManagementDAO applicationManagementDAO) {
+        this.applicationManagementDAO = applicationManagementDAO;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ApplicationManagementServiceComponent.java

@@ -0,0 +1,86 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.internal;
+
+import org.apache.commons.logging.Log;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.framework.BundleContext;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.application.mgt.core.components.ApplicationManager;
+import org.wso2.carbon.device.application.mgt.core.components.impl.ApplicationManagerImpl;
+import org.wso2.carbon.device.application.mgt.core.config.ApplicationConfigurationManager;
+import org.wso2.carbon.device.application.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.device.application.mgt.core.dao.ApplicationManagementDAO;
+import org.wso2.carbon.device.application.mgt.core.dao.ApplicationManagementDAOImpl;
+import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
+
+import javax.naming.NamingException;
+
+/**
+ * @scr.component name="org.wso2.carbon.application.mgt" immediate="true"
+ * @scr.reference name="org.wso2.carbon.device.manager"
+ * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
+ * cardinality="1..1"
+ * policy="dynamic"
+ * bind="setDeviceManagementService"
+ * unbind="unsetDeviceManagementService"
+ */
+public class ApplicationManagementServiceComponent {
+
+    private static Log log = LogFactory.getLog(ApplicationManagementServiceComponent.class);
+
+
+    protected void activate(ComponentContext componentContext) throws NamingException {
+        BundleContext bundleContext = componentContext.getBundleContext();
+
+        bundleContext.registerService(ApplicationManager.class.getName(),
+                ApplicationManagerImpl.getInstance(), null);
+
+
+        DataSourceConfig dataSourceConfig  = ApplicationConfigurationManager.getInstance()
+                .getApplicationManagerConfiguration().getApplicationManagerRepository().getDataSourceConfig();
+        ApplicationManagementDAO applicationManagementDAO = new ApplicationManagementDAOImpl(dataSourceConfig);
+        ApplicationManagementDataHolder.getInstance()
+                .setApplicationManagementDAO(applicationManagementDAO);
+
+        log.info("ApplicationManagement core bundle has been successfully initialized");
+
+        if (log.isDebugEnabled()) {
+            log.debug("ApplicationManagement core bundle has been successfully initialized");
+        }
+    }
+
+    protected void deactivate(ComponentContext componentContext) {
+        //do nothing
+    }
+
+    protected void setDeviceManagementService(DeviceManagementProviderService deviceManagementProviderService) {
+        if (log.isDebugEnabled()) {
+            log.debug("Setting Application Management OSGI Service");
+        }
+        ApplicationManagementDataHolder.getInstance().setDeviceManagementService(deviceManagementProviderService);
+    }
+
+    protected void unsetDeviceManagementService(DeviceManagementProviderService deviceManagementProviderService) {
+        if (log.isDebugEnabled()) {
+            log.debug("Removing Application Management OSGI Service");
+        }
+        ApplicationManagementDataHolder.getInstance().setDeviceManagementService(null);
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagementUtil.java

@@ -0,0 +1,62 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.util;
+
+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.application.mgt.core.components.ApplicationManager;
+import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagerException;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+
+public class ApplicationManagementUtil {
+
+    private static Log log = LogFactory.getLog(ApplicationManagementUtil.class);
+
+    public static ApplicationManager getApplicationManager() {
+        PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        ApplicationManager applicationManager =
+                (ApplicationManager) CarbonContext.getThreadLocalCarbonContext().getOSGiService(ApplicationManager.class, null);
+        if (applicationManager == null) {
+            String msg = "Application Management provider service has not initialized.";
+            log.error(msg);
+            throw new IllegalStateException(msg);
+        }
+        return applicationManager;
+    }
+
+    public static Document convertToDocument(File file) throws ApplicationManagerException {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+            return docBuilder.parse(file);
+        } catch (Exception e) {
+            throw new ApplicationManagerException("Error occurred while parsing file, while converting " +
+                    "to a org.w3c.dom.Document : " + e.getMessage());
+        }
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ApplicationManagerConstants.java

@@ -16,9 +16,9 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.application.mgt.api.service.api;
-
-public interface ApplicationManagementService {
+package org.wso2.carbon.device.application.mgt.core.util;
 
+public class ApplicationManagerConstants {
 
+    public static final String APPLICATION_CONFIG_XML_FILE = "application-mgt.xml";
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/ConnectionManagerUtil.java

@@ -0,0 +1,209 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.application.mgt.core.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.application.mgt.core.config.datasource.DataSourceConfig;
+import org.wso2.carbon.device.application.mgt.core.config.datasource.JNDILookupDefinition;
+import org.wso2.carbon.device.application.mgt.core.exception.IllegalTransactionStateException;
+import org.wso2.carbon.device.application.mgt.core.exception.TransactionManagementException;
+
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Hashtable;
+import java.util.List;
+
+public class ConnectionManagerUtil {
+
+    private static final Log log = LogFactory.getLog(ConnectionManagerUtil.class);
+
+    private enum TxState {
+        CONNECTION_NOT_BORROWED, CONNECTION_BORROWED, CONNECTION_CLOSED
+    }
+
+    private static final ThreadLocal<Connection> currentConnection = new ThreadLocal<>();
+    private static ThreadLocal<TxState> currentTxState = new ThreadLocal<>();
+    private static DataSource dataSource;
+
+    public static void setDataSource(DataSource dataSource) {
+        ConnectionManagerUtil.dataSource = dataSource;
+    }
+
+    public static ThreadLocal<Connection> getCurrentConnection() {
+        return currentConnection;
+    }
+
+    public static void openConnection() throws SQLException {
+        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");
+        }
+        try {
+            conn = dataSource.getConnection();
+        } catch (SQLException e) {
+            currentTxState.set(TxState.CONNECTION_NOT_BORROWED);
+            throw e;
+        }
+        currentConnection.set(conn);
+        currentTxState.set(TxState.CONNECTION_BORROWED);
+    }
+
+
+    public static void beginTransaction() throws TransactionManagementException {
+        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");
+        }
+        try {
+            conn = dataSource.getConnection();
+        } catch (SQLException e) {
+            throw new TransactionManagementException("Error occurred while retrieving a data source connection", e);
+        }
+
+        try {
+            conn.setAutoCommit(false);
+        } catch (SQLException e) {
+            try {
+                conn.close();
+            } catch (SQLException e1) {
+                log.warn("Error occurred while closing the borrowed connection. " +
+                        "Transaction has ended pre-maturely", e1);
+            }
+            currentTxState.set(TxState.CONNECTION_CLOSED);
+            throw new TransactionManagementException("Error occurred while setting auto-commit to false", e);
+        }
+        currentConnection.set(conn);
+        currentTxState.set(TxState.CONNECTION_BORROWED);
+    }
+
+    public static void commitTransaction() {
+        Connection conn = currentConnection.get();
+        if (conn == null) {
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally been caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
+        }
+        try {
+            conn.commit();
+        } catch (SQLException e) {
+            log.error("Error occurred while committing the transaction", e);
+        } finally {
+            closeConnection();
+        }
+    }
+
+    public static void rollbackTransaction() {
+        Connection conn = currentConnection.get();
+        if (conn == null) {
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally been caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
+        }
+        try {
+            conn.rollback();
+        } catch (SQLException e) {
+            log.warn("Error occurred while roll-backing the transaction", e);
+        } finally {
+            closeConnection();
+        }
+    }
+
+    public static void closeConnection() {
+        TxState txState = currentTxState.get();
+        if (TxState.CONNECTION_NOT_BORROWED == txState) {
+            if (log.isDebugEnabled()) {
+                log.debug("No successful connection appears to have been borrowed to perform the underlying " +
+                        "transaction even though the 'openConnection' method has been called. Therefore, " +
+                        "'closeConnection' method is returning silently");
+            }
+            currentTxState.remove();
+            return;
+        }
+
+        Connection conn = currentConnection.get();
+        if (conn == null) {
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally been caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
+        }
+        try {
+            conn.close();
+        } catch (SQLException e) {
+            log.warn("Error occurred while close the connection", e);
+        }
+        currentConnection.remove();
+        currentTxState.remove();
+    }
+
+
+    /**
+     * Resolve data source from the data source definition.
+     *
+     * @param config data source configuration
+     * @return data source resolved from the data source definition
+     */
+    public static DataSource resolveDataSource(DataSourceConfig config) {
+        DataSource dataSource = null;
+        if (config == null) {
+            throw new RuntimeException(
+                    "Application Management Repository data source configuration " + "is null and " +
+                            "thus, is not initialized"
+            );
+        }
+        JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition();
+        if (jndiConfig != null) {
+            if (log.isDebugEnabled()) {
+                log.debug("Initializing Application Management Repository data source using the JNDI " +
+                        "Lookup Definition");
+            }
+            List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
+                    jndiConfig.getJndiProperties();
+            if (jndiPropertyList != null) {
+                Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
+                for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
+                    jndiProperties.put(prop.getName(), prop.getValue());
+                }
+                dataSource = lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
+            } else {
+                dataSource = lookupDataSource(jndiConfig.getJndiName(), null);
+            }
+        }
+        return dataSource;
+    }
+
+
+    public static DataSource lookupDataSource(String dataSourceName, final Hashtable<Object, Object> jndiProperties) {
+        try {
+            if (jndiProperties == null || jndiProperties.isEmpty()) {
+                return (DataSource) InitialContext.doLookup(dataSourceName);
+            }
+            final InitialContext context = new InitialContext(jndiProperties);
+            return (DataSource) context.doLookup(dataSourceName);
+        } catch (Exception e) {
+            throw new RuntimeException("Error in looking up data source: " + e.getMessage(), e);
+        }
+    }
+}

components/application-mgt/pom.xml

@@ -38,4 +38,25 @@
         <module>org.wso2.carbon.device.application.mgt.core</module>
         <module>org.wso2.carbon.device.application.mgt.api</module>
     </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.7.2</version>
+                    <executions>
+                        <execution>
+                            <id>generate-scr-scrdescriptor</id>
+                            <goals>
+                                <goal>scr</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>

pom.xml

@@ -41,6 +41,7 @@
         <module>components/apimgt-extensions</module>
         <module>components/policy-mgt</module>
         <module>components/certificate-mgt</module>
+        <module>components/application-mgt</module>
         <module>components/webapp-authenticator-framework</module>
         <module>components/email-sender</module>
         <module>features/device-mgt</module>
@@ -170,6 +171,11 @@
                 <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>