community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #792 from rasika/master

Browse Source 
Changing artifact uploader admin service resource path
This commit is contained in:
Ruwan 2017-06-21 11:02:37 +05:30 committed by GitHub
commit ad07cbec45
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceAnalyticsArtifactUploaderAdminService.java
View File

@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
extensions = { extensions = {
@Extension(properties = { @Extension(properties = {
@ExtensionProperty(name = "name", value = "DeviceAnalyticsArtifactUploaderAdminService"), @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 = "") @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 " + @Api(value = "Devicetype deployment Administrative Service", description = "This an API intended to be used to " +
"deploy device type components" + "deploy device type components" +
"Further, this is strictly restricted to admin users only ") "Further, this is strictly restricted to admin users only ")

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceAnalyticsArtifactUploaderAdminServiceImpl.java
View File

@ -68,7 +68,7 @@ import java.security.cert.CertificateException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Path("/admin/devicetype") @Path("/admin/publish-artifact")
public class DeviceAnalyticsArtifactUploaderAdminServiceImpl implements DeviceAnalyticsArtifactUploaderAdminService { public class DeviceAnalyticsArtifactUploaderAdminServiceImpl implements DeviceAnalyticsArtifactUploaderAdminService {
/** /**

2
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
View File

@ -131,7 +131,7 @@ var showAdvanceOperation = function (operation, button) {
var artifactGeoUpload = function () { var artifactGeoUpload = function () {
var contentType = "application/json"; var contentType = "application/json";
var backendEndBasePath = "/api/device-mgt/v1.0"; 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 defaultStatusClasses = "fw fw-stack-1x";
var content = $("#geo-analytics-response-template").find(".content"); var content = $("#geo-analytics-response-template").find(".content");
var title = content.find("#title"); var title = content.find("#title");

2
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
View File

@ -469,7 +469,7 @@ function statisticLoad(redirectUrl) {
window.location.href = redirectUrl; window.location.href = redirectUrl;
}, },
error: function() { error: function() {
var urix = backendEndBasePath + "/admin/devicetype/deploy/device_management"; var urix = backendEndBasePath + "/admin/publish-artifact/deploy/device_management";
var device = {}; var device = {};
invokerUtil.post(urix, device, function (data) { invokerUtil.post(urix, device, function (data) {
title.html("Deploying statistic artifacts. Please wait..."); title.html("Deploying statistic artifacts. Please wait...");