Refactoring services classes

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationReleaseManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface ApplicationReleaseManager {
+public interface ApplicationReleaseManager extends ApplicationManagementService {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/CategoryManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface CategoryManager {
+public interface CategoryManager extends ApplicationManagementService  {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/CommentsManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface CommentsManager {
+public interface CommentsManager extends ApplicationManagementService  {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/LifecycleStateManager.java

@@ -18,6 +18,6 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface LifecycleStateManager {
+public interface LifecycleStateManager extends ApplicationManagementService  {
 
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/PlatformManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface PlatformManager {
+public interface PlatformManager extends ApplicationManagementService  {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ResourceTypeManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface ResourceTypeManager {
+public interface ResourceTypeManager extends ApplicationManagementService  {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/SubscriptionManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface SubscriptionManager {
+public interface SubscriptionManager extends ApplicationManagementService  {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/VisibilityManager.java

@@ -18,5 +18,5 @@
  */
 package org.wso2.carbon.device.application.mgt.common.services;
 
-public interface VisibilityManager {
+public interface VisibilityManager extends ApplicationManagementService  {
 }

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

@@ -35,13 +35,22 @@ public class ApplicationManagementServiceFactory {
 
     public enum ManagerService {
         APPLICATION_MANAGER,
-        APPLICATION_RELEASE_MANAGER
+        APPLICATION_RELEASE_MANAGER,
+        CATEGORY_MANAGER,
+        COMMENTS_MANAGER,
+        LIFECYCLE_STATE_MANAGER,
+        PLATFORM_MANAGER,
+        RESOURCE_TYPE_MANAGER,
+        SUBSCRIPTION_MANAGER,
+        VISIBILITY_MANAGER
     }
 
     public ApplicationManagementService getApplicationManagementService(ManagerService managerService) {
         switch (managerService) {
             case APPLICATION_MANAGER:
                 return new ApplicationManagerImpl();
+            case APPLICATION_RELEASE_MANAGER:
+                return new ApplicationReleaseManagerImpl();
             default:
                 return null;
         }

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

@@ -16,9 +16,10 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.application.mgt.extensions.payments.impl;
+package org.wso2.carbon.device.application.mgt.core.services.impl;
 
-import org.wso2.carbon.device.application.mgt.extensions.payments.PaymentService;
+import org.wso2.carbon.device.application.mgt.common.services.ApplicationReleaseManager;
+
+public class ApplicationReleaseManagerImpl implements ApplicationReleaseManager {
 
-public class PaymentServiceImpl implements PaymentService {
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.extensions/src/main/java/org/wso2/carbon/device/application/mgt/extensions/payments/PaymentService.java

@@ -1,22 +0,0 @@
-/*
- *   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.extensions.payments;
-
-public interface PaymentService {
-}