From fc4576082cd9fa0bd0fcbc200d329bbbab1af0d0 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 21 Jun 2017 10:56:12 +0530 Subject: [PATCH] Changing artifact uploader admin service resource path --- .../admin/DeviceAnalyticsArtifactUploaderAdminService.java | 4 ++-- .../DeviceAnalyticsArtifactUploaderAdminServiceImpl.java | 2 +- .../public/js/platform-configuration.js | 2 +- .../units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAnalyticsArtifactUploaderAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAnalyticsArtifactUploaderAdminService.java index 6c7f0d5eff0..94220ef8cd2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAnalyticsArtifactUploaderAdminService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAnalyticsArtifactUploaderAdminService.java @@ -39,7 +39,7 @@ import javax.ws.rs.core.Response; extensions = { @Extension(properties = { @ExtensionProperty(name = "name", value = "DeviceAnalyticsArtifactUploaderAdminService"), - @ExtensionProperty(name = "context", value = "/api/device-mgt/v1.0/admin/devicetype"), + @ExtensionProperty(name = "context", value = "/api/device-mgt/v1.0/admin/publish-artifact"), }) } ), @@ -47,7 +47,7 @@ import javax.ws.rs.core.Response; @Tag(name = "device_management", description = "") } ) -@Path("/admin/devicetype") +@Path("/admin/publish-artifact") @Api(value = "Devicetype deployment Administrative Service", description = "This an API intended to be used to " + "deploy device type components" + "Further, this is strictly restricted to admin users only ") diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java index 27e74549b0d..c6325a4ec7c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java @@ -68,7 +68,7 @@ import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.List; -@Path("/admin/devicetype") +@Path("/admin/publish-artifact") public class DeviceAnalyticsArtifactUploaderAdminServiceImpl implements DeviceAnalyticsArtifactUploaderAdminService { /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js index c44d01030ae..45f753b4eda 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/public/js/platform-configuration.js @@ -131,7 +131,7 @@ var showAdvanceOperation = function (operation, button) { var artifactGeoUpload = function () { var contentType = "application/json"; var backendEndBasePath = "/api/device-mgt/v1.0"; - var urix = backendEndBasePath + "/admin/devicetype/deploy/analytics"; + var urix = backendEndBasePath + "/admin/publish-artifact/deploy/analytics"; var defaultStatusClasses = "fw fw-stack-1x"; var content = $("#geo-analytics-response-template").find(".content"); var title = content.find("#title"); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js index 75ab86ebb8a..fe1cfde275c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js @@ -469,7 +469,7 @@ function statisticLoad(redirectUrl) { window.location.href = redirectUrl; }, error: function() { - var urix = backendEndBasePath + "/admin/devicetype/deploy/device_management"; + var urix = backendEndBasePath + "/admin/publish-artifact/deploy/device_management"; var device = {}; invokerUtil.post(urix, device, function (data) { title.html("Deploying statistic artifacts. Please wait...");