From 0539fc4e903fcc06d747eee46399be4e5c9fe9a2 Mon Sep 17 00:00:00 2001 From: Vishanth Date: Wed, 19 Apr 2017 13:05:58 +0530 Subject: [PATCH 1/3] settin equinox p2 type group to true --- .../org.wso2.carbon.device.mgt.adapter.feature/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml index 3cd5a35c29..873d791dc8 100644 --- a/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml +++ b/features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml @@ -155,7 +155,7 @@ org.wso2.carbon.p2.category.type:server - org.eclipse.equinox.p2.type.group:false + org.eclipse.equinox.p2.type.group:true From 6b340597b4580f31aee08597315517132e9176c8 Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 21 Jun 2017 10:56:12 +0530 Subject: [PATCH 2/3] Changing artifact uploader admin service resource path --- .../public/js/platform-configuration.js | 2 +- .../public/js/platform-configuration.js | 2 +- .../public/js/platform-configuration.js | 2 +- .../public/js/platform-configuration.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js index 9a1ed8202e..7c522fe6f3 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js @@ -99,7 +99,7 @@ var addConfiguration = function () { var artifactUpload = function () { var contentType = "application/json"; var backendEndBasePath = "/api/device-mgt/v1.0"; - var urix = backendEndBasePath + "/admin/devicetype/deploy/android_sense"; + var urix = backendEndBasePath + "/admin/publish-artifact/deploy/android_sense"; var defaultStatusClasses = "fw fw-stack-1x"; var content = $("#androidsense-statistic-response-template").find(".content"); var title = content.find("#title"); diff --git a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js index 5a32d87334..72424628bd 100644 --- a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js +++ b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js @@ -107,7 +107,7 @@ var addConfiguration = function () { var artifactUpload = function () { var contentType = "application/json"; var backendEndBasePath = "/api/device-mgt/v1.0"; - var urix = backendEndBasePath + "/admin/devicetype/deploy/arduino"; + var urix = backendEndBasePath + "/admin/publish-artifact/deploy/arduino"; var defaultStatusClasses = "fw fw-stack-1x"; var content = $("#arduino-statistic-response-template").find(".content"); var title = content.find("#title"); diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js index 88ab1888af..e15c8148ea 100644 --- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js +++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js @@ -117,7 +117,7 @@ var addConfiguration = function () { var artifactUpload = function () { var contentType = "application/json"; var backendEndBasePath = "/api/device-mgt/v1.0"; - var urix = backendEndBasePath + "/admin/devicetype/deploy/raspberrypi"; + var urix = backendEndBasePath + "/admin/publish-artifact/deploy/raspberrypi"; var defaultStatusClasses = "fw fw-stack-1x"; var content = $("#raspberrypi-statistic-response-template").find(".content"); var title = content.find("#title"); diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js index 9c69e78993..82bccf3447 100644 --- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js +++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js @@ -107,7 +107,7 @@ var addConfiguration = function () { var artifactUpload = function () { var contentType = "application/json"; var backendEndBasePath = "/api/device-mgt/v1.0"; - var urix = backendEndBasePath + "/admin/devicetype/deploy/virtual_firealarm"; + var urix = backendEndBasePath + "/admin/publish-artifact/deploy/virtual_firealarm"; var defaultStatusClasses = "fw fw-stack-1x"; var content = $("#virtual-firealarm-statistic-response-template").find(".content"); var title = content.find("#title"); From 04261dac138f26c018c804dbab7421800baf1d8a Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Wed, 21 Jun 2017 11:01:07 +0530 Subject: [PATCH 3/3] Updating cdmf version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1bf59f9f8..b483f90a43 100644 --- a/pom.xml +++ b/pom.xml @@ -1142,7 +1142,7 @@ 1.1.1 - 3.0.6 + 3.0.8 [3.0.0, 4.0.0)