Merge pull request #792 from rasika/master

Changing artifact uploader admin service resource path

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 ")

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 {
 
     /**

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");

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...");