From e90f8a851e140d8729caf9e9cb269b49ce3850c9 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Wed, 10 May 2017 13:51:04 +0530 Subject: [PATCH 001/103] fixed issues related to multi tenant analytics flow and operation flow for reference device types --- src/main/webapp/WEB-INF/web.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 6f59c5a7c..ff13bc494 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -20,6 +20,10 @@ doAuthentication true + + isSharedWithAllTenants + true + From b0dd9f559753e4f50584188b8a98f86d2349835c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 11 May 2017 13:04:42 +0530 Subject: [PATCH 002/103] [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 26350cc0b..c904a3f46 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.34-SNAPSHOT + 3.0.34 ../pom.xml From 1f935ce7ca7b76e8967111d0b3661da409335f90 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 11 May 2017 13:04:58 +0530 Subject: [PATCH 003/103] [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c904a3f46..d61ee7026 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.34 + 3.0.35-SNAPSHOT ../pom.xml From 77e56892f7ad62fcde9541be9583dbbcd9b3418f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 16 May 2017 14:24:33 +0530 Subject: [PATCH 004/103] [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d61ee7026..2a1efde43 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.35-SNAPSHOT + 3.0.35 ../pom.xml From aafa1bbd8115c45b66d6ca7bce37c02af9d744e0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 16 May 2017 14:24:47 +0530 Subject: [PATCH 005/103] [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a1efde43..1c4d56ec7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.35 + 3.0.36-SNAPSHOT ../pom.xml From 1bc83d306f621f66e5c711a4b81c898a16819691 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 17 May 2017 16:51:01 +0530 Subject: [PATCH 006/103] [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c4d56ec7..791507792 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.36-SNAPSHOT + 3.0.36 ../pom.xml From 0d4fe0ccdb180a8cb8b80137980d3668d8f38eec Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 17 May 2017 16:51:16 +0530 Subject: [PATCH 007/103] [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 791507792..6cbab4c7d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.36 + 3.0.37-SNAPSHOT ../pom.xml From 46de2139a7da55ddee2010f836ce8d9d1adee889 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 30 May 2017 11:07:36 +0530 Subject: [PATCH 008/103] [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cbab4c7d..a8d201634 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.37-SNAPSHOT + 3.0.37 ../pom.xml From f06183751d19e2a16f4a0838d42ed7d8b13ae376 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 30 May 2017 11:07:50 +0530 Subject: [PATCH 009/103] [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8d201634..b4254bedc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.37 + 3.0.38-SNAPSHOT ../pom.xml From 67c0464baf10ff31740e7564a15e404d8422de26 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 2 Jun 2017 21:21:27 +0530 Subject: [PATCH 010/103] [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare release v3.0.38 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4254bedc..62c600112 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.38-SNAPSHOT + 3.0.38 ../pom.xml From 7585e58cae187f1343454537bcd63d3ceba806c8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 2 Jun 2017 21:21:42 +0530 Subject: [PATCH 011/103] [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62c600112..aa5ff8a48 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.38 + 3.0.39-SNAPSHOT ../pom.xml From 0e0c3efaf14b55e9635db5f61ece22123ec60b46 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 6 Jun 2017 12:16:26 +0530 Subject: [PATCH 012/103] [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare release v3.0.39 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa5ff8a48..c48abb85b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.39-SNAPSHOT + 3.0.39 ../pom.xml From 18ac76eab992d346d30216c6d21254ebfa6181a8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 6 Jun 2017 12:16:40 +0530 Subject: [PATCH 013/103] [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c48abb85b..128fecf93 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.39 + 3.0.40-SNAPSHOT ../pom.xml From f0602148800457c87885aa3b8fc5b539eb7ac9ca Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 7 Jun 2017 22:49:26 +0530 Subject: [PATCH 014/103] [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare release v3.0.40 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 128fecf93..80a6e9a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.40-SNAPSHOT + 3.0.40 ../pom.xml From cee608cb4a16d46063652337bfa4d451e54970fd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 7 Jun 2017 22:49:40 +0530 Subject: [PATCH 015/103] [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80a6e9a7e..dc51e9aa8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.40 + 3.0.41-SNAPSHOT ../pom.xml From 3ec5daef92a6c640b5bfd460e21b94f2bba224ee Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Jun 2017 13:55:28 +0530 Subject: [PATCH 016/103] [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare release v3.0.41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc51e9aa8..b166e83d9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.41-SNAPSHOT + 3.0.41 ../pom.xml From fa874cec3f7872c5ca43080fe6abf323212f3759 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Jun 2017 13:55:42 +0530 Subject: [PATCH 017/103] [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b166e83d9..4b52041f9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.41 + 3.0.42-SNAPSHOT ../pom.xml From 77597e0930485942100bba4bfd01a3d6f9819917 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Jun 2017 16:20:03 +0530 Subject: [PATCH 018/103] [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare release v3.0.42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b52041f9..99a6cee6c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.42-SNAPSHOT + 3.0.42 ../pom.xml From 87cd3b9e9086b3ea0d66c271a79304f4946ea070 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Jun 2017 16:20:24 +0530 Subject: [PATCH 019/103] [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99a6cee6c..50ca81dd7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.42 + 3.0.43-SNAPSHOT ../pom.xml From 8f5e417e9f798bf803ebd7320d5dd0194563f576 Mon Sep 17 00:00:00 2001 From: GDLMadushanka Date: Thu, 15 Jun 2017 11:49:53 +0530 Subject: [PATCH 020/103] Virtual fire alarm streams changed --- .../service/impl/VirtualFireAlarmServiceImpl.java | 10 +++++----- .../impl/constants/VirtualFireAlarmConstants.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java index faec317e0..f04922d58 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java @@ -136,10 +136,10 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { @Produces("application/json") public Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from, @QueryParam("to") long to) { - String fromDate = String.valueOf(from); - String toDate = String.valueOf(to); - String query = "deviceId:" + deviceId + " AND deviceType:" + - VirtualFireAlarmConstants.DEVICE_TYPE + " AND time : [" + fromDate + " TO " + toDate + "]"; + String fromDate = String.valueOf(from*1000); // converting time to ms + String toDate = String.valueOf(to*1000); // converting time to ms + String query = "meta_deviceId:" + deviceId + " AND meta_deviceType:" + + VirtualFireAlarmConstants.DEVICE_TYPE + " AND meta_time : [" + fromDate + " TO " + toDate + "]"; String sensorTableName = VirtualFireAlarmConstants.TEMPERATURE_EVENT_TABLE; try { if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( @@ -148,7 +148,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); } List sortByFields = new ArrayList<>(); - SortByField sortByField = new SortByField("time", SortType.ASC); + SortByField sortByField = new SortByField("meta_time", SortType.ASC); sortByFields.add(sortByField); List sensorRecords = APIUtil.getAllEventsForDevice(sensorTableName, query, sortByFields); return Response.status(Response.Status.OK.getStatusCode()).entity(sensorRecords).build(); diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java index 31a140efe..6c3186104 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java @@ -30,7 +30,7 @@ public class VirtualFireAlarmConstants { public static final String POLICY_CONTEXT = "POLICY"; //sensor events sumerized table name for temperature - public static final String TEMPERATURE_EVENT_TABLE = "DEVICE_TEMPERATURE_SUMMARY"; + public static final String TEMPERATURE_EVENT_TABLE = "IOT_PER_DEVICE_STREAM_VIRTUALFIREALARM_TEMPERATURE"; public final static String DEVICE_TYPE_PROVIDER_DOMAIN = "carbon.super"; //mqtt tranport related constants From fabaae7f05499093a08679ccfa0e9907d9f1b5ac Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Jun 2017 15:32:32 +0530 Subject: [PATCH 021/103] [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare release v4.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50ca81dd7..e71a0f394 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.43-SNAPSHOT + 4.0.0 ../pom.xml From ecca5f9ecc156e7c0756342e4fd94346b180b2cf Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Jun 2017 15:32:45 +0530 Subject: [PATCH 022/103] [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e71a0f394..a33f78653 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.0 + 4.0.1-SNAPSHOT ../pom.xml From b48962f4cc82c167bdeb3370eaedfde3b2fb2571 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Jun 2017 16:37:06 +0530 Subject: [PATCH 023/103] [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare release v4.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a33f78653..2b2b3064d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.1-SNAPSHOT + 4.0.1 ../pom.xml From 0d9095dcbf6b66ddc21964bb4e0e3372c3afe3c0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Jun 2017 16:37:19 +0530 Subject: [PATCH 024/103] [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b2b3064d..7291afef7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.1 + 4.0.2-SNAPSHOT ../pom.xml From 10bfd054927cf0f0635d6538377054937958f8d5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 19 Jun 2017 16:39:28 +0530 Subject: [PATCH 025/103] [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare release v4.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7291afef7..63999ad4e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.2-SNAPSHOT + 4.0.2 ../pom.xml From af698f0d823bfd2f485e425d478f472e5c4684a4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 19 Jun 2017 16:39:43 +0530 Subject: [PATCH 026/103] [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63999ad4e..3b6016a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.2 + 4.0.3-SNAPSHOT ../pom.xml From e509b6daa7c7e888305a7755cf2abacf14835980 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 20 Jun 2017 15:49:25 +0530 Subject: [PATCH 027/103] [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare release v4.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b6016a9b..1e589da6c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.3-SNAPSHOT + 4.0.3 ../pom.xml From cd463456067921db5305c89ffdb3d196f6526498 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 20 Jun 2017 15:49:39 +0530 Subject: [PATCH 028/103] [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e589da6c..029a44cfa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.3 + 4.0.4-SNAPSHOT ../pom.xml From bb356811f882996cd3ff5e9e0d90ff4cfcde8f61 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 20 Jun 2017 18:18:59 +0530 Subject: [PATCH 029/103] [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare release v4.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 029a44cfa..82a9687f8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.4-SNAPSHOT + 4.0.4 ../pom.xml From 2aa2bed442ec3ed1e2f463aaa4096b5f72c49ae3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 20 Jun 2017 18:19:13 +0530 Subject: [PATCH 030/103] [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82a9687f8..ff8f2492c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.4 + 4.0.5-SNAPSHOT ../pom.xml From d2110a1bd90344a27b18888a78501b7290b79375 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 22 Jun 2017 21:03:24 +0530 Subject: [PATCH 031/103] [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare release v4.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff8f2492c..5b85b0728 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.5-SNAPSHOT + 4.0.5 ../pom.xml From db4be0de4f18d4087bdea66c160369c039b9c321 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 22 Jun 2017 21:03:37 +0530 Subject: [PATCH 032/103] [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b85b0728..3d676f0ff 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.5 + 4.0.6-SNAPSHOT ../pom.xml From c4d145a6965e88d67c42bdff3d89578bd991100d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 23 Jun 2017 08:14:07 +0530 Subject: [PATCH 033/103] [WSO2 Release] [Jenkins #2794] [Release 4.0.6] prepare release v4.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d676f0ff..611ff1369 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.6-SNAPSHOT + 4.0.6 ../pom.xml From 90d384d0d9779c63b02bfd0f9b47badc00c357eb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 23 Jun 2017 08:14:21 +0530 Subject: [PATCH 034/103] [WSO2 Release] [Jenkins #2794] [Release 4.0.6] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 611ff1369..c8d5d6a08 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.6 + 4.0.7-SNAPSHOT ../pom.xml From f7ced72d9f6bff2007cf76e48fe22f3630b2101d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 23 Jun 2017 17:54:43 +0530 Subject: [PATCH 035/103] [WSO2 Release] [Jenkins #2796] [Release 4.0.7] prepare release v4.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8d5d6a08..d3529e54e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.7-SNAPSHOT + 4.0.7 ../pom.xml From 730bb7af3d589eabe1c2d9dcf712c092473b593d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 23 Jun 2017 17:54:56 +0530 Subject: [PATCH 036/103] [WSO2 Release] [Jenkins #2796] [Release 4.0.7] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3529e54e..db332837c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.7 + 4.0.8-SNAPSHOT ../pom.xml From b42e067377328112544a32b4e51f716bd6a2cf1e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 23 Jun 2017 21:01:42 +0530 Subject: [PATCH 037/103] [maven-release-plugin]prepare release v4.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db332837c..74b25d97e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.8-SNAPSHOT + 4.0.8 ../pom.xml From fbf91211c0e4089edf5d2e7d2be337b571a56077 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 23 Jun 2017 21:01:55 +0530 Subject: [PATCH 038/103] [maven-release-plugin]prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 74b25d97e..78a1598d2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.8 + 4.0.9-SNAPSHOT ../pom.xml From e69ede507d139ef81ca01b6373f21609becae57f Mon Sep 17 00:00:00 2001 From: Nirothipan Date: Tue, 27 Jun 2017 13:04:58 +0530 Subject: [PATCH 039/103] adding POLICY_REVOKE constant --- .../service/impl/VirtualFireAlarmServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java index f04922d58..69cee6588 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java @@ -34,6 +34,7 @@ import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation; +import org.wso2.carbon.device.mgt.core.operation.mgt.ConfigOperation; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.constants.VirtualFireAlarmConstants; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.APIUtil; @@ -96,9 +97,8 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; - Operation commandOp = new CommandOperation(); + ConfigOperation commandOp = new ConfigOperation(); commandOp.setCode("buzz"); - commandOp.setType(Operation.Type.COMMAND); commandOp.setEnabled(true); commandOp.setPayLoad(actualMessage); From bb0904a39a666635f41423bb0af4c3932bd7295b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 27 Jun 2017 16:11:35 +0530 Subject: [PATCH 040/103] [WSO2 Release] [Jenkins #2805] [Release 4.0.9] prepare release v4.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78a1598d2..f76e95ef7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.9-SNAPSHOT + 4.0.9 ../pom.xml From 472966676db4132e54f7b7c3914e5bfbdc122221 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 27 Jun 2017 16:11:49 +0530 Subject: [PATCH 041/103] [WSO2 Release] [Jenkins #2805] [Release 4.0.9] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f76e95ef7..4aa7b4b59 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.9 + 4.0.10-SNAPSHOT ../pom.xml From 9410242156c38937ed729db5a3d0019205061cfc Mon Sep 17 00:00:00 2001 From: Nirothipan Date: Tue, 27 Jun 2017 17:21:48 +0530 Subject: [PATCH 042/103] adding VirtualFireAlarmConstants.CLIENT_JID_PROPERTY_KEY --- .../service/impl/VirtualFireAlarmServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java index 69cee6588..0e540978b 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java @@ -103,7 +103,6 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { commandOp.setPayLoad(actualMessage); Properties props = new Properties(); - props.setProperty(VirtualFireAlarmConstants.MQTT_ADAPTER_TOPIC_PROPERTY_NAME, publishTopic); props.setProperty(VirtualFireAlarmConstants.CLIENT_JID_PROPERTY_KEY, deviceId + "@" + XmppConfig .getInstance().getServerName()); props.setProperty(VirtualFireAlarmConstants.SUBJECT_PROPERTY_KEY, "CONTROL-REQUEST"); From 1252482a49328f76fdd831c70e6374fffe60cbdb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 27 Jun 2017 18:27:54 +0530 Subject: [PATCH 043/103] [WSO2 Release] [Jenkins #2807] [Release 4.0.10] prepare release v4.0.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4aa7b4b59..5ef11cb73 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.10-SNAPSHOT + 4.0.10 ../pom.xml From 1b1cd9b3bba407750a0f4886b33a01d5448fb77f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 27 Jun 2017 18:28:08 +0530 Subject: [PATCH 044/103] [WSO2 Release] [Jenkins #2807] [Release 4.0.10] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ef11cb73..9eb415973 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.10 + 4.0.11-SNAPSHOT ../pom.xml From dc2a4ed5a87f244b82413cb5e57a710de0676372 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Jun 2017 14:24:40 +0530 Subject: [PATCH 045/103] [WSO2 Release] [Jenkins #2810] [Release 4.0.11] prepare release v4.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9eb415973..3ed9713e7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.11-SNAPSHOT + 4.0.11 ../pom.xml From 0e1419050e0c722351e943aae39cd70eb2ca65b8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Jun 2017 14:24:55 +0530 Subject: [PATCH 046/103] [WSO2 Release] [Jenkins #2810] [Release 4.0.11] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ed9713e7..50e01c534 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.11 + 4.0.12-SNAPSHOT ../pom.xml From 03c32c976c9c4308657600a38cc53b1071663523 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Jun 2017 15:45:56 +0530 Subject: [PATCH 047/103] [WSO2 Release] [Jenkins #2812] [Release 4.0.12] prepare release v4.0.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50e01c534..3e3f9e326 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.12-SNAPSHOT + 4.0.12 ../pom.xml From 476bca01eb4f9db6fa8211e1039f4c92c612b2c2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Jun 2017 15:46:09 +0530 Subject: [PATCH 048/103] [WSO2 Release] [Jenkins #2812] [Release 4.0.12] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e3f9e326..76bf9f9ce 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.12 + 4.0.13-SNAPSHOT ../pom.xml From d3e4230a344b09f06f17f3b445041a229b689f21 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 29 Jun 2017 09:50:39 +0530 Subject: [PATCH 049/103] [WSO2 Release] [Jenkins #2814] [Release 4.0.13] prepare release v4.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76bf9f9ce..c9f51dd66 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.13-SNAPSHOT + 4.0.13 ../pom.xml From 2d72b7a11d36b615fa5e35a737dfd73cac4906e1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 29 Jun 2017 09:50:53 +0530 Subject: [PATCH 050/103] [WSO2 Release] [Jenkins #2814] [Release 4.0.13] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9f51dd66..537d07d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.13 + 4.0.14-SNAPSHOT ../pom.xml From 2fb77c1d319e86cbda3f0f3c036e028b96db2363 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 30 Jun 2017 14:35:26 +0530 Subject: [PATCH 051/103] [WSO2 Release] [Jenkins #2817] [Release 4.0.14] prepare release v4.0.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 537d07d4f..defd32bbc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.14-SNAPSHOT + 4.0.14 ../pom.xml From 48f8a2040b8e92a8fad4530d1ad2d772f3a8d362 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 30 Jun 2017 14:35:40 +0530 Subject: [PATCH 052/103] [WSO2 Release] [Jenkins #2817] [Release 4.0.14] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index defd32bbc..541d20d1f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.14 + 4.0.15-SNAPSHOT ../pom.xml From fe7e6011eb615cf529982da460038c62ab5b9248 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 30 Jun 2017 20:40:12 +0530 Subject: [PATCH 053/103] [WSO2 Release] [Jenkins #2819] [Release 4.0.15] prepare release v4.0.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 541d20d1f..946adbc1a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.15-SNAPSHOT + 4.0.15 ../pom.xml From 3462e4b67b8dd1f32ea26854ae0b09603311095d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 30 Jun 2017 20:40:26 +0530 Subject: [PATCH 054/103] [WSO2 Release] [Jenkins #2819] [Release 4.0.15] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 946adbc1a..90d0c2e38 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.15 + 4.0.16-SNAPSHOT ../pom.xml From e822ca407b98dae829a8e1adcbd411c2c3b32c3d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 1 Jul 2017 11:59:26 +0530 Subject: [PATCH 055/103] [WSO2 Release] [Jenkins #2821] [Release 4.0.16] prepare release v4.0.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90d0c2e38..6bb3f1f56 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.16-SNAPSHOT + 4.0.16 ../pom.xml From d5ef107a1cf4442bafeaecdcedca88c640247597 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 1 Jul 2017 11:59:40 +0530 Subject: [PATCH 056/103] [WSO2 Release] [Jenkins #2821] [Release 4.0.16] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bb3f1f56..ae7517cda 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.16 + 4.0.17-SNAPSHOT ../pom.xml From e1fffd962eafabd23357cef045843725e920968c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 4 Jul 2017 16:36:57 +0530 Subject: [PATCH 057/103] [WSO2 Release] [Jenkins #2827] [Release 4.0.17] prepare release v4.0.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae7517cda..25e1cd19a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.17-SNAPSHOT + 4.0.17 ../pom.xml From 272a3fb5feade3f5c7752152ba53e1478398c06f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 4 Jul 2017 16:37:12 +0530 Subject: [PATCH 058/103] [WSO2 Release] [Jenkins #2827] [Release 4.0.17] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25e1cd19a..92d9451c6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.17 + 4.0.18-SNAPSHOT ../pom.xml From 939ac7e060d13a0d5bbe531d2dcd0800a6bbb8d6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 5 Jul 2017 15:33:09 +0530 Subject: [PATCH 059/103] [WSO2 Release] [Jenkins #2830] [Release 4.0.18] prepare release v4.0.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92d9451c6..f264adcfd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.18-SNAPSHOT + 4.0.18 ../pom.xml From 9433c70c02401979a9a8f1d560a2e2f2a1696bba Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 5 Jul 2017 15:33:23 +0530 Subject: [PATCH 060/103] [WSO2 Release] [Jenkins #2830] [Release 4.0.18] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f264adcfd..c6907f641 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.18 + 4.0.19-SNAPSHOT ../pom.xml From 7924272bca4ff08da9fb29d7db2d1534fdb71c89 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 5 Jul 2017 23:48:12 +0530 Subject: [PATCH 061/103] [WSO2 Release] [Jenkins #2832] [Release 4.0.19] prepare release v4.0.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6907f641..158b08015 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.19-SNAPSHOT + 4.0.19 ../pom.xml From 166bbddd8be435c0f500cb3356cf01dd09f97d2a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 5 Jul 2017 23:48:26 +0530 Subject: [PATCH 062/103] [WSO2 Release] [Jenkins #2832] [Release 4.0.19] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 158b08015..114aaae95 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.19 + 4.0.20-SNAPSHOT ../pom.xml From 09e29380413c9b5dec7ba74259df030ee3ab962d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 6 Jul 2017 15:27:41 +0530 Subject: [PATCH 063/103] [WSO2 Release] [Jenkins #2835] [Release 4.0.20] prepare release v4.0.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 114aaae95..d54049e31 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.20-SNAPSHOT + 4.0.20 ../pom.xml From e4a7fedf9a8b227c054415ab7fbe8b51cc8de785 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 6 Jul 2017 15:27:54 +0530 Subject: [PATCH 064/103] [WSO2 Release] [Jenkins #2835] [Release 4.0.20] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d54049e31..ccd76e783 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.20 + 4.0.21-SNAPSHOT ../pom.xml From 45db5e56a38b5f35cb8be27ceb71df47a29c29e2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 6 Jul 2017 16:55:07 +0530 Subject: [PATCH 065/103] [WSO2 Release] [Jenkins #2836] [Release 4.0.21] prepare release v4.0.21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ccd76e783..cff899583 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.21-SNAPSHOT + 4.0.21 ../pom.xml From 5a85cef5df94bf3fbb0088949570bfd6f74fab03 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 6 Jul 2017 16:55:21 +0530 Subject: [PATCH 066/103] [WSO2 Release] [Jenkins #2836] [Release 4.0.21] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cff899583..ef98e093e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.21 + 4.0.22-SNAPSHOT ../pom.xml From c6b81ad09f7d5deeab7dd54f71ec2757bd225176 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 7 Jul 2017 00:11:59 +0530 Subject: [PATCH 067/103] [WSO2 Release] [Jenkins #2838] [Release 4.0.22] prepare release v4.0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef98e093e..5b627ac13 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.22-SNAPSHOT + 4.0.22 ../pom.xml From 0623fc22a737099fe9fe3bf18fe9ebeaeb427f1a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 7 Jul 2017 00:12:14 +0530 Subject: [PATCH 068/103] [WSO2 Release] [Jenkins #2838] [Release 4.0.22] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b627ac13..4ead8449e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.22 + 4.0.23-SNAPSHOT ../pom.xml From 3001056fc82798408ad2966829eec8fe7413c7c2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 7 Jul 2017 19:04:36 +0530 Subject: [PATCH 069/103] [WSO2 Release] [Jenkins #2840] [Release 4.0.23] prepare release v4.0.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ead8449e..b8d481c42 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.23-SNAPSHOT + 4.0.23 ../pom.xml From 0febd89faa38375075ac4b4600e8caf21a5e9ca9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 7 Jul 2017 19:04:50 +0530 Subject: [PATCH 070/103] [WSO2 Release] [Jenkins #2840] [Release 4.0.23] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8d481c42..9249d4e64 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.23 + 4.0.24-SNAPSHOT ../pom.xml From 299b3e2d5343295dd21541e721dead8b0150ce18 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 8 Jul 2017 05:45:47 +0530 Subject: [PATCH 071/103] [maven-release-plugin]prepare release v4.0.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9249d4e64..7cf0e6367 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.24-SNAPSHOT + 4.0.24 ../pom.xml From 10a29884a78f942e5ab52d2f10d501afa68bd1b2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 8 Jul 2017 05:46:01 +0530 Subject: [PATCH 072/103] [maven-release-plugin]prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7cf0e6367..5efd80e2f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.24 + 4.0.25-SNAPSHOT ../pom.xml From 6b0d78765a51a3bdf6f4970145f337685f4c8876 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 9 Jul 2017 09:19:11 +0530 Subject: [PATCH 073/103] [WSO2 Release] [Jenkins #2845] [Release 4.0.25] prepare release v4.0.25 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5efd80e2f..65499995c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.25-SNAPSHOT + 4.0.25 ../pom.xml From 974abfe8cd813ce55ec02039a6d1e7b73fab1764 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 9 Jul 2017 09:19:25 +0530 Subject: [PATCH 074/103] [WSO2 Release] [Jenkins #2845] [Release 4.0.25] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65499995c..678f3711a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.25 + 4.0.26-SNAPSHOT ../pom.xml From 4a7119941aec32dba77500ba8a34a2093b607ac5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 10 Jul 2017 18:00:32 +0530 Subject: [PATCH 075/103] [WSO2 Release] [Jenkins #2848] [Release 4.0.26] prepare release v4.0.26 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 678f3711a..457be1b59 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.26-SNAPSHOT + 4.0.26 ../pom.xml From 31747d7e3858bc1d2dac124f3702e5f1aaf5b28e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 10 Jul 2017 18:00:45 +0530 Subject: [PATCH 076/103] [WSO2 Release] [Jenkins #2848] [Release 4.0.26] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 457be1b59..44f330239 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.26 + 4.0.27-SNAPSHOT ../pom.xml From fde6ded56e0cfdd5b184fab09699b9df27baa6e9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 11 Jul 2017 14:42:36 +0530 Subject: [PATCH 077/103] [WSO2 Release] [Jenkins #2851] [Release 4.0.27] prepare release v4.0.27 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44f330239..6d2948530 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.27-SNAPSHOT + 4.0.27 ../pom.xml From 80682d19e8ec03db900e934defcbdfa2a5ab34c1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 11 Jul 2017 14:42:52 +0530 Subject: [PATCH 078/103] [WSO2 Release] [Jenkins #2851] [Release 4.0.27] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d2948530..693304f32 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.27 + 4.0.28-SNAPSHOT ../pom.xml From 7f135d5e6c01fd4e1e75ecc0b68763071ff41fcc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 11 Jul 2017 18:39:18 +0530 Subject: [PATCH 079/103] [WSO2 Release] [Jenkins #2853] [Release 4.0.28] prepare release v4.0.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 693304f32..6c79dc098 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.28-SNAPSHOT + 4.0.28 ../pom.xml From a7da29dd283715209dc55eca11ae09f0ad90a661 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 11 Jul 2017 18:39:32 +0530 Subject: [PATCH 080/103] [WSO2 Release] [Jenkins #2853] [Release 4.0.28] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c79dc098..651d600c2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.28 + 4.0.29-SNAPSHOT ../pom.xml From b4857be241a520cf5298ce225457d843a0681c21 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 13 Jul 2017 16:26:00 +0530 Subject: [PATCH 081/103] [WSO2 Release] [Jenkins #2857] [Release 4.0.29] prepare release v4.0.29 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 651d600c2..7e771d98c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.29-SNAPSHOT + 4.0.29 ../pom.xml From 65937b8327dc4aea68b26e1d1a5dc743abf37136 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 13 Jul 2017 16:26:14 +0530 Subject: [PATCH 082/103] [WSO2 Release] [Jenkins #2857] [Release 4.0.29] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e771d98c..f622b8608 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.29 + 4.0.30-SNAPSHOT ../pom.xml From b363f346a4d166bc2f3499b042156c66429b4c6c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 14 Jul 2017 13:10:02 +0530 Subject: [PATCH 083/103] [WSO2 Release] [Jenkins #2860] [Release 4.0.30] prepare release v4.0.30 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f622b8608..8b92be764 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.30-SNAPSHOT + 4.0.30 ../pom.xml From a561081984f1a3b8e43a19bc89b8a28ddb937ce9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 14 Jul 2017 13:10:16 +0530 Subject: [PATCH 084/103] [WSO2 Release] [Jenkins #2860] [Release 4.0.30] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b92be764..8500ba73b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.30 + 4.0.31-SNAPSHOT ../pom.xml From b5258850bed4b21216d6e18c9ca8176ff8251eb7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 15 Jul 2017 13:12:21 +0530 Subject: [PATCH 085/103] [WSO2 Release] [Jenkins #2862] [Release 4.0.31] prepare release v4.0.31 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8500ba73b..4e0952ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.31-SNAPSHOT + 4.0.31 ../pom.xml From abf005aae4468e71a888aaf85c5afd997b217198 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 15 Jul 2017 13:12:35 +0530 Subject: [PATCH 086/103] [WSO2 Release] [Jenkins #2862] [Release 4.0.31] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e0952ad8..793b3bdf6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.31 + 4.0.32-SNAPSHOT ../pom.xml From d7fd247ef91984b2953535f8ac17c7260819276c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 16 Jul 2017 11:36:25 +0530 Subject: [PATCH 087/103] [WSO2 Release] [Jenkins #2864] [Release 4.0.32] prepare release v4.0.32 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 793b3bdf6..e964e01ce 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.32-SNAPSHOT + 4.0.32 ../pom.xml From 57d323711b5d1c4e43311e31ca0887558dab909f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 16 Jul 2017 11:36:38 +0530 Subject: [PATCH 088/103] [WSO2 Release] [Jenkins #2864] [Release 4.0.32] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e964e01ce..6c5731ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.32 + 4.0.33-SNAPSHOT ../pom.xml From 3df1bdd8a19e747189e4475eec38950fd9d7b6cb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 16 Jul 2017 22:01:31 +0530 Subject: [PATCH 089/103] [WSO2 Release] [Jenkins #2866] [Release 4.0.33] prepare release v4.0.33 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c5731ca8..82b477389 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.33-SNAPSHOT + 4.0.33 ../pom.xml From 0b5defc12e4f4f9f70003f9de07dd5dfa8ba5301 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 16 Jul 2017 22:01:45 +0530 Subject: [PATCH 090/103] [WSO2 Release] [Jenkins #2866] [Release 4.0.33] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82b477389..76b3f735c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.33 + 4.0.34-SNAPSHOT ../pom.xml From 27c8736a81333ff753508bc055aa5afa6b2bd55a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 17 Jul 2017 00:02:15 +0530 Subject: [PATCH 091/103] [WSO2 Release] [Jenkins #2868] [Release 4.0.34] prepare release v4.0.34 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76b3f735c..5ab3a85f4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.34-SNAPSHOT + 4.0.34 ../pom.xml From a1a76bcd535d10b937a2b75373c8ac841669e0ac Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 17 Jul 2017 00:02:28 +0530 Subject: [PATCH 092/103] [WSO2 Release] [Jenkins #2868] [Release 4.0.34] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ab3a85f4..1a8d0818a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.34 + 4.0.35-SNAPSHOT ../pom.xml From f6ede45046c206c595e29a9c47422e6d8144f8bb Mon Sep 17 00:00:00 2001 From: geethkokila Date: Mon, 17 Jul 2017 15:59:18 +0530 Subject: [PATCH 093/103] Fixing the download agent issue for virtual fire alarm --- .../impl/VirtualFireAlarmServiceImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java index 0e540978b..367cd248b 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java @@ -233,15 +233,27 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { throw new DeviceManagementException(msg); } if (apiApplicationKey == null) { + String adminUsername = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm() + .getRealmConfiguration().getAdminUserName(); + String tenantAdminDomainName = PrivilegedCarbonContext.getThreadLocalCarbonContext() + .getTenantDomain(); String applicationUsername = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm().getRealmConfiguration() .getAdminUserName() + "@" + PrivilegedCarbonContext.getThreadLocalCarbonContext() .getTenantDomain(); APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService(); String[] tags = {VirtualFireAlarmConstants.DEVICE_TYPE}; - apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys( - VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true, - VirtualFireAlarmConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD); + try { + PrivilegedCarbonContext.startTenantFlow(); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantAdminDomainName); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(adminUsername); + + apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys( + VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true, + VirtualFireAlarmConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD); + } finally { + PrivilegedCarbonContext.endTenantFlow(); + } } JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient(); String scopes = " device_" + deviceId; From 1066f3d13dcb00919fba8f1f901b3468b81c51fe Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 19 Jul 2017 14:02:04 +0000 Subject: [PATCH 094/103] [WSO2 Release] [Jenkins #2875] [Release 4.0.35] prepare release v4.0.35 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a8d0818a..c7401b8db 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.35-SNAPSHOT + 4.0.35 ../pom.xml From 0a574c969ee78c85c1825674e107e60b2ddd9ca1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 19 Jul 2017 14:02:17 +0000 Subject: [PATCH 095/103] [WSO2 Release] [Jenkins #2875] [Release 4.0.35] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7401b8db..620a50b46 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.35 + 4.0.36-SNAPSHOT ../pom.xml From c4fe27a7b16870c080426f097e882c143275df01 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 20 Jul 2017 18:54:51 +0530 Subject: [PATCH 096/103] [WSO2 Release] [Jenkins #2879] [Release 4.0.36] prepare release v4.0.36 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 620a50b46..01e8398da 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.36-SNAPSHOT + 4.0.36 ../pom.xml From b8afbdb4bd65d10763e5c606acfee510b08190ba Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 20 Jul 2017 18:55:02 +0530 Subject: [PATCH 097/103] [WSO2 Release] [Jenkins #2879] [Release 4.0.36] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01e8398da..4f94d4b99 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.36 + 4.0.37-SNAPSHOT ../pom.xml From ed4cdd4fe03a3b2ac5d764ed506b799715e87b74 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 20 Jul 2017 20:42:11 +0530 Subject: [PATCH 098/103] [WSO2 Release] [Jenkins #2880] [Release 4.0.37] prepare release v4.0.37 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f94d4b99..7e28a3947 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.37-SNAPSHOT + 4.0.37 ../pom.xml From 34d7c818b8abe439ba194d39b030ea83754b439e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 20 Jul 2017 20:42:25 +0530 Subject: [PATCH 099/103] [WSO2 Release] [Jenkins #2880] [Release 4.0.37] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e28a3947..6af685aec 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.37 + 4.0.38-SNAPSHOT ../pom.xml From 9985c403efb28d01b2201dc2a6a7916e3fb78fd9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 21 Jul 2017 14:27:57 +0530 Subject: [PATCH 100/103] [WSO2 Release] [Jenkins #2883] [Release 4.0.38] prepare release v4.0.38 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6af685aec..33cd6f3e4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.38-SNAPSHOT + 4.0.38 ../pom.xml From 2cac948397de381b12a242c1308d0b52eced5799 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 21 Jul 2017 14:28:06 +0530 Subject: [PATCH 101/103] [WSO2 Release] [Jenkins #2883] [Release 4.0.38] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33cd6f3e4..57bd625ad 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.38 + 4.0.39-SNAPSHOT ../pom.xml From a69dfff3ac6919b60a05d6d2e1a7ed71d79b9691 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 23 Jul 2017 21:18:37 +0530 Subject: [PATCH 102/103] [WSO2 Release] [Jenkins #2887] [Release 4.0.39] prepare release v4.0.39 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57bd625ad..328f0ae62 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.39-SNAPSHOT + 4.0.39 ../pom.xml From 57564f7e6caf5c629365acde492a84d2a82f4bec Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 23 Jul 2017 21:18:50 +0530 Subject: [PATCH 103/103] [WSO2 Release] [Jenkins #2887] [Release 4.0.39] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 328f0ae62..816b026ab 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.39 + 4.0.40-SNAPSHOT ../pom.xml