From 4d0c0d2af994718024ba81fd05b3fd747724598e Mon Sep 17 00:00:00 2001 From: Ace Date: Fri, 4 Nov 2016 19:16:44 +0530 Subject: [PATCH 001/432] restructuring iot-plugins removing mobile/iot base plugins and other restructuring --- pom.xml | 263 ++++++++++++ .../service/impl/VirtualFireAlarmService.java | 73 ++++ .../impl/VirtualFireAlarmServiceImpl.java | 347 ++++++++++++++++ .../service/impl/dto/SensorRecord.java | 68 +++ .../exception/VirtualFireAlarmException.java | 35 ++ .../service/impl/util/APIUtil.java | 198 +++++++++ .../util/VirtualFireAlarmServiceUtils.java | 51 +++ .../util/VirtualFireAlarmUtilConstants.java | 26 ++ .../service/impl/util/ZipArchive.java | 43 ++ .../service/impl/util/ZipUtil.java | 387 ++++++++++++++++++ .../service/impl/util/util/Utils.java | 61 +++ src/main/webapp/META-INF/permissions.xml | 52 +++ .../webapp/META-INF/webapp-classloading.xml | 33 ++ src/main/webapp/WEB-INF/cxf-servlet.xml | 38 ++ src/main/webapp/WEB-INF/web.xml | 42 ++ 15 files changed, 1717 insertions(+) create mode 100644 pom.xml create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java create mode 100644 src/main/webapp/META-INF/permissions.xml create mode 100644 src/main/webapp/META-INF/webapp-classloading.xml create mode 100644 src/main/webapp/WEB-INF/cxf-servlet.xml create mode 100644 src/main/webapp/WEB-INF/web.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..83eefe902 --- /dev/null +++ b/pom.xml @@ -0,0 +1,263 @@ + + + + + + virtual-fire-alarm-plugin + org.wso2.carbon.devicemgt-plugins + 2.2.5-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.mgt.iot.virtualfirealarm.api + war + WSO2 Carbon - IoT Server VirtualFireAlarm API + WSO2 Carbon - Virtual FireAlarm Service Management API Implementation + http://wso2.org + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.core + provided + + + org.apache.axis2.wso2 + axis2-client + + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.analytics.data.publisher + provided + + + org.apache.axis2.wso2 + axis2-client + + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.certificate.mgt.core + provided + + + commons-codec + commons-codec + + + + + + + + org.apache.cxf + cxf-rt-frontend-jaxws + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + provided + + + org.apache.cxf + cxf-rt-transports-http + provided + + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + provided + + + + + org.apache.httpcomponents + httpasyncclient + 4.1 + provided + + + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + javax + javaee-web-api + provided + + + javax.ws.rs + jsr311-api + provided + + + commons-httpclient.wso2 + commons-httpclient + provided + + + + org.wso2.carbon + org.wso2.carbon.utils + provided + + + org.bouncycastle.wso2 + bcprov-jdk15on + + + org.wso2.carbon + org.wso2.carbon.user.api + + + org.wso2.carbon + org.wso2.carbon.queuing + + + org.wso2.carbon + org.wso2.carbon.base + + + org.apache.axis2.wso2 + axis2 + + + org.igniterealtime.smack.wso2 + smack + + + org.igniterealtime.smack.wso2 + smackx + + + jaxen + jaxen + + + commons-fileupload.wso2 + commons-fileupload + + + org.apache.ant.wso2 + ant + + + org.apache.ant.wso2 + ant + + + commons-httpclient.wso2 + commons-httpclient + + + org.eclipse.equinox + javax.servlet + + + org.wso2.carbon + org.wso2.carbon.registry.api + + + + + commons-codec + commons-codec + + + org.wso2.carbon.devicemgt + org.wso2.carbon.apimgt.annotations + provided + + + org.igniterealtime.smack.wso2 + smack + provided + + + org.igniterealtime.smack.wso2 + smackx + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.identity.jwt.client.extension + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.apimgt.application.extension + provided + + + org.wso2.carbon.analytics + org.wso2.carbon.analytics.api + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.extensions + provided + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin + provided + + + + + + maven-compiler-plugin + + UTF-8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + + + maven-war-plugin + + virtual_firealarm + + + + + + diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java new file mode 100644 index 000000000..9d89050fb --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; + +import org.wso2.carbon.apimgt.annotations.api.API; +import org.wso2.carbon.apimgt.annotations.api.Scope; +import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType; +import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature; + +import javax.ws.rs.*; +import javax.ws.rs.core.Response; + +/** + * This class consists the functions/APIs specific to the "actions" of the VirtualFirealarm device-type. These APIs + * include the ones that are used by the [Device] to contact the server (i.e: Enrollment & Publishing Data) and the + * ones used by the [Server/Owner] to contact the [Device] (i.e: sending control signals). This class also initializes + * the transport 'Connectors' [XMPP & MQTT] specific to the VirtualFirealarm device-type in order to communicate with + * such devices and to receive messages form it. + */ +@API(name = "virtual_firealarm", version = "1.0.0", context = "/virtual_firealarm", tags = {"virtual_firealarm"}) +@DeviceType(value = "virtual_firealarm") +public interface VirtualFireAlarmService { + + /** + * This is an API called/used from within the Server(Front-End) or by a device Owner. It sends a control command to + * the VirtualFirealarm device to switch `ON` or `OFF` its buzzer. The method also takes in the protocol to be used + * to connect-to and send the command to the device. + * + * @param deviceId the ID of the VirtualFirealarm device on which the buzzer needs to switched `ON` or `OFF`. + * @param state the state to which the buzzer on the device needs to be changed. Either "ON" or "OFF". + * (Case-Insensitive String) + */ + @POST + @Path("device/{deviceId}/buzz") + @Scope(key = "device:firealarm:enroll", name = "", description = "") + @Feature(code = "buzz", name = "Buzzer On / Off", description = "Switch on/off Virtual Fire Alarm Buzzer. (On / Off)") + Response switchBuzzer(@PathParam("deviceId") String deviceId, + @FormParam("state") String state); + + /** + * Retrieve Sensor data for the device type + */ + @Path("device/stats/{deviceId}") + @GET + @Scope(key = "device:firealarm:enroll", name = "", description = "") + @Consumes("application/json") + @Produces("application/json") + Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from, + @QueryParam("to") long to); + + @Path("device/download") + @GET + @Produces("application/zip") + @Scope(key = "device:firealarm:enroll", name = "", description = "") + Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketchType") String sketchType); + +} 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 new file mode 100644 index 000000000..ce54d9537 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java @@ -0,0 +1,347 @@ +/* +* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +* +* WSO2 Inc. licenses this file to you under the Apache License, +* Version 2.0 (the "License"); you may not use this file except +* in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.analytics.dataservice.commons.SortByField; +import org.wso2.carbon.analytics.dataservice.commons.SortType; +import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException; +import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; +import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey; +import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.common.*; +import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException; +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.iot.virtualfirealarm.plugin.constants.VirtualFireAlarmConstants; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.exception.VirtualFirealarmDeviceMgtPluginException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.VirtualFirealarmSecurityManager; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppAccount; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppServerClient; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception.VirtualFireAlarmException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.APIUtil; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.VirtualFireAlarmServiceUtils; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipUtil; +import org.wso2.carbon.identity.jwt.client.extension.JWTClient; +import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; +import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import org.wso2.carbon.user.api.UserStoreException; + +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Response; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; + +public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { + + private static final String XMPP_PROTOCOL = "XMPP"; + private static final String MQTT_PROTOCOL = "MQTT"; + private static final String KEY_TYPE = "PRODUCTION"; + private static ApiApplicationKey apiApplicationKey; + private static final String DEVICE_MGT_SCOPE_IDENTIFIER = "device-mgt"; + private static Log log = LogFactory.getLog(VirtualFireAlarmServiceImpl.class); + + @POST + @Path("device/{deviceId}/buzz") + public Response switchBuzzer(@PathParam("deviceId") String deviceId, @FormParam("state") String state) { + if (state == null || state.isEmpty()) { + log.error("State is not defined for the buzzer operation"); + return Response.status(Response.Status.BAD_REQUEST).build(); + } + String switchToState = state.toUpperCase(); + if (!switchToState.equals(VirtualFireAlarmConstants.STATE_ON) && !switchToState.equals( + VirtualFireAlarmConstants.STATE_OFF)) { + log.error("The requested state change shoud be either - 'ON' or 'OFF'"); + return Response.status(Response.Status.BAD_REQUEST).build(); + } + try { + if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( + new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), + DeviceGroupConstants.Permissions.DEFAULT_OPERATOR_PERMISSIONS)) { + return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); + } + String resource = VirtualFireAlarmConstants.BULB_CONTEXT.replace("/", ""); + PrivateKey serverPrivateKey = VirtualFirealarmSecurityManager.getServerPrivateKey(); + String actualMessage = resource + ":" + switchToState; + String encryptedMsg = VirtualFireAlarmServiceUtils.prepareSecurePayLoad(actualMessage, + serverPrivateKey); + String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; + + Operation commandOp = new CommandOperation(); + commandOp.setCode("buzz"); + commandOp.setType(Operation.Type.COMMAND); + commandOp.setEnabled(true); + commandOp.setPayLoad(encryptedMsg); + + 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"); + props.setProperty(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, + VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); + commandOp.setProperties(props); + + List deviceIdentifiers = new ArrayList<>(); + deviceIdentifiers.add(new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE)); + APIUtil.getDeviceManagementService().addOperation(VirtualFireAlarmConstants.DEVICE_TYPE, commandOp, + deviceIdentifiers); + return Response.ok().build(); + } catch (InvalidDeviceException e) { + String msg = "Error occurred while executing command operation to send keywords"; + log.error(msg, e); + return Response.status(Response.Status.BAD_REQUEST).build(); + } catch (DeviceAccessAuthorizationException e) { + log.error(e.getErrorMessage(), e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } catch (VirtualFireAlarmException e) { + String errorMsg = "Preparing Secure payload failed for device - [" + deviceId + "]"; + log.error(errorMsg); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } catch (OperationManagementException e) { + String msg = "Error occurred while executing command operation upon ringing the buzzer"; + log.error(msg, e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } + } + + @PUT + @Path("device/{deviceId}/policy") + public Response updatePolicy(@PathParam("deviceId") String deviceId, @QueryParam("protocol") String protocol, + @FormParam("policy") String policy) { + String protocolString = protocol.toUpperCase(); + if (log.isDebugEnabled()) { + log.debug("Sending request to update-policy of device [" + deviceId + "] via " + protocolString); + } + try { + if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( + new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), + DeviceGroupConstants.Permissions.DEFAULT_MANAGE_POLICIES_PERMISSIONS)) { + return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); + } + PrivateKey serverPrivateKey = VirtualFirealarmSecurityManager.getServerPrivateKey(); + String actualMessage = VirtualFireAlarmConstants.POLICY_CONTEXT + ":" + policy; + String encryptedMsg = VirtualFireAlarmServiceUtils.prepareSecurePayLoad(actualMessage, + serverPrivateKey); + Map dynamicProperties = new HashMap<>(); + switch (protocolString) { + case XMPP_PROTOCOL: + dynamicProperties.put(VirtualFireAlarmConstants.JID_PROPERTY_KEY, + deviceId + "@" + XmppConfig.getInstance().getServerName()); + dynamicProperties.put(VirtualFireAlarmConstants.SUBJECT_PROPERTY_KEY, "POLICTY-REQUEST"); + dynamicProperties.put(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, + VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); + APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.XMPP_ADAPTER_NAME, + dynamicProperties, encryptedMsg); + break; + default: + + String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; + dynamicProperties.put(VirtualFireAlarmConstants.ADAPTER_TOPIC_PROPERTY, publishTopic); + APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.MQTT_ADAPTER_NAME, + dynamicProperties, encryptedMsg); + break; + } + return Response.ok().build(); + } catch (DeviceAccessAuthorizationException e) { + log.error(e.getErrorMessage(), e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } catch (VirtualFireAlarmException e) { + log.error(e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } + } + + + @Path("device/stats/{deviceId}") + @GET + @Consumes("application/json") + @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 sensorTableName = VirtualFireAlarmConstants.TEMPERATURE_EVENT_TABLE; + try { + if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( + new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), + DeviceGroupConstants.Permissions.DEFAULT_STATS_MONITOR_PERMISSIONS)) { + return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); + } + List sortByFields = new ArrayList<>(); + SortByField sortByField = new SortByField("time", SortType.ASC); + sortByFields.add(sortByField); + List sensorRecords = APIUtil.getAllEventsForDevice(sensorTableName, query, sortByFields); + return Response.status(Response.Status.OK.getStatusCode()).entity(sensorRecords).build(); + } catch (AnalyticsException e) { + String errorMsg = "Error on retrieving stats on table " + sensorTableName + " with query " + query; + log.error(errorMsg); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).entity(errorMsg).build(); + } catch (DeviceAccessAuthorizationException e) { + log.error(e.getErrorMessage(), e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } + } + + @Path("device/download") + @GET + @Produces("application/zip") + public Response downloadSketch(@QueryParam("deviceName") String deviceName, + @QueryParam("sketchType") String sketchType) { + try { + ZipArchive zipFile = createDownloadFile(APIUtil.getAuthenticatedUser(), deviceName, sketchType); + Response.ResponseBuilder response = Response.ok(FileUtils.readFileToByteArray(zipFile.getZipFile())); + response.status(Response.Status.OK); + response.type("application/zip"); + response.header("Content-Disposition", "attachment; filename=\"" + zipFile.getFileName() + "\""); + Response resp = response.build(); + zipFile.getZipFile().delete(); + return resp; + } catch (IllegalArgumentException ex) { + return Response.status(400).entity(ex.getMessage()).build();//bad request + } catch (DeviceManagementException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (JWTClientException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (APIManagerException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (IOException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (UserStoreException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (VirtualFirealarmDeviceMgtPluginException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } + } + + private boolean register(String deviceId, String name) { + try { + DeviceIdentifier deviceIdentifier = new DeviceIdentifier(); + deviceIdentifier.setId(deviceId); + deviceIdentifier.setType(VirtualFireAlarmConstants.DEVICE_TYPE); + if (APIUtil.getDeviceManagementService().isEnrolled(deviceIdentifier)) { + return false; + } + Device device = new Device(); + device.setDeviceIdentifier(deviceId); + EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); + enrolmentInfo.setDateOfEnrolment(new Date().getTime()); + enrolmentInfo.setDateOfLastUpdate(new Date().getTime()); + enrolmentInfo.setStatus(EnrolmentInfo.Status.ACTIVE); + enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD); + device.setName(name); + device.setType(VirtualFireAlarmConstants.DEVICE_TYPE); + enrolmentInfo.setOwner(APIUtil.getAuthenticatedUser()); + device.setEnrolmentInfo(enrolmentInfo); + return APIUtil.getDeviceManagementService().enrollDevice(device); + } catch (DeviceManagementException e) { + log.error(e.getMessage(), e); + return false; + } + } + + private ZipArchive createDownloadFile(String owner, String deviceName, String sketchType) + throws DeviceManagementException, APIManagerException, JWTClientException, + UserStoreException, VirtualFirealarmDeviceMgtPluginException { + //create new device id + String deviceId = shortUUID(); + boolean status = register(deviceId, deviceName); + if (!status) { + String msg = "Error occurred while registering the device with " + "id: " + deviceId + " owner:" + owner; + throw new DeviceManagementException(msg); + } + if (apiApplicationKey == null) { + String applicationUsername = + PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm().getRealmConfiguration() + .getAdminUserName(); + APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService(); + String[] tags = {VirtualFireAlarmConstants.DEVICE_TYPE}; + apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys( + VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true); + } + JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient(); + String device = "{ \"scope\":\"mqtt-publisher mqtt-subscriber\", \"deviceIdentifiers\":[{\"id\":\""+deviceId+"\", " + + "\"type\":\""+VirtualFireAlarmConstants.DEVICE_TYPE+"\"}]}"; + Map params = new HashMap(); + params.put("device", Base64.encodeBase64String(device.getBytes())); + AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(), + apiApplicationKey.getConsumerSecret(), owner, + null, params); + String accessToken = accessTokenInfo.getAccessToken(); + String refreshToken = accessTokenInfo.getRefreshToken(); + XmppAccount newXmppAccount = new XmppAccount(); + newXmppAccount.setAccountName(deviceId); + newXmppAccount.setUsername(deviceId); + newXmppAccount.setPassword(accessToken); + newXmppAccount.setEmail(deviceId + "@" + APIUtil.getTenantDomainOftheUser()); + + status = XmppServerClient.createAccount(newXmppAccount); + if (!status) { + String msg = "XMPP Account was not created for device - " + deviceId + " of owner - " + owner + + ".XMPP might have been disabled in org.wso2.carbon.device.mgt.iot" + + ".common.config.server.configs"; + throw new DeviceManagementException(msg); + } + ZipUtil ziputil = new ZipUtil(); + return ziputil.createZipFile(owner, sketchType, deviceId, deviceName, apiApplicationKey.toString(), + accessToken, refreshToken); + } + + private static String shortUUID() { + UUID uuid = UUID.randomUUID(); + long l = ByteBuffer.wrap(uuid.toString().getBytes(StandardCharsets.UTF_8)).getLong(); + return Long.toString(l, Character.MAX_RADIX); + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java new file mode 100644 index 000000000..e1f46d2d7 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java @@ -0,0 +1,68 @@ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto; + +import org.codehaus.jackson.annotate.JsonIgnoreProperties; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@XmlRootElement +/** + * This stores sensor event data for android sense. + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public class SensorRecord { + + @XmlElementWrapper(required = true, name = "values") + private Map values; + + /** The id. */ + @XmlElement(required = false, name = "id") + private String id; + + /** + * Gets the values. + * @return the values + */ + public Map getValues() { + return values; + } + + /** + * Sets the values. + * @param values the values + */ + public void setValues(Map values) { + this.values = values; + } + + /** + * Sets the id. + * @param id the new id + */ + public void setId(String id) { + this.id = id; + } + + /** + * Gets the id. + * @return the id + */ + public String getId() { + return id; + } + + @Override + public String toString(){ + List valueList = new ArrayList(); + for (Map.Entry entry : values.entrySet()) { + valueList.add(entry.getKey() + ":" + entry.getValue()); + } + return valueList.toString(); + + } + +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java new file mode 100644 index 000000000..4305ec7c0 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception; + +public class VirtualFireAlarmException extends Exception { + private static final long serialVersionUID = 118512086957330189L; + + public VirtualFireAlarmException(String errorMessage) { + super(errorMessage); + } + + public VirtualFireAlarmException(String errorMessage, Throwable throwable) { + super(errorMessage, throwable); + } + + public VirtualFireAlarmException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java new file mode 100644 index 000000000..0509eb80b --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java @@ -0,0 +1,198 @@ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.analytics.api.AnalyticsDataAPI; +import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse; +import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDrillDownRequest; +import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry; +import org.wso2.carbon.analytics.dataservice.commons.SortByField; +import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils; +import org.wso2.carbon.analytics.datasource.commons.Record; +import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException; +import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; +import org.wso2.carbon.context.CarbonContext; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService; +import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService; +import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; +import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; +import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * This class provides utility functions used by REST-API. + */ +public class APIUtil { + + private static Log log = LogFactory.getLog(APIUtil.class); + + public static String getAuthenticatedUser() { + PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + String username = threadLocalCarbonContext.getUsername(); + String tenantDomain = threadLocalCarbonContext.getTenantDomain(); + if (username.endsWith(tenantDomain)) { + return username.substring(0, username.lastIndexOf("@")); + } + return username; + } + + public static DeviceManagementProviderService getDeviceManagementService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + DeviceManagementProviderService deviceManagementProviderService = + (DeviceManagementProviderService) ctx.getOSGiService(DeviceManagementProviderService.class, null); + if (deviceManagementProviderService == null) { + String msg = "Device Management service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return deviceManagementProviderService; + } + + public static AnalyticsDataAPI getAnalyticsDataAPI() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + AnalyticsDataAPI analyticsDataAPI = + (AnalyticsDataAPI) ctx.getOSGiService(AnalyticsDataAPI.class, null); + if (analyticsDataAPI == null) { + String msg = "Analytics api service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return analyticsDataAPI; + } + + public static List getAllEventsForDevice(String tableName, String query, + List sortByFields) throws AnalyticsException { + int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + AnalyticsDataAPI analyticsDataAPI = getAnalyticsDataAPI(); + int eventCount = analyticsDataAPI.searchCount(tenantId, tableName, query); + if (eventCount == 0) { + return null; + } + List resultEntries = analyticsDataAPI.search(tenantId, tableName, query, 0, eventCount, + sortByFields); + List recordIds = getRecordIds(resultEntries); + AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds); + Map sensorDatas = createSensorData(AnalyticsDataServiceUtils.listRecords( + analyticsDataAPI, response)); + List sortedSensorData = getSortedSensorData(sensorDatas, resultEntries); + return sortedSensorData; + } + + private static List getRecordIds(List searchResults) { + List ids = new ArrayList<>(); + for (SearchResultEntry searchResult : searchResults) { + ids.add(searchResult.getId()); + } + return ids; + } + + public static List getSortedSensorData(Map sensorDatas, + List searchResults) { + List sortedRecords = new ArrayList<>(); + for (SearchResultEntry searchResultEntry : searchResults) { + sortedRecords.add(sensorDatas.get(searchResultEntry.getId())); + } + return sortedRecords; + } + + /** + * Creates the SensorDatas from records. + * + * @param records the records + * @return the Map of SensorRecord + */ + public static Map createSensorData(List records) { + Map sensorDatas = new HashMap<>(); + for (Record record : records) { + SensorRecord sensorData = createSensorData(record); + sensorDatas.put(sensorData.getId(), sensorData); + } + return sensorDatas; + } + + /** + * Create a SensorRecord object out of a Record object + * + * @param record the record object + * @return SensorRecord object + */ + public static SensorRecord createSensorData(Record record) { + SensorRecord recordBean = new SensorRecord(); + recordBean.setId(record.getId()); + recordBean.setValues(record.getValues()); + return recordBean; + } + + public static APIManagementProviderService getAPIManagementProviderService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + APIManagementProviderService apiManagementProviderService = + (APIManagementProviderService) ctx.getOSGiService(APIManagementProviderService.class, null); + if (apiManagementProviderService == null) { + String msg = "API management provider service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return apiManagementProviderService; + } + + public static JWTClientManagerService getJWTClientManagerService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + JWTClientManagerService jwtClientManagerService = + (JWTClientManagerService) ctx.getOSGiService(JWTClientManagerService.class, null); + if (jwtClientManagerService == null) { + String msg = "JWT Client manager service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return jwtClientManagerService; + } + + public static String getTenantDomainOftheUser() { + PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + return threadLocalCarbonContext.getTenantDomain(); + } + + public static DeviceAccessAuthorizationService getDeviceAccessAuthorizationService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + DeviceAccessAuthorizationService deviceAccessAuthorizationService = + (DeviceAccessAuthorizationService) ctx.getOSGiService(DeviceAccessAuthorizationService.class, null); + if (deviceAccessAuthorizationService == null) { + String msg = "Device Authorization service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return deviceAccessAuthorizationService; + } + + public static OutputEventAdapterService getOutputEventAdapterService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + OutputEventAdapterService outputEventAdapterService = + (OutputEventAdapterService) ctx.getOSGiService(OutputEventAdapterService.class, null); + if (outputEventAdapterService == null) { + String msg = "Device Authorization service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return outputEventAdapterService; + } + + public static PlatformConfigurationManagementService getTenantConfigurationManagementService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + PlatformConfigurationManagementService tenantConfigurationManagementService = + (PlatformConfigurationManagementService) ctx.getOSGiService(PlatformConfigurationManagementService.class, null); + if (tenantConfigurationManagementService == null) { + String msg = "Tenant configuration Management service not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return tenantConfigurationManagementService; + } + +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java new file mode 100644 index 000000000..277000e0f --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.apache.commons.codec.binary.Base64; +import org.json.JSONObject; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.exception.VirtualFirealarmDeviceMgtPluginException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.VirtualFirealarmSecurityManager; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception.VirtualFireAlarmException; + +import java.lang.*; +import java.security.PrivateKey; + +/** + * + */ +public class VirtualFireAlarmServiceUtils { + + private static final String JSON_MESSAGE_KEY = "Msg"; + private static final String JSON_SIGNATURE_KEY = "Sig"; + + public static String prepareSecurePayLoad(String message, PrivateKey signatureKey) throws VirtualFireAlarmException { + try { + message = Base64.encodeBase64String(message.getBytes()); + String signedPayload = VirtualFirealarmSecurityManager.signMessage(message, signatureKey); + JSONObject jsonPayload = new JSONObject(); + jsonPayload.put(JSON_MESSAGE_KEY, message); + jsonPayload.put(JSON_SIGNATURE_KEY, signedPayload); + return jsonPayload.toString(); + } catch (VirtualFirealarmDeviceMgtPluginException e) { + throw new VirtualFireAlarmException(e); + } + + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java new file mode 100644 index 000000000..fae96848d --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java @@ -0,0 +1,26 @@ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; + +public class VirtualFireAlarmUtilConstants { + + public static final String TENANT_DOMAIN = "TENANT_DOMAIN"; + public static final String DEVICE_OWNER = "DEVICE_OWNER"; + public static final String DEVICE_ID = "DEVICE_ID"; + public static final String DEVICE_NAME = "DEVICE_NAME"; + public static final String HTTPS_EP = "HTTPS_EP"; + public static final String HTTP_EP = "HTTP_EP"; + public static final String APIM_EP = "APIM_EP"; + public static final String MQTT_EP = "MQTT_EP"; + public static final String XMPP_EP = "XMPP_EP"; + public static final String VIRTUAL_FIREALARM_HTTPS_EP = "VIRTUAL_FIREALARM_HTTPS_EP"; + public static final String VIRTUAL_FIREALARM_HTTP_EP = "VIRTUAL_FIREALARM_HTTP_EP"; + public static final String VIRTUAL_FIREALARM_APIM_EP = "VIRTUAL_FIREALARM_APIM_EP"; + public static final String VIRTUAL_FIREALARM_MQTT_EP = "VIRTUAL_FIREALARM_MQTT_EP"; + public static final String VIRTUAL_FIREALARM_XMPP_EP = "VIRTUAL_FIREALARM_XMPP_EP"; + public static final String API_APPLICATION_KEY = "API_APPLICATION_KEY"; + public static final String DEVICE_TOKEN = "DEVICE_TOKEN"; + public static final String DEVICE_REFRESH_TOKEN = "DEVICE_REFRESH_TOKEN"; + public static final String SERVER_NAME = "SERVER_NAME"; + public static final String SERVER_JID = "SERVER_JID"; +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java new file mode 100644 index 000000000..22fda92b3 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import java.io.File; + +/** + * This is an utility class to hold zip files. + */ +public class ZipArchive { + + private File zipFile = null; + private String fileName = null; + + public ZipArchive(String fileName, File zipFile) { + this.fileName = fileName; + this.zipFile = zipFile; + } + + public File getZipFile() { + return zipFile; + } + + public String getFileName() { + return fileName; + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java new file mode 100644 index 000000000..feb8135db --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java @@ -0,0 +1,387 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.json.JSONObject; +import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants; +import org.wso2.carbon.base.ServerConfiguration; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; +import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException; +import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; +import org.wso2.carbon.utils.CarbonUtils; +import org.wso2.carbon.utils.NetworkUtils; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.SocketException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * This is used to create a zip file that includes the necessary configuration required for the agent. + */ +public class ZipUtil { + + private static final Log log = LogFactory.getLog(ZipUtil.class); + private static final String HTTPS_PORT_PROPERTY = "httpsPort"; + private static final String HTTP_PORT_PROPERTY = "httpPort"; + + private static final String LOCALHOST = "localhost"; + private static final String HTTPS_PROTOCOL_APPENDER = "https://"; + private static final String HTTP_PROTOCOL_APPENDER = "http://"; + private static final String CONFIG_TYPE = "general"; + private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1883"; + public static final String HOST_NAME = "HostName"; + + public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName, + String apiApplicationKey, String token, String refreshToken) + throws DeviceManagementException { + + String sketchFolder = "repository" + File.separator + "resources" + File.separator + "sketches"; + String archivesPath = + CarbonUtils.getCarbonHome() + File.separator + sketchFolder + File.separator + "archives" + + File.separator + deviceId; + String templateSketchPath = sketchFolder + File.separator + deviceType; + String iotServerIP; + + try { + iotServerIP = getServerUrl(); + String httpsServerPort = System.getProperty(HTTPS_PORT_PROPERTY); + String httpServerPort = System.getProperty(HTTP_PORT_PROPERTY); + String httpsServerEP = HTTPS_PROTOCOL_APPENDER + iotServerIP + ":" + httpsServerPort; + String httpServerEP = HTTP_PROTOCOL_APPENDER + iotServerIP + ":" + httpServerPort; + String mqttEndpoint = DEFAULT_MQTT_ENDPOINT; + if (mqttEndpoint.contains(LOCALHOST)) { + mqttEndpoint = mqttEndpoint.replace(LOCALHOST, iotServerIP); + } + + String xmppEndpoint = ""; + if (XmppConfig.getInstance().isEnabled()) { + xmppEndpoint = XmppConfig.getInstance().getHost() + ":" + XmppConfig.getInstance().getPort(); + if (xmppEndpoint.contains(LOCALHOST)) { + xmppEndpoint = xmppEndpoint.replace(LOCALHOST, iotServerIP); + } + } + PlatformConfiguration configuration = APIUtil.getTenantConfigurationManagementService().getConfiguration( + CONFIG_TYPE); + if (configuration != null && configuration.getConfiguration() != null && configuration + .getConfiguration().size() > 0) { + List configurations = configuration.getConfiguration(); + for (ConfigurationEntry configurationEntry : configurations) { + switch (configurationEntry.getName()) { + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_HTTPS_EP: + httpsServerEP = (String)configurationEntry.getValue(); + break; + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_HTTP_EP: + httpServerEP = (String)configurationEntry.getValue(); + break; + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_MQTT_EP: + mqttEndpoint = (String)configurationEntry.getValue(); + break; + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_XMPP_EP: + xmppEndpoint = (String)configurationEntry.getValue(); + break; + } + } + } + String base64EncodedApplicationKey = getBase64EncodedAPIAppKey(apiApplicationKey).trim(); + + Map contextParams = new HashMap<>(); + contextParams.put(VirtualFireAlarmUtilConstants.TENANT_DOMAIN, APIUtil.getTenantDomainOftheUser()); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_OWNER, owner); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_ID, deviceId); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_NAME, deviceName); + contextParams.put(VirtualFireAlarmUtilConstants.HTTPS_EP, httpsServerEP); + contextParams.put(VirtualFireAlarmUtilConstants.HTTP_EP, httpServerEP); + contextParams.put(VirtualFireAlarmUtilConstants.APIM_EP, httpServerEP); + contextParams.put(VirtualFireAlarmUtilConstants.MQTT_EP, mqttEndpoint); + contextParams.put(VirtualFireAlarmUtilConstants.XMPP_EP, "XMPP:" + xmppEndpoint); + contextParams.put(VirtualFireAlarmUtilConstants.API_APPLICATION_KEY, base64EncodedApplicationKey); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_TOKEN, token); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_REFRESH_TOKEN, refreshToken); + contextParams.put(VirtualFireAlarmUtilConstants.SERVER_NAME, XmppConfig.getInstance().getServerName() == null + ? "" : XmppConfig.getInstance().getServerName()); + contextParams.put(VirtualFireAlarmUtilConstants.SERVER_JID, XmppConfig.getInstance().getJid() == null + ? "" : XmppConfig.getInstance().getJid()); + + ZipArchive zipFile; + zipFile = getSketchArchive(archivesPath, templateSketchPath, contextParams, deviceName); + return zipFile; + } catch (IOException e) { + throw new DeviceManagementException("Zip File Creation Failed", e); + } catch (ConfigurationManagementException e) { + throw new DeviceManagementException("Failed to retrieve configuration", e); + } + } + + private String getBase64EncodedAPIAppKey(String apiAppCredentialsAsJSONString) { + + JSONObject jsonObject = new JSONObject(apiAppCredentialsAsJSONString); + String consumerKey = jsonObject.get(ApiApplicationConstants.OAUTH_CLIENT_ID).toString(); + String consumerSecret = jsonObject.get(ApiApplicationConstants.OAUTH_CLIENT_SECRET).toString(); + String stringToEncode = consumerKey + ":" + consumerSecret; + return Base64.encodeBase64String(stringToEncode.getBytes()); + } + + public static String getServerUrl() { + String hostName = ServerConfiguration.getInstance().getFirstProperty(HOST_NAME); + try { + if (hostName == null) { + hostName = NetworkUtils.getLocalHostname(); + } + } catch (SocketException e) { + hostName = "localhost"; + log.warn("Failed retrieving the hostname, therefore set to localhost", e); + } + return hostName; + } + + public static ZipArchive getSketchArchive(String archivesPath, String templateSketchPath, Map contextParams + , String zipFileName) + throws DeviceManagementException, IOException { + String sketchPath = CarbonUtils.getCarbonHome() + File.separator + templateSketchPath; + FileUtils.deleteDirectory(new File(archivesPath));//clear directory + FileUtils.deleteDirectory(new File(archivesPath + ".zip"));//clear zip + if (!new File(archivesPath).mkdirs()) { //new dir + String message = "Could not create directory at path: " + archivesPath; + log.error(message); + throw new DeviceManagementException(message); + } + zipFileName = zipFileName + ".zip"; + try { + Map> properties = getProperties(sketchPath + File.separator + "sketch" + ".properties"); + List templateFiles = properties.get("templates"); + + for (String templateFile : templateFiles) { + parseTemplate(templateSketchPath + File.separator + templateFile, archivesPath + File.separator + templateFile, + contextParams); + } + + templateFiles.add("sketch.properties"); // ommit copying the props file + copyFolder(new File(sketchPath), new File(archivesPath), templateFiles); + createZipArchive(archivesPath); + FileUtils.deleteDirectory(new File(archivesPath)); + File zip = new File(archivesPath + ".zip"); + return new org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive(zipFileName, zip); + } catch (IOException ex) { + throw new DeviceManagementException( + "Error occurred when trying to read property " + "file sketch.properties", ex); + } + } + + private static Map> getProperties(String propertyFilePath) throws IOException { + Properties prop = new Properties(); + InputStream input = null; + + try { + + input = new FileInputStream(propertyFilePath); + + // load a properties file + prop.load(input); + Map> properties = new HashMap>(); + + String templates = prop.getProperty("templates"); + List list = new ArrayList(Arrays.asList(templates.split(","))); + properties.put("templates", list); + + final String filename = prop.getProperty("zipfilename"); + list = new ArrayList() {{ + add(filename); + }}; + properties.put("zipfilename", list); + return properties; + + } finally { + if (input != null) { + try { + input.close(); + } catch (IOException e) { + log.error("Failed closing connection", e); + } + } + } + } + + private static void parseTemplate(String srcFile, String dstFile, Map contextParams) throws IOException { + //read from file + FileInputStream inputStream = null; + FileOutputStream outputStream = null; + try { + inputStream = new FileInputStream(srcFile); + outputStream = new FileOutputStream(dstFile); + String content = IOUtils.toString(inputStream, StandardCharsets.UTF_8.toString()); + Iterator iterator = contextParams.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry mapEntry = (Map.Entry) iterator.next(); + content = content.replaceAll("\\$\\{" + mapEntry.getKey() + "\\}", mapEntry.getValue().toString()); + } + IOUtils.write(content, outputStream, StandardCharsets.UTF_8.toString()); + } finally { + if (inputStream != null) { + inputStream.close(); + } + if (outputStream != null) { + outputStream.close(); + } + } + } + + private static void copyFolder(File src, File dest, List excludeFileNames) throws IOException { + + if (src.isDirectory()) { + //if directory not exists, create it + if (!dest.exists() && !dest.mkdirs()) { + String message = "Could not create directory at path: " + dest; + log.error(message); + throw new IOException(message); + } + //list all the directory contents + String files[] = src.list(); + + if (files == null) { + log.warn("There are no files insides the directory " + src.getAbsolutePath()); + return; + } + + for (String file : files) { + //construct the src and dest file structure + File srcFile = new File(src, file); + File destFile = new File(dest, file); + //recursive copy + copyFolder(srcFile, destFile, excludeFileNames); + } + + } else { + for (String fileName : excludeFileNames) { + if (src.getName().equals(fileName)) { + return; + } + } + //if file, then copy it + //Use bytes stream to support all file types + InputStream in = null; + OutputStream out = null; + + try { + in = new FileInputStream(src); + out = new FileOutputStream(dest); + + byte[] buffer = new byte[1024]; + + int length; + //copy the file content in bytes + while ((length = in.read(buffer)) > 0) { + out.write(buffer, 0, length); + } + } finally { + if (in != null) { + in.close(); + } + if (out != null) { + out.close(); + } + } + } + } + + private static boolean createZipArchive(String srcFolder) throws IOException { + BufferedInputStream origin = null; + ZipOutputStream out = null; + + try { + final int BUFFER = 2048; + FileOutputStream dest = new FileOutputStream(new File(srcFolder + ".zip")); + out = new ZipOutputStream(new BufferedOutputStream(dest)); + byte data[] = new byte[BUFFER]; + File subDir = new File(srcFolder); + String subdirList[] = subDir.list(); + if (subdirList == null) { + log.warn("The sub directory " + subDir.getAbsolutePath() + " is empty"); + return false; + } + for (String sd : subdirList) { + // get a list of files from current directory + File f = new File(srcFolder + "/" + sd); + if (f.isDirectory()) { + String files[] = f.list(); + + if (files == null) { + log.warn("The current directory " + f.getAbsolutePath() + " is empty. Has no files"); + return false; + } + + for (int i = 0; i < files.length; i++) { + FileInputStream fi = new FileInputStream(srcFolder + "/" + sd + "/" + files[i]); + origin = new BufferedInputStream(fi, BUFFER); + ZipEntry entry = new ZipEntry(sd + "/" + files[i]); + out.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + out.write(data, 0, count); + out.flush(); + } + + } + } else //it is just a file + { + FileInputStream fi = new FileInputStream(f); + origin = new BufferedInputStream(fi, BUFFER); + ZipEntry entry = new ZipEntry(sd); + out.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + out.write(data, 0, count); + out.flush(); + } + } + } + out.flush(); + } finally { + if (origin != null) { + origin.close(); + } + if (out != null) { + out.close(); + } + } + return true; + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java new file mode 100644 index 000000000..586de223c --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.util; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.base.ServerConfiguration; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive; +import org.wso2.carbon.utils.CarbonUtils; +import org.wso2.carbon.utils.NetworkUtils; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.SocketException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * Provides utility methods required by the device type plugins. + */ +public class Utils { + + public static final String HOST_NAME = "HostName"; + private static final Log log = LogFactory.getLog(Utils.class); + + + +} diff --git a/src/main/webapp/META-INF/permissions.xml b/src/main/webapp/META-INF/permissions.xml new file mode 100644 index 000000000..fbad43f95 --- /dev/null +++ b/src/main/webapp/META-INF/permissions.xml @@ -0,0 +1,52 @@ + + + + + + + + + + Download device + /device-mgt/user/devices + /device/download + GET + virtual_firealarm_user + + + Control Buzz + /device-mgt/user/operation + /device/*/buzz + POST + virtual_firealarm_user + + + Get Stats + /device-mgt/user/stats + /device/stats/* + GET + virtual_firealarm_user + + \ No newline at end of file diff --git a/src/main/webapp/META-INF/webapp-classloading.xml b/src/main/webapp/META-INF/webapp-classloading.xml new file mode 100644 index 000000000..fa4461919 --- /dev/null +++ b/src/main/webapp/META-INF/webapp-classloading.xml @@ -0,0 +1,33 @@ + + + + + + + + + false + + + CXF,Carbon + diff --git a/src/main/webapp/WEB-INF/cxf-servlet.xml b/src/main/webapp/WEB-INF/cxf-servlet.xml new file mode 100644 index 000000000..37a69c268 --- /dev/null +++ b/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..2d1c6e26b --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,42 @@ + + + WSO2 IoT Server + WSO2 IoT Server + + + CXFServlet + org.apache.cxf.transport.servlet.CXFServlet + 1 + + + CXFServlet + /* + + + isAdminService + false + + + doAuthentication + true + + + providerTenantDomain + carbon.super + + + + + managed-api-enabled + true + + + managed-api-owner + admin + + + \ No newline at end of file From 14455efd97ff0e78ecdefdfa9959e5240604027e Mon Sep 17 00:00:00 2001 From: Ace Date: Fri, 4 Nov 2016 19:41:33 +0530 Subject: [PATCH 002/432] merging changes with upstream partial --- pom.xml | 2 +- .../mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 83eefe902..0d8e5b5bf 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 2.2.5-SNAPSHOT + 2.2.6-SNAPSHOT ../pom.xml diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java index 0509eb80b..d302e7281 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java @@ -3,11 +3,10 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.analytics.api.AnalyticsDataAPI; +import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil; import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse; -import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDrillDownRequest; import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry; import org.wso2.carbon.analytics.dataservice.commons.SortByField; -import org.wso2.carbon.analytics.dataservice.core.AnalyticsDataServiceUtils; import org.wso2.carbon.analytics.datasource.commons.Record; import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException; import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; @@ -21,7 +20,6 @@ import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -79,7 +77,7 @@ public class APIUtil { sortByFields); List recordIds = getRecordIds(resultEntries); AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds); - Map sensorDatas = createSensorData(AnalyticsDataServiceUtils.listRecords( + Map sensorDatas = createSensorData(AnalyticsDataAPIUtil.listRecords( analyticsDataAPI, response)); List sortedSensorData = getSortedSensorData(sensorDatas, resultEntries); return sortedSensorData; From fa3c5ae29f84da08a21aa191a3b49be5b922385e Mon Sep 17 00:00:00 2001 From: GPrathap Date: Tue, 8 Nov 2016 15:59:04 +0530 Subject: [PATCH 003/432] changing MQTT message broker port to 1886 --- .../mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java index feb8135db..2c6cd2840 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java @@ -67,7 +67,7 @@ public class ZipUtil { private static final String HTTPS_PROTOCOL_APPENDER = "https://"; private static final String HTTP_PROTOCOL_APPENDER = "http://"; private static final String CONFIG_TYPE = "general"; - private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1883"; + private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1886"; public static final String HOST_NAME = "HostName"; public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName, From 85292f06c8cefdbc22b253e9a09a5d148d6eb9aa Mon Sep 17 00:00:00 2001 From: charitha Date: Wed, 16 Nov 2016 13:32:45 +0530 Subject: [PATCH 004/432] Update component versions for IoTS-1.0.0 release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0d8e5b5bf..700881b18 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 2.2.6-SNAPSHOT + 3.0.0-SNAPSHOT ../pom.xml From 99cbbd2eb044c71c5d7a235483a3f5cb5ec20fc5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 16 Nov 2016 13:55:17 +0000 Subject: [PATCH 005/432] [maven-release-plugin] prepare release v3.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 700881b18..719d3211f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.0-SNAPSHOT + 3.0.0 ../pom.xml From e070efd2570621b126706c69e2bc24258f0ea636 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 16 Nov 2016 13:57:06 +0000 Subject: [PATCH 006/432] [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 719d3211f..c4f55fe40 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.0 + 3.0.1-SNAPSHOT ../pom.xml From 8f2895daf3f135011182cedd91523c7ae5d850a1 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sun, 20 Nov 2016 02:37:42 +0530 Subject: [PATCH 007/432] changed device access verification approach --- .../service/impl/VirtualFireAlarmServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 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 ce54d9537..7e63fbf21 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 @@ -312,13 +312,10 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true); } JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient(); - String device = "{ \"scope\":\"mqtt-publisher mqtt-subscriber\", \"deviceIdentifiers\":[{\"id\":\""+deviceId+"\", " + - "\"type\":\""+VirtualFireAlarmConstants.DEVICE_TYPE+"\"}]}"; - Map params = new HashMap(); - params.put("device", Base64.encodeBase64String(device.getBytes())); + String scopes = " device_" + deviceId; AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(), apiApplicationKey.getConsumerSecret(), owner, - null, params); + scopes); String accessToken = accessTokenInfo.getAccessToken(); String refreshToken = accessTokenInfo.getRefreshToken(); XmppAccount newXmppAccount = new XmppAccount(); From eb9652a13c31471756aa9800959b05e83f2d1fcc Mon Sep 17 00:00:00 2001 From: GPrathap Date: Sun, 20 Nov 2016 18:55:39 +0530 Subject: [PATCH 008/432] removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations --- .../service/impl/VirtualFireAlarmService.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java index 9d89050fb..faf40c962 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -18,7 +18,11 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; -import org.wso2.carbon.apimgt.annotations.api.API; +import io.swagger.annotations.SwaggerDefinition; +import io.swagger.annotations.Info; +import io.swagger.annotations.ExtensionProperty; +import io.swagger.annotations.Extension; +import io.swagger.annotations.Tag; import org.wso2.carbon.apimgt.annotations.api.Scope; import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType; import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature; @@ -33,7 +37,21 @@ import javax.ws.rs.core.Response; * the transport 'Connectors' [XMPP & MQTT] specific to the VirtualFirealarm device-type in order to communicate with * such devices and to receive messages form it. */ -@API(name = "virtual_firealarm", version = "1.0.0", context = "/virtual_firealarm", tags = {"virtual_firealarm"}) +@SwaggerDefinition( + info = @Info( + version = "1.0.0", + title = "", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = "name", value = "virtual_firealarm"), + @ExtensionProperty(name = "context", value = "/virtual_firealarm"), + }) + } + ), + tags = { + @Tag(name = "virtual_firealarm", description = "") + } +) @DeviceType(value = "virtual_firealarm") public interface VirtualFireAlarmService { From a015e5529d20dbb6d0fca87e3ffa9ea572fc1220 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Mon, 21 Nov 2016 20:55:12 +0530 Subject: [PATCH 009/432] removed device type and feature annotation --- .../service/impl/VirtualFireAlarmService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java index faf40c962..75db835b7 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -24,8 +24,6 @@ import io.swagger.annotations.ExtensionProperty; import io.swagger.annotations.Extension; import io.swagger.annotations.Tag; import org.wso2.carbon.apimgt.annotations.api.Scope; -import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.DeviceType; -import org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature; import javax.ws.rs.*; import javax.ws.rs.core.Response; @@ -52,7 +50,6 @@ import javax.ws.rs.core.Response; @Tag(name = "virtual_firealarm", description = "") } ) -@DeviceType(value = "virtual_firealarm") public interface VirtualFireAlarmService { /** @@ -67,7 +64,6 @@ public interface VirtualFireAlarmService { @POST @Path("device/{deviceId}/buzz") @Scope(key = "device:firealarm:enroll", name = "", description = "") - @Feature(code = "buzz", name = "Buzzer On / Off", description = "Switch on/off Virtual Fire Alarm Buzzer. (On / Off)") Response switchBuzzer(@PathParam("deviceId") String deviceId, @FormParam("state") String state); From 0f3e47bb460d2496ca0880adfd3171f7a3cb137a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 25 Nov 2016 09:11:13 +0000 Subject: [PATCH 010/432] [maven-release-plugin] prepare release v3.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4f55fe40..df4515fb0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml From fe6accf78f033ace7927439ab4a8aadb38e63a33 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 25 Nov 2016 09:14:26 +0000 Subject: [PATCH 011/432] [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 df4515fb0..ced582d94 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.1 + 3.0.2-SNAPSHOT ../pom.xml From cd6806c6ad6f2f2dad94c63a4d3804ec0604481b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Dec 2016 13:50:48 +0000 Subject: [PATCH 012/432] [maven-release-plugin] prepare release v3.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ced582d94..1b7542267 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.2-SNAPSHOT + 3.0.2 ../pom.xml From cea3d593bff5b864d21e8a76595f15814853f02a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Dec 2016 13:52:49 +0000 Subject: [PATCH 013/432] [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 1b7542267..d4573ade7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.2 + 3.0.3-SNAPSHOT ../pom.xml From ccf117b21d603788f39d4a71b80da3b34f3e2f56 Mon Sep 17 00:00:00 2001 From: GPrathap Date: Mon, 5 Dec 2016 09:57:10 +0530 Subject: [PATCH 014/432] added expiration time of application access token --- .../service/impl/VirtualFireAlarmServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 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 7e63fbf21..c00dd6ab7 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 @@ -309,7 +309,8 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService(); String[] tags = {VirtualFireAlarmConstants.DEVICE_TYPE}; apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys( - VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true); + VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true, + VirtualFireAlarmConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD); } JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient(); String scopes = " device_" + deviceId; From c0d46890059d3523e877011751e234401506391e Mon Sep 17 00:00:00 2001 From: Harshan Liyanage Date: Thu, 8 Dec 2016 16:40:18 +0530 Subject: [PATCH 015/432] Resolved conflicts --- pom.xml | 263 ++++++++++++ .../service/impl/VirtualFireAlarmService.java | 87 ++++ .../impl/VirtualFireAlarmServiceImpl.java | 345 ++++++++++++++++ .../service/impl/dto/SensorRecord.java | 68 +++ .../exception/VirtualFireAlarmException.java | 35 ++ .../service/impl/util/APIUtil.java | 196 +++++++++ .../util/VirtualFireAlarmServiceUtils.java | 51 +++ .../util/VirtualFireAlarmUtilConstants.java | 26 ++ .../service/impl/util/ZipArchive.java | 43 ++ .../service/impl/util/ZipUtil.java | 387 ++++++++++++++++++ .../service/impl/util/util/Utils.java | 61 +++ src/main/webapp/META-INF/permissions.xml | 52 +++ .../webapp/META-INF/webapp-classloading.xml | 33 ++ src/main/webapp/WEB-INF/cxf-servlet.xml | 38 ++ src/main/webapp/WEB-INF/web.xml | 42 ++ 15 files changed, 1727 insertions(+) create mode 100644 pom.xml create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java create mode 100644 src/main/webapp/META-INF/permissions.xml create mode 100644 src/main/webapp/META-INF/webapp-classloading.xml create mode 100644 src/main/webapp/WEB-INF/cxf-servlet.xml create mode 100644 src/main/webapp/WEB-INF/web.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..d4573ade7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,263 @@ + + + + + + virtual-fire-alarm-plugin + org.wso2.carbon.devicemgt-plugins + 3.0.3-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.mgt.iot.virtualfirealarm.api + war + WSO2 Carbon - IoT Server VirtualFireAlarm API + WSO2 Carbon - Virtual FireAlarm Service Management API Implementation + http://wso2.org + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.core + provided + + + org.apache.axis2.wso2 + axis2-client + + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.analytics.data.publisher + provided + + + org.apache.axis2.wso2 + axis2-client + + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.certificate.mgt.core + provided + + + commons-codec + commons-codec + + + + + + + + org.apache.cxf + cxf-rt-frontend-jaxws + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + provided + + + org.apache.cxf + cxf-rt-transports-http + provided + + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + provided + + + + + org.apache.httpcomponents + httpasyncclient + 4.1 + provided + + + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + javax + javaee-web-api + provided + + + javax.ws.rs + jsr311-api + provided + + + commons-httpclient.wso2 + commons-httpclient + provided + + + + org.wso2.carbon + org.wso2.carbon.utils + provided + + + org.bouncycastle.wso2 + bcprov-jdk15on + + + org.wso2.carbon + org.wso2.carbon.user.api + + + org.wso2.carbon + org.wso2.carbon.queuing + + + org.wso2.carbon + org.wso2.carbon.base + + + org.apache.axis2.wso2 + axis2 + + + org.igniterealtime.smack.wso2 + smack + + + org.igniterealtime.smack.wso2 + smackx + + + jaxen + jaxen + + + commons-fileupload.wso2 + commons-fileupload + + + org.apache.ant.wso2 + ant + + + org.apache.ant.wso2 + ant + + + commons-httpclient.wso2 + commons-httpclient + + + org.eclipse.equinox + javax.servlet + + + org.wso2.carbon + org.wso2.carbon.registry.api + + + + + commons-codec + commons-codec + + + org.wso2.carbon.devicemgt + org.wso2.carbon.apimgt.annotations + provided + + + org.igniterealtime.smack.wso2 + smack + provided + + + org.igniterealtime.smack.wso2 + smackx + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.identity.jwt.client.extension + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.apimgt.application.extension + provided + + + org.wso2.carbon.analytics + org.wso2.carbon.analytics.api + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.extensions + provided + + + org.wso2.carbon.devicemgt-plugins + org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin + provided + + + + + + maven-compiler-plugin + + UTF-8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + + + maven-war-plugin + + virtual_firealarm + + + + + + diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java new file mode 100644 index 000000000..75db835b7 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; + +import io.swagger.annotations.SwaggerDefinition; +import io.swagger.annotations.Info; +import io.swagger.annotations.ExtensionProperty; +import io.swagger.annotations.Extension; +import io.swagger.annotations.Tag; +import org.wso2.carbon.apimgt.annotations.api.Scope; + +import javax.ws.rs.*; +import javax.ws.rs.core.Response; + +/** + * This class consists the functions/APIs specific to the "actions" of the VirtualFirealarm device-type. These APIs + * include the ones that are used by the [Device] to contact the server (i.e: Enrollment & Publishing Data) and the + * ones used by the [Server/Owner] to contact the [Device] (i.e: sending control signals). This class also initializes + * the transport 'Connectors' [XMPP & MQTT] specific to the VirtualFirealarm device-type in order to communicate with + * such devices and to receive messages form it. + */ +@SwaggerDefinition( + info = @Info( + version = "1.0.0", + title = "", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = "name", value = "virtual_firealarm"), + @ExtensionProperty(name = "context", value = "/virtual_firealarm"), + }) + } + ), + tags = { + @Tag(name = "virtual_firealarm", description = "") + } +) +public interface VirtualFireAlarmService { + + /** + * This is an API called/used from within the Server(Front-End) or by a device Owner. It sends a control command to + * the VirtualFirealarm device to switch `ON` or `OFF` its buzzer. The method also takes in the protocol to be used + * to connect-to and send the command to the device. + * + * @param deviceId the ID of the VirtualFirealarm device on which the buzzer needs to switched `ON` or `OFF`. + * @param state the state to which the buzzer on the device needs to be changed. Either "ON" or "OFF". + * (Case-Insensitive String) + */ + @POST + @Path("device/{deviceId}/buzz") + @Scope(key = "device:firealarm:enroll", name = "", description = "") + Response switchBuzzer(@PathParam("deviceId") String deviceId, + @FormParam("state") String state); + + /** + * Retrieve Sensor data for the device type + */ + @Path("device/stats/{deviceId}") + @GET + @Scope(key = "device:firealarm:enroll", name = "", description = "") + @Consumes("application/json") + @Produces("application/json") + Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from, + @QueryParam("to") long to); + + @Path("device/download") + @GET + @Produces("application/zip") + @Scope(key = "device:firealarm:enroll", name = "", description = "") + Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketchType") String sketchType); + +} 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 new file mode 100644 index 000000000..c00dd6ab7 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java @@ -0,0 +1,345 @@ +/* +* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +* +* WSO2 Inc. licenses this file to you under the Apache License, +* Version 2.0 (the "License"); you may not use this file except +* in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.analytics.dataservice.commons.SortByField; +import org.wso2.carbon.analytics.dataservice.commons.SortType; +import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException; +import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; +import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey; +import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.common.*; +import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException; +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.iot.virtualfirealarm.plugin.constants.VirtualFireAlarmConstants; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.exception.VirtualFirealarmDeviceMgtPluginException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.VirtualFirealarmSecurityManager; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppAccount; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppServerClient; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception.VirtualFireAlarmException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.APIUtil; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.VirtualFireAlarmServiceUtils; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipUtil; +import org.wso2.carbon.identity.jwt.client.extension.JWTClient; +import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; +import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; +import org.wso2.carbon.user.api.UserStoreException; + +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Response; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; + +public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { + + private static final String XMPP_PROTOCOL = "XMPP"; + private static final String MQTT_PROTOCOL = "MQTT"; + private static final String KEY_TYPE = "PRODUCTION"; + private static ApiApplicationKey apiApplicationKey; + private static final String DEVICE_MGT_SCOPE_IDENTIFIER = "device-mgt"; + private static Log log = LogFactory.getLog(VirtualFireAlarmServiceImpl.class); + + @POST + @Path("device/{deviceId}/buzz") + public Response switchBuzzer(@PathParam("deviceId") String deviceId, @FormParam("state") String state) { + if (state == null || state.isEmpty()) { + log.error("State is not defined for the buzzer operation"); + return Response.status(Response.Status.BAD_REQUEST).build(); + } + String switchToState = state.toUpperCase(); + if (!switchToState.equals(VirtualFireAlarmConstants.STATE_ON) && !switchToState.equals( + VirtualFireAlarmConstants.STATE_OFF)) { + log.error("The requested state change shoud be either - 'ON' or 'OFF'"); + return Response.status(Response.Status.BAD_REQUEST).build(); + } + try { + if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( + new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), + DeviceGroupConstants.Permissions.DEFAULT_OPERATOR_PERMISSIONS)) { + return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); + } + String resource = VirtualFireAlarmConstants.BULB_CONTEXT.replace("/", ""); + PrivateKey serverPrivateKey = VirtualFirealarmSecurityManager.getServerPrivateKey(); + String actualMessage = resource + ":" + switchToState; + String encryptedMsg = VirtualFireAlarmServiceUtils.prepareSecurePayLoad(actualMessage, + serverPrivateKey); + String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; + + Operation commandOp = new CommandOperation(); + commandOp.setCode("buzz"); + commandOp.setType(Operation.Type.COMMAND); + commandOp.setEnabled(true); + commandOp.setPayLoad(encryptedMsg); + + 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"); + props.setProperty(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, + VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); + commandOp.setProperties(props); + + List deviceIdentifiers = new ArrayList<>(); + deviceIdentifiers.add(new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE)); + APIUtil.getDeviceManagementService().addOperation(VirtualFireAlarmConstants.DEVICE_TYPE, commandOp, + deviceIdentifiers); + return Response.ok().build(); + } catch (InvalidDeviceException e) { + String msg = "Error occurred while executing command operation to send keywords"; + log.error(msg, e); + return Response.status(Response.Status.BAD_REQUEST).build(); + } catch (DeviceAccessAuthorizationException e) { + log.error(e.getErrorMessage(), e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } catch (VirtualFireAlarmException e) { + String errorMsg = "Preparing Secure payload failed for device - [" + deviceId + "]"; + log.error(errorMsg); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } catch (OperationManagementException e) { + String msg = "Error occurred while executing command operation upon ringing the buzzer"; + log.error(msg, e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } + } + + @PUT + @Path("device/{deviceId}/policy") + public Response updatePolicy(@PathParam("deviceId") String deviceId, @QueryParam("protocol") String protocol, + @FormParam("policy") String policy) { + String protocolString = protocol.toUpperCase(); + if (log.isDebugEnabled()) { + log.debug("Sending request to update-policy of device [" + deviceId + "] via " + protocolString); + } + try { + if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( + new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), + DeviceGroupConstants.Permissions.DEFAULT_MANAGE_POLICIES_PERMISSIONS)) { + return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); + } + PrivateKey serverPrivateKey = VirtualFirealarmSecurityManager.getServerPrivateKey(); + String actualMessage = VirtualFireAlarmConstants.POLICY_CONTEXT + ":" + policy; + String encryptedMsg = VirtualFireAlarmServiceUtils.prepareSecurePayLoad(actualMessage, + serverPrivateKey); + Map dynamicProperties = new HashMap<>(); + switch (protocolString) { + case XMPP_PROTOCOL: + dynamicProperties.put(VirtualFireAlarmConstants.JID_PROPERTY_KEY, + deviceId + "@" + XmppConfig.getInstance().getServerName()); + dynamicProperties.put(VirtualFireAlarmConstants.SUBJECT_PROPERTY_KEY, "POLICTY-REQUEST"); + dynamicProperties.put(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, + VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); + APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.XMPP_ADAPTER_NAME, + dynamicProperties, encryptedMsg); + break; + default: + + String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; + dynamicProperties.put(VirtualFireAlarmConstants.ADAPTER_TOPIC_PROPERTY, publishTopic); + APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.MQTT_ADAPTER_NAME, + dynamicProperties, encryptedMsg); + break; + } + return Response.ok().build(); + } catch (DeviceAccessAuthorizationException e) { + log.error(e.getErrorMessage(), e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } catch (VirtualFireAlarmException e) { + log.error(e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } + } + + + @Path("device/stats/{deviceId}") + @GET + @Consumes("application/json") + @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 sensorTableName = VirtualFireAlarmConstants.TEMPERATURE_EVENT_TABLE; + try { + if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( + new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), + DeviceGroupConstants.Permissions.DEFAULT_STATS_MONITOR_PERMISSIONS)) { + return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); + } + List sortByFields = new ArrayList<>(); + SortByField sortByField = new SortByField("time", SortType.ASC); + sortByFields.add(sortByField); + List sensorRecords = APIUtil.getAllEventsForDevice(sensorTableName, query, sortByFields); + return Response.status(Response.Status.OK.getStatusCode()).entity(sensorRecords).build(); + } catch (AnalyticsException e) { + String errorMsg = "Error on retrieving stats on table " + sensorTableName + " with query " + query; + log.error(errorMsg); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).entity(errorMsg).build(); + } catch (DeviceAccessAuthorizationException e) { + log.error(e.getErrorMessage(), e); + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); + } + } + + @Path("device/download") + @GET + @Produces("application/zip") + public Response downloadSketch(@QueryParam("deviceName") String deviceName, + @QueryParam("sketchType") String sketchType) { + try { + ZipArchive zipFile = createDownloadFile(APIUtil.getAuthenticatedUser(), deviceName, sketchType); + Response.ResponseBuilder response = Response.ok(FileUtils.readFileToByteArray(zipFile.getZipFile())); + response.status(Response.Status.OK); + response.type("application/zip"); + response.header("Content-Disposition", "attachment; filename=\"" + zipFile.getFileName() + "\""); + Response resp = response.build(); + zipFile.getZipFile().delete(); + return resp; + } catch (IllegalArgumentException ex) { + return Response.status(400).entity(ex.getMessage()).build();//bad request + } catch (DeviceManagementException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (JWTClientException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (APIManagerException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (IOException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (UserStoreException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } catch (VirtualFirealarmDeviceMgtPluginException ex) { + log.error(ex.getMessage(), ex); + return Response.status(500).entity(ex.getMessage()).build(); + } + } + + private boolean register(String deviceId, String name) { + try { + DeviceIdentifier deviceIdentifier = new DeviceIdentifier(); + deviceIdentifier.setId(deviceId); + deviceIdentifier.setType(VirtualFireAlarmConstants.DEVICE_TYPE); + if (APIUtil.getDeviceManagementService().isEnrolled(deviceIdentifier)) { + return false; + } + Device device = new Device(); + device.setDeviceIdentifier(deviceId); + EnrolmentInfo enrolmentInfo = new EnrolmentInfo(); + enrolmentInfo.setDateOfEnrolment(new Date().getTime()); + enrolmentInfo.setDateOfLastUpdate(new Date().getTime()); + enrolmentInfo.setStatus(EnrolmentInfo.Status.ACTIVE); + enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD); + device.setName(name); + device.setType(VirtualFireAlarmConstants.DEVICE_TYPE); + enrolmentInfo.setOwner(APIUtil.getAuthenticatedUser()); + device.setEnrolmentInfo(enrolmentInfo); + return APIUtil.getDeviceManagementService().enrollDevice(device); + } catch (DeviceManagementException e) { + log.error(e.getMessage(), e); + return false; + } + } + + private ZipArchive createDownloadFile(String owner, String deviceName, String sketchType) + throws DeviceManagementException, APIManagerException, JWTClientException, + UserStoreException, VirtualFirealarmDeviceMgtPluginException { + //create new device id + String deviceId = shortUUID(); + boolean status = register(deviceId, deviceName); + if (!status) { + String msg = "Error occurred while registering the device with " + "id: " + deviceId + " owner:" + owner; + throw new DeviceManagementException(msg); + } + if (apiApplicationKey == null) { + String applicationUsername = + PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm().getRealmConfiguration() + .getAdminUserName(); + 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); + } + JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient(); + String scopes = " device_" + deviceId; + AccessTokenInfo accessTokenInfo = jwtClient.getAccessToken(apiApplicationKey.getConsumerKey(), + apiApplicationKey.getConsumerSecret(), owner, + scopes); + String accessToken = accessTokenInfo.getAccessToken(); + String refreshToken = accessTokenInfo.getRefreshToken(); + XmppAccount newXmppAccount = new XmppAccount(); + newXmppAccount.setAccountName(deviceId); + newXmppAccount.setUsername(deviceId); + newXmppAccount.setPassword(accessToken); + newXmppAccount.setEmail(deviceId + "@" + APIUtil.getTenantDomainOftheUser()); + + status = XmppServerClient.createAccount(newXmppAccount); + if (!status) { + String msg = "XMPP Account was not created for device - " + deviceId + " of owner - " + owner + + ".XMPP might have been disabled in org.wso2.carbon.device.mgt.iot" + + ".common.config.server.configs"; + throw new DeviceManagementException(msg); + } + ZipUtil ziputil = new ZipUtil(); + return ziputil.createZipFile(owner, sketchType, deviceId, deviceName, apiApplicationKey.toString(), + accessToken, refreshToken); + } + + private static String shortUUID() { + UUID uuid = UUID.randomUUID(); + long l = ByteBuffer.wrap(uuid.toString().getBytes(StandardCharsets.UTF_8)).getLong(); + return Long.toString(l, Character.MAX_RADIX); + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java new file mode 100644 index 000000000..e1f46d2d7 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java @@ -0,0 +1,68 @@ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto; + +import org.codehaus.jackson.annotate.JsonIgnoreProperties; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@XmlRootElement +/** + * This stores sensor event data for android sense. + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public class SensorRecord { + + @XmlElementWrapper(required = true, name = "values") + private Map values; + + /** The id. */ + @XmlElement(required = false, name = "id") + private String id; + + /** + * Gets the values. + * @return the values + */ + public Map getValues() { + return values; + } + + /** + * Sets the values. + * @param values the values + */ + public void setValues(Map values) { + this.values = values; + } + + /** + * Sets the id. + * @param id the new id + */ + public void setId(String id) { + this.id = id; + } + + /** + * Gets the id. + * @return the id + */ + public String getId() { + return id; + } + + @Override + public String toString(){ + List valueList = new ArrayList(); + for (Map.Entry entry : values.entrySet()) { + valueList.add(entry.getKey() + ":" + entry.getValue()); + } + return valueList.toString(); + + } + +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java new file mode 100644 index 000000000..4305ec7c0 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception; + +public class VirtualFireAlarmException extends Exception { + private static final long serialVersionUID = 118512086957330189L; + + public VirtualFireAlarmException(String errorMessage) { + super(errorMessage); + } + + public VirtualFireAlarmException(String errorMessage, Throwable throwable) { + super(errorMessage, throwable); + } + + public VirtualFireAlarmException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java new file mode 100644 index 000000000..d302e7281 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java @@ -0,0 +1,196 @@ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.analytics.api.AnalyticsDataAPI; +import org.wso2.carbon.analytics.api.AnalyticsDataAPIUtil; +import org.wso2.carbon.analytics.dataservice.commons.AnalyticsDataResponse; +import org.wso2.carbon.analytics.dataservice.commons.SearchResultEntry; +import org.wso2.carbon.analytics.dataservice.commons.SortByField; +import org.wso2.carbon.analytics.datasource.commons.Record; +import org.wso2.carbon.analytics.datasource.commons.exception.AnalyticsException; +import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; +import org.wso2.carbon.context.CarbonContext; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService; +import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService; +import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; +import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; +import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * This class provides utility functions used by REST-API. + */ +public class APIUtil { + + private static Log log = LogFactory.getLog(APIUtil.class); + + public static String getAuthenticatedUser() { + PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + String username = threadLocalCarbonContext.getUsername(); + String tenantDomain = threadLocalCarbonContext.getTenantDomain(); + if (username.endsWith(tenantDomain)) { + return username.substring(0, username.lastIndexOf("@")); + } + return username; + } + + public static DeviceManagementProviderService getDeviceManagementService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + DeviceManagementProviderService deviceManagementProviderService = + (DeviceManagementProviderService) ctx.getOSGiService(DeviceManagementProviderService.class, null); + if (deviceManagementProviderService == null) { + String msg = "Device Management service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return deviceManagementProviderService; + } + + public static AnalyticsDataAPI getAnalyticsDataAPI() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + AnalyticsDataAPI analyticsDataAPI = + (AnalyticsDataAPI) ctx.getOSGiService(AnalyticsDataAPI.class, null); + if (analyticsDataAPI == null) { + String msg = "Analytics api service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return analyticsDataAPI; + } + + public static List getAllEventsForDevice(String tableName, String query, + List sortByFields) throws AnalyticsException { + int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); + AnalyticsDataAPI analyticsDataAPI = getAnalyticsDataAPI(); + int eventCount = analyticsDataAPI.searchCount(tenantId, tableName, query); + if (eventCount == 0) { + return null; + } + List resultEntries = analyticsDataAPI.search(tenantId, tableName, query, 0, eventCount, + sortByFields); + List recordIds = getRecordIds(resultEntries); + AnalyticsDataResponse response = analyticsDataAPI.get(tenantId, tableName, 1, null, recordIds); + Map sensorDatas = createSensorData(AnalyticsDataAPIUtil.listRecords( + analyticsDataAPI, response)); + List sortedSensorData = getSortedSensorData(sensorDatas, resultEntries); + return sortedSensorData; + } + + private static List getRecordIds(List searchResults) { + List ids = new ArrayList<>(); + for (SearchResultEntry searchResult : searchResults) { + ids.add(searchResult.getId()); + } + return ids; + } + + public static List getSortedSensorData(Map sensorDatas, + List searchResults) { + List sortedRecords = new ArrayList<>(); + for (SearchResultEntry searchResultEntry : searchResults) { + sortedRecords.add(sensorDatas.get(searchResultEntry.getId())); + } + return sortedRecords; + } + + /** + * Creates the SensorDatas from records. + * + * @param records the records + * @return the Map of SensorRecord + */ + public static Map createSensorData(List records) { + Map sensorDatas = new HashMap<>(); + for (Record record : records) { + SensorRecord sensorData = createSensorData(record); + sensorDatas.put(sensorData.getId(), sensorData); + } + return sensorDatas; + } + + /** + * Create a SensorRecord object out of a Record object + * + * @param record the record object + * @return SensorRecord object + */ + public static SensorRecord createSensorData(Record record) { + SensorRecord recordBean = new SensorRecord(); + recordBean.setId(record.getId()); + recordBean.setValues(record.getValues()); + return recordBean; + } + + public static APIManagementProviderService getAPIManagementProviderService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + APIManagementProviderService apiManagementProviderService = + (APIManagementProviderService) ctx.getOSGiService(APIManagementProviderService.class, null); + if (apiManagementProviderService == null) { + String msg = "API management provider service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return apiManagementProviderService; + } + + public static JWTClientManagerService getJWTClientManagerService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + JWTClientManagerService jwtClientManagerService = + (JWTClientManagerService) ctx.getOSGiService(JWTClientManagerService.class, null); + if (jwtClientManagerService == null) { + String msg = "JWT Client manager service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return jwtClientManagerService; + } + + public static String getTenantDomainOftheUser() { + PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + return threadLocalCarbonContext.getTenantDomain(); + } + + public static DeviceAccessAuthorizationService getDeviceAccessAuthorizationService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + DeviceAccessAuthorizationService deviceAccessAuthorizationService = + (DeviceAccessAuthorizationService) ctx.getOSGiService(DeviceAccessAuthorizationService.class, null); + if (deviceAccessAuthorizationService == null) { + String msg = "Device Authorization service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return deviceAccessAuthorizationService; + } + + public static OutputEventAdapterService getOutputEventAdapterService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + OutputEventAdapterService outputEventAdapterService = + (OutputEventAdapterService) ctx.getOSGiService(OutputEventAdapterService.class, null); + if (outputEventAdapterService == null) { + String msg = "Device Authorization service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return outputEventAdapterService; + } + + public static PlatformConfigurationManagementService getTenantConfigurationManagementService() { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + PlatformConfigurationManagementService tenantConfigurationManagementService = + (PlatformConfigurationManagementService) ctx.getOSGiService(PlatformConfigurationManagementService.class, null); + if (tenantConfigurationManagementService == null) { + String msg = "Tenant configuration Management service not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + return tenantConfigurationManagementService; + } + +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java new file mode 100644 index 000000000..277000e0f --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.apache.commons.codec.binary.Base64; +import org.json.JSONObject; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.exception.VirtualFirealarmDeviceMgtPluginException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.VirtualFirealarmSecurityManager; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception.VirtualFireAlarmException; + +import java.lang.*; +import java.security.PrivateKey; + +/** + * + */ +public class VirtualFireAlarmServiceUtils { + + private static final String JSON_MESSAGE_KEY = "Msg"; + private static final String JSON_SIGNATURE_KEY = "Sig"; + + public static String prepareSecurePayLoad(String message, PrivateKey signatureKey) throws VirtualFireAlarmException { + try { + message = Base64.encodeBase64String(message.getBytes()); + String signedPayload = VirtualFirealarmSecurityManager.signMessage(message, signatureKey); + JSONObject jsonPayload = new JSONObject(); + jsonPayload.put(JSON_MESSAGE_KEY, message); + jsonPayload.put(JSON_SIGNATURE_KEY, signedPayload); + return jsonPayload.toString(); + } catch (VirtualFirealarmDeviceMgtPluginException e) { + throw new VirtualFireAlarmException(e); + } + + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java new file mode 100644 index 000000000..fae96848d --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java @@ -0,0 +1,26 @@ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; + +public class VirtualFireAlarmUtilConstants { + + public static final String TENANT_DOMAIN = "TENANT_DOMAIN"; + public static final String DEVICE_OWNER = "DEVICE_OWNER"; + public static final String DEVICE_ID = "DEVICE_ID"; + public static final String DEVICE_NAME = "DEVICE_NAME"; + public static final String HTTPS_EP = "HTTPS_EP"; + public static final String HTTP_EP = "HTTP_EP"; + public static final String APIM_EP = "APIM_EP"; + public static final String MQTT_EP = "MQTT_EP"; + public static final String XMPP_EP = "XMPP_EP"; + public static final String VIRTUAL_FIREALARM_HTTPS_EP = "VIRTUAL_FIREALARM_HTTPS_EP"; + public static final String VIRTUAL_FIREALARM_HTTP_EP = "VIRTUAL_FIREALARM_HTTP_EP"; + public static final String VIRTUAL_FIREALARM_APIM_EP = "VIRTUAL_FIREALARM_APIM_EP"; + public static final String VIRTUAL_FIREALARM_MQTT_EP = "VIRTUAL_FIREALARM_MQTT_EP"; + public static final String VIRTUAL_FIREALARM_XMPP_EP = "VIRTUAL_FIREALARM_XMPP_EP"; + public static final String API_APPLICATION_KEY = "API_APPLICATION_KEY"; + public static final String DEVICE_TOKEN = "DEVICE_TOKEN"; + public static final String DEVICE_REFRESH_TOKEN = "DEVICE_REFRESH_TOKEN"; + public static final String SERVER_NAME = "SERVER_NAME"; + public static final String SERVER_JID = "SERVER_JID"; +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java new file mode 100644 index 000000000..22fda92b3 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import java.io.File; + +/** + * This is an utility class to hold zip files. + */ +public class ZipArchive { + + private File zipFile = null; + private String fileName = null; + + public ZipArchive(String fileName, File zipFile) { + this.fileName = fileName; + this.zipFile = zipFile; + } + + public File getZipFile() { + return zipFile; + } + + public String getFileName() { + return fileName; + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java new file mode 100644 index 000000000..2c6cd2840 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java @@ -0,0 +1,387 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.json.JSONObject; +import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants; +import org.wso2.carbon.base.ServerConfiguration; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; +import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException; +import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; +import org.wso2.carbon.utils.CarbonUtils; +import org.wso2.carbon.utils.NetworkUtils; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.SocketException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * This is used to create a zip file that includes the necessary configuration required for the agent. + */ +public class ZipUtil { + + private static final Log log = LogFactory.getLog(ZipUtil.class); + private static final String HTTPS_PORT_PROPERTY = "httpsPort"; + private static final String HTTP_PORT_PROPERTY = "httpPort"; + + private static final String LOCALHOST = "localhost"; + private static final String HTTPS_PROTOCOL_APPENDER = "https://"; + private static final String HTTP_PROTOCOL_APPENDER = "http://"; + private static final String CONFIG_TYPE = "general"; + private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1886"; + public static final String HOST_NAME = "HostName"; + + public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName, + String apiApplicationKey, String token, String refreshToken) + throws DeviceManagementException { + + String sketchFolder = "repository" + File.separator + "resources" + File.separator + "sketches"; + String archivesPath = + CarbonUtils.getCarbonHome() + File.separator + sketchFolder + File.separator + "archives" + + File.separator + deviceId; + String templateSketchPath = sketchFolder + File.separator + deviceType; + String iotServerIP; + + try { + iotServerIP = getServerUrl(); + String httpsServerPort = System.getProperty(HTTPS_PORT_PROPERTY); + String httpServerPort = System.getProperty(HTTP_PORT_PROPERTY); + String httpsServerEP = HTTPS_PROTOCOL_APPENDER + iotServerIP + ":" + httpsServerPort; + String httpServerEP = HTTP_PROTOCOL_APPENDER + iotServerIP + ":" + httpServerPort; + String mqttEndpoint = DEFAULT_MQTT_ENDPOINT; + if (mqttEndpoint.contains(LOCALHOST)) { + mqttEndpoint = mqttEndpoint.replace(LOCALHOST, iotServerIP); + } + + String xmppEndpoint = ""; + if (XmppConfig.getInstance().isEnabled()) { + xmppEndpoint = XmppConfig.getInstance().getHost() + ":" + XmppConfig.getInstance().getPort(); + if (xmppEndpoint.contains(LOCALHOST)) { + xmppEndpoint = xmppEndpoint.replace(LOCALHOST, iotServerIP); + } + } + PlatformConfiguration configuration = APIUtil.getTenantConfigurationManagementService().getConfiguration( + CONFIG_TYPE); + if (configuration != null && configuration.getConfiguration() != null && configuration + .getConfiguration().size() > 0) { + List configurations = configuration.getConfiguration(); + for (ConfigurationEntry configurationEntry : configurations) { + switch (configurationEntry.getName()) { + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_HTTPS_EP: + httpsServerEP = (String)configurationEntry.getValue(); + break; + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_HTTP_EP: + httpServerEP = (String)configurationEntry.getValue(); + break; + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_MQTT_EP: + mqttEndpoint = (String)configurationEntry.getValue(); + break; + case VirtualFireAlarmUtilConstants.VIRTUAL_FIREALARM_XMPP_EP: + xmppEndpoint = (String)configurationEntry.getValue(); + break; + } + } + } + String base64EncodedApplicationKey = getBase64EncodedAPIAppKey(apiApplicationKey).trim(); + + Map contextParams = new HashMap<>(); + contextParams.put(VirtualFireAlarmUtilConstants.TENANT_DOMAIN, APIUtil.getTenantDomainOftheUser()); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_OWNER, owner); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_ID, deviceId); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_NAME, deviceName); + contextParams.put(VirtualFireAlarmUtilConstants.HTTPS_EP, httpsServerEP); + contextParams.put(VirtualFireAlarmUtilConstants.HTTP_EP, httpServerEP); + contextParams.put(VirtualFireAlarmUtilConstants.APIM_EP, httpServerEP); + contextParams.put(VirtualFireAlarmUtilConstants.MQTT_EP, mqttEndpoint); + contextParams.put(VirtualFireAlarmUtilConstants.XMPP_EP, "XMPP:" + xmppEndpoint); + contextParams.put(VirtualFireAlarmUtilConstants.API_APPLICATION_KEY, base64EncodedApplicationKey); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_TOKEN, token); + contextParams.put(VirtualFireAlarmUtilConstants.DEVICE_REFRESH_TOKEN, refreshToken); + contextParams.put(VirtualFireAlarmUtilConstants.SERVER_NAME, XmppConfig.getInstance().getServerName() == null + ? "" : XmppConfig.getInstance().getServerName()); + contextParams.put(VirtualFireAlarmUtilConstants.SERVER_JID, XmppConfig.getInstance().getJid() == null + ? "" : XmppConfig.getInstance().getJid()); + + ZipArchive zipFile; + zipFile = getSketchArchive(archivesPath, templateSketchPath, contextParams, deviceName); + return zipFile; + } catch (IOException e) { + throw new DeviceManagementException("Zip File Creation Failed", e); + } catch (ConfigurationManagementException e) { + throw new DeviceManagementException("Failed to retrieve configuration", e); + } + } + + private String getBase64EncodedAPIAppKey(String apiAppCredentialsAsJSONString) { + + JSONObject jsonObject = new JSONObject(apiAppCredentialsAsJSONString); + String consumerKey = jsonObject.get(ApiApplicationConstants.OAUTH_CLIENT_ID).toString(); + String consumerSecret = jsonObject.get(ApiApplicationConstants.OAUTH_CLIENT_SECRET).toString(); + String stringToEncode = consumerKey + ":" + consumerSecret; + return Base64.encodeBase64String(stringToEncode.getBytes()); + } + + public static String getServerUrl() { + String hostName = ServerConfiguration.getInstance().getFirstProperty(HOST_NAME); + try { + if (hostName == null) { + hostName = NetworkUtils.getLocalHostname(); + } + } catch (SocketException e) { + hostName = "localhost"; + log.warn("Failed retrieving the hostname, therefore set to localhost", e); + } + return hostName; + } + + public static ZipArchive getSketchArchive(String archivesPath, String templateSketchPath, Map contextParams + , String zipFileName) + throws DeviceManagementException, IOException { + String sketchPath = CarbonUtils.getCarbonHome() + File.separator + templateSketchPath; + FileUtils.deleteDirectory(new File(archivesPath));//clear directory + FileUtils.deleteDirectory(new File(archivesPath + ".zip"));//clear zip + if (!new File(archivesPath).mkdirs()) { //new dir + String message = "Could not create directory at path: " + archivesPath; + log.error(message); + throw new DeviceManagementException(message); + } + zipFileName = zipFileName + ".zip"; + try { + Map> properties = getProperties(sketchPath + File.separator + "sketch" + ".properties"); + List templateFiles = properties.get("templates"); + + for (String templateFile : templateFiles) { + parseTemplate(templateSketchPath + File.separator + templateFile, archivesPath + File.separator + templateFile, + contextParams); + } + + templateFiles.add("sketch.properties"); // ommit copying the props file + copyFolder(new File(sketchPath), new File(archivesPath), templateFiles); + createZipArchive(archivesPath); + FileUtils.deleteDirectory(new File(archivesPath)); + File zip = new File(archivesPath + ".zip"); + return new org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive(zipFileName, zip); + } catch (IOException ex) { + throw new DeviceManagementException( + "Error occurred when trying to read property " + "file sketch.properties", ex); + } + } + + private static Map> getProperties(String propertyFilePath) throws IOException { + Properties prop = new Properties(); + InputStream input = null; + + try { + + input = new FileInputStream(propertyFilePath); + + // load a properties file + prop.load(input); + Map> properties = new HashMap>(); + + String templates = prop.getProperty("templates"); + List list = new ArrayList(Arrays.asList(templates.split(","))); + properties.put("templates", list); + + final String filename = prop.getProperty("zipfilename"); + list = new ArrayList() {{ + add(filename); + }}; + properties.put("zipfilename", list); + return properties; + + } finally { + if (input != null) { + try { + input.close(); + } catch (IOException e) { + log.error("Failed closing connection", e); + } + } + } + } + + private static void parseTemplate(String srcFile, String dstFile, Map contextParams) throws IOException { + //read from file + FileInputStream inputStream = null; + FileOutputStream outputStream = null; + try { + inputStream = new FileInputStream(srcFile); + outputStream = new FileOutputStream(dstFile); + String content = IOUtils.toString(inputStream, StandardCharsets.UTF_8.toString()); + Iterator iterator = contextParams.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry mapEntry = (Map.Entry) iterator.next(); + content = content.replaceAll("\\$\\{" + mapEntry.getKey() + "\\}", mapEntry.getValue().toString()); + } + IOUtils.write(content, outputStream, StandardCharsets.UTF_8.toString()); + } finally { + if (inputStream != null) { + inputStream.close(); + } + if (outputStream != null) { + outputStream.close(); + } + } + } + + private static void copyFolder(File src, File dest, List excludeFileNames) throws IOException { + + if (src.isDirectory()) { + //if directory not exists, create it + if (!dest.exists() && !dest.mkdirs()) { + String message = "Could not create directory at path: " + dest; + log.error(message); + throw new IOException(message); + } + //list all the directory contents + String files[] = src.list(); + + if (files == null) { + log.warn("There are no files insides the directory " + src.getAbsolutePath()); + return; + } + + for (String file : files) { + //construct the src and dest file structure + File srcFile = new File(src, file); + File destFile = new File(dest, file); + //recursive copy + copyFolder(srcFile, destFile, excludeFileNames); + } + + } else { + for (String fileName : excludeFileNames) { + if (src.getName().equals(fileName)) { + return; + } + } + //if file, then copy it + //Use bytes stream to support all file types + InputStream in = null; + OutputStream out = null; + + try { + in = new FileInputStream(src); + out = new FileOutputStream(dest); + + byte[] buffer = new byte[1024]; + + int length; + //copy the file content in bytes + while ((length = in.read(buffer)) > 0) { + out.write(buffer, 0, length); + } + } finally { + if (in != null) { + in.close(); + } + if (out != null) { + out.close(); + } + } + } + } + + private static boolean createZipArchive(String srcFolder) throws IOException { + BufferedInputStream origin = null; + ZipOutputStream out = null; + + try { + final int BUFFER = 2048; + FileOutputStream dest = new FileOutputStream(new File(srcFolder + ".zip")); + out = new ZipOutputStream(new BufferedOutputStream(dest)); + byte data[] = new byte[BUFFER]; + File subDir = new File(srcFolder); + String subdirList[] = subDir.list(); + if (subdirList == null) { + log.warn("The sub directory " + subDir.getAbsolutePath() + " is empty"); + return false; + } + for (String sd : subdirList) { + // get a list of files from current directory + File f = new File(srcFolder + "/" + sd); + if (f.isDirectory()) { + String files[] = f.list(); + + if (files == null) { + log.warn("The current directory " + f.getAbsolutePath() + " is empty. Has no files"); + return false; + } + + for (int i = 0; i < files.length; i++) { + FileInputStream fi = new FileInputStream(srcFolder + "/" + sd + "/" + files[i]); + origin = new BufferedInputStream(fi, BUFFER); + ZipEntry entry = new ZipEntry(sd + "/" + files[i]); + out.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + out.write(data, 0, count); + out.flush(); + } + + } + } else //it is just a file + { + FileInputStream fi = new FileInputStream(f); + origin = new BufferedInputStream(fi, BUFFER); + ZipEntry entry = new ZipEntry(sd); + out.putNextEntry(entry); + int count; + while ((count = origin.read(data, 0, BUFFER)) != -1) { + out.write(data, 0, count); + out.flush(); + } + } + } + out.flush(); + } finally { + if (origin != null) { + origin.close(); + } + if (out != null) { + out.close(); + } + } + return true; + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java new file mode 100644 index 000000000..586de223c --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.util; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.base.ServerConfiguration; +import org.wso2.carbon.device.mgt.common.DeviceManagementException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive; +import org.wso2.carbon.utils.CarbonUtils; +import org.wso2.carbon.utils.NetworkUtils; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.SocketException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * Provides utility methods required by the device type plugins. + */ +public class Utils { + + public static final String HOST_NAME = "HostName"; + private static final Log log = LogFactory.getLog(Utils.class); + + + +} diff --git a/src/main/webapp/META-INF/permissions.xml b/src/main/webapp/META-INF/permissions.xml new file mode 100644 index 000000000..fbad43f95 --- /dev/null +++ b/src/main/webapp/META-INF/permissions.xml @@ -0,0 +1,52 @@ + + + + + + + + + + Download device + /device-mgt/user/devices + /device/download + GET + virtual_firealarm_user + + + Control Buzz + /device-mgt/user/operation + /device/*/buzz + POST + virtual_firealarm_user + + + Get Stats + /device-mgt/user/stats + /device/stats/* + GET + virtual_firealarm_user + + \ No newline at end of file diff --git a/src/main/webapp/META-INF/webapp-classloading.xml b/src/main/webapp/META-INF/webapp-classloading.xml new file mode 100644 index 000000000..fa4461919 --- /dev/null +++ b/src/main/webapp/META-INF/webapp-classloading.xml @@ -0,0 +1,33 @@ + + + + + + + + + false + + + CXF,Carbon + diff --git a/src/main/webapp/WEB-INF/cxf-servlet.xml b/src/main/webapp/WEB-INF/cxf-servlet.xml new file mode 100644 index 000000000..37a69c268 --- /dev/null +++ b/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..2d1c6e26b --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,42 @@ + + + WSO2 IoT Server + WSO2 IoT Server + + + CXFServlet + org.apache.cxf.transport.servlet.CXFServlet + 1 + + + CXFServlet + /* + + + isAdminService + false + + + doAuthentication + true + + + providerTenantDomain + carbon.super + + + + + managed-api-enabled + true + + + managed-api-owner + admin + + + \ No newline at end of file From aa68d5242e76791cd92687c6120302c0a8386a55 Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Thu, 8 Dec 2016 20:41:44 +0530 Subject: [PATCH 016/432] Commiting permission-scope mapping improvements --- .../service/impl/VirtualFireAlarmService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java index 75db835b7..62be0f612 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -63,7 +63,7 @@ public interface VirtualFireAlarmService { */ @POST @Path("device/{deviceId}/buzz") - @Scope(key = "device:firealarm:enroll", name = "", description = "") + //@Scope(key = "device:firealarm:enroll", name = "", description = "") Response switchBuzzer(@PathParam("deviceId") String deviceId, @FormParam("state") String state); @@ -72,7 +72,7 @@ public interface VirtualFireAlarmService { */ @Path("device/stats/{deviceId}") @GET - @Scope(key = "device:firealarm:enroll", name = "", description = "") + //@Scope(key = "device:firealarm:enroll", name = "", description = "") @Consumes("application/json") @Produces("application/json") Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from, @@ -81,7 +81,7 @@ public interface VirtualFireAlarmService { @Path("device/download") @GET @Produces("application/zip") - @Scope(key = "device:firealarm:enroll", name = "", description = "") + //@Scope(key = "device:firealarm:enroll", name = "", description = "") Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketchType") String sketchType); } From d088aa01ead4bb4ad57488f5c0536d9dd2ee3a71 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Dec 2016 05:43:17 +0000 Subject: [PATCH 017/432] [maven-release-plugin] prepare release v3.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d4573ade7..1bbd4fe79 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.3-SNAPSHOT + 3.0.3 ../pom.xml From e8f1b14b7edd4e3f3785697f0c8205173c28644e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Dec 2016 05:46:04 +0000 Subject: [PATCH 018/432] [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 1bbd4fe79..ffa239d28 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.3 + 3.0.4-SNAPSHOT ../pom.xml From 4e9cc26ea07d8d884b8f86175a3b1ee2e7720383 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 24 Dec 2016 03:13:35 +0000 Subject: [PATCH 019/432] [maven-release-plugin] prepare release v3.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffa239d28..bac409f51 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.4-SNAPSHOT + 3.0.4 ../pom.xml From c15234c371fb0adba6f80d4e21cecc07cad1463f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 24 Dec 2016 03:15:18 +0000 Subject: [PATCH 020/432] [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 bac409f51..59ccc4a79 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.4 + 3.0.5-SNAPSHOT ../pom.xml From fddf834ee7f31b84e1682f4f1113701bcc3dfb17 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 5 Jan 2017 17:57:04 +0530 Subject: [PATCH 021/432] removed provider tenant domain and user from the web.xml --- src/main/webapp/WEB-INF/web.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 2d1c6e26b..d250c67de 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -34,9 +34,5 @@ managed-api-enabled true - - managed-api-owner - admin - \ No newline at end of file From c650c65c3821949ca9146e4eeae9139d150eb46d Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Fri, 6 Jan 2017 10:10:45 +0530 Subject: [PATCH 022/432] Refactored scopes strings --- pom.xml | 6 +- .../service/impl/VirtualFireAlarmService.java | 62 ++++++++++++++++--- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 59ccc4a79..6c9cc0636 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,11 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin provided - + + org.wso2.carbon.devicemgt + org.wso2.carbon.apimgt.annotations + + diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java index 62be0f612..6585280f0 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -18,14 +18,12 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; -import io.swagger.annotations.SwaggerDefinition; -import io.swagger.annotations.Info; -import io.swagger.annotations.ExtensionProperty; -import io.swagger.annotations.Extension; -import io.swagger.annotations.Tag; +import io.swagger.annotations.*; import org.wso2.carbon.apimgt.annotations.api.Scope; +import org.wso2.carbon.apimgt.annotations.api.Scopes; import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; /** @@ -50,8 +48,20 @@ import javax.ws.rs.core.Response; @Tag(name = "virtual_firealarm", description = "") } ) +@Scopes( + scopes = { + @Scope( + name = "Enroll device", + description = "", + key = "perm:firealarm:enroll", + permissions = {"/device-mgt/devices/enroll/firealarm"} + ) + } +) public interface VirtualFireAlarmService { + String SCOPE = "scope"; + /** * This is an API called/used from within the Server(Front-End) or by a device Owner. It sends a control command to * the VirtualFirealarm device to switch `ON` or `OFF` its buzzer. The method also takes in the protocol to be used @@ -63,7 +73,19 @@ public interface VirtualFireAlarmService { */ @POST @Path("device/{deviceId}/buzz") - //@Scope(key = "device:firealarm:enroll", name = "", description = "") + @ApiOperation( + consumes = MediaType.APPLICATION_JSON, + httpMethod = "POST", + value = "Switch Buzzer", + notes = "", + response = Response.class, + tags = "virtual_firealarm", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") + }) + } + ) Response switchBuzzer(@PathParam("deviceId") String deviceId, @FormParam("state") String state); @@ -72,7 +94,19 @@ public interface VirtualFireAlarmService { */ @Path("device/stats/{deviceId}") @GET - //@Scope(key = "device:firealarm:enroll", name = "", description = "") + @ApiOperation( + consumes = MediaType.APPLICATION_JSON, + httpMethod = "GET", + value = "Retrieve Sensor data for the device type", + notes = "", + response = Response.class, + tags = "virtual_firealarm", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") + }) + } + ) @Consumes("application/json") @Produces("application/json") Response getVirtualFirealarmStats(@PathParam("deviceId") String deviceId, @QueryParam("from") long from, @@ -81,7 +115,19 @@ public interface VirtualFireAlarmService { @Path("device/download") @GET @Produces("application/zip") - //@Scope(key = "device:firealarm:enroll", name = "", description = "") + @ApiOperation( + consumes = MediaType.APPLICATION_JSON, + httpMethod = "GET", + value = "Download agent", + notes = "", + response = Response.class, + tags = "virtual_firealarm", + extensions = { + @Extension(properties = { + @ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") + }) + } + ) Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketchType") String sketchType); } From 0aae89e86414299ba8f4a810a58964d855fae06d Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sat, 7 Jan 2017 14:54:46 +0530 Subject: [PATCH 023/432] removed scep impl from virtual fire alarm --- pom.xml | 5 - .../impl/VirtualFireAlarmServiceImpl.java | 65 +++------ .../constants/VirtualFireAlarmConstants.java | 84 ++++++++++++ .../util/VirtualFireAlarmServiceUtils.java | 51 ------- .../util/VirtualFireAlarmUtilConstants.java | 1 - .../service/impl/util/ZipUtil.java | 2 +- .../xmpp/VirtualFirealarmXMPPException.java | 56 ++++++++ .../service/impl/xmpp/XmppAccount.java | 63 +++++++++ .../service/impl/xmpp/XmppConfig.java | 124 ++++++++++++++++++ .../service/impl/xmpp/XmppServerClient.java | 66 ++++++++++ src/main/webapp/WEB-INF/web.xml | 2 + src/main/webapp/WEB-INF/xmpp.properties | 25 ++++ 12 files changed, 439 insertions(+), 105 deletions(-) create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java delete mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java create mode 100644 src/main/webapp/WEB-INF/xmpp.properties diff --git a/pom.xml b/pom.xml index 59ccc4a79..7d00d0033 100644 --- a/pom.xml +++ b/pom.xml @@ -235,11 +235,6 @@ org.wso2.carbon.device.mgt.extensions provided - - org.wso2.carbon.devicemgt-plugins - org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin - provided - 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 c00dd6ab7..f5bb1d84b 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 @@ -18,7 +18,6 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,18 +34,15 @@ 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.iot.virtualfirealarm.plugin.constants.VirtualFireAlarmConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.exception.VirtualFirealarmDeviceMgtPluginException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.VirtualFirealarmSecurityManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppAccount; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppServerClient; +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.exception.VirtualFireAlarmException; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.APIUtil; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.VirtualFireAlarmServiceUtils; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipUtil; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.VirtualFirealarmXMPPException; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.XmppAccount; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.XmppConfig; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.XmppServerClient; import org.wso2.carbon.identity.jwt.client.extension.JWTClient; import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientException; @@ -76,11 +72,8 @@ import java.util.UUID; public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { - private static final String XMPP_PROTOCOL = "XMPP"; - private static final String MQTT_PROTOCOL = "MQTT"; private static final String KEY_TYPE = "PRODUCTION"; private static ApiApplicationKey apiApplicationKey; - private static final String DEVICE_MGT_SCOPE_IDENTIFIER = "device-mgt"; private static Log log = LogFactory.getLog(VirtualFireAlarmServiceImpl.class); @POST @@ -103,10 +96,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); } String resource = VirtualFireAlarmConstants.BULB_CONTEXT.replace("/", ""); - PrivateKey serverPrivateKey = VirtualFirealarmSecurityManager.getServerPrivateKey(); String actualMessage = resource + ":" + switchToState; - String encryptedMsg = VirtualFireAlarmServiceUtils.prepareSecurePayLoad(actualMessage, - serverPrivateKey); String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; @@ -114,7 +104,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { commandOp.setCode("buzz"); commandOp.setType(Operation.Type.COMMAND); commandOp.setEnabled(true); - commandOp.setPayLoad(encryptedMsg); + commandOp.setPayLoad(actualMessage); Properties props = new Properties(); props.setProperty(VirtualFireAlarmConstants.MQTT_ADAPTER_TOPIC_PROPERTY_NAME, publishTopic); @@ -137,10 +127,6 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { } catch (DeviceAccessAuthorizationException e) { log.error(e.getErrorMessage(), e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); - } catch (VirtualFireAlarmException e) { - String errorMsg = "Preparing Secure payload failed for device - [" + deviceId + "]"; - log.error(errorMsg); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); } catch (OperationManagementException e) { String msg = "Error occurred while executing command operation upon ringing the buzzer"; log.error(msg, e); @@ -162,37 +148,22 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { DeviceGroupConstants.Permissions.DEFAULT_MANAGE_POLICIES_PERMISSIONS)) { return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); } - PrivateKey serverPrivateKey = VirtualFirealarmSecurityManager.getServerPrivateKey(); String actualMessage = VirtualFireAlarmConstants.POLICY_CONTEXT + ":" + policy; - String encryptedMsg = VirtualFireAlarmServiceUtils.prepareSecurePayLoad(actualMessage, - serverPrivateKey); Map dynamicProperties = new HashMap<>(); - switch (protocolString) { - case XMPP_PROTOCOL: - dynamicProperties.put(VirtualFireAlarmConstants.JID_PROPERTY_KEY, - deviceId + "@" + XmppConfig.getInstance().getServerName()); - dynamicProperties.put(VirtualFireAlarmConstants.SUBJECT_PROPERTY_KEY, "POLICTY-REQUEST"); - dynamicProperties.put(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, - VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); - APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.XMPP_ADAPTER_NAME, - dynamicProperties, encryptedMsg); - break; - default: - - String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" - + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; - dynamicProperties.put(VirtualFireAlarmConstants.ADAPTER_TOPIC_PROPERTY, publishTopic); - APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.MQTT_ADAPTER_NAME, - dynamicProperties, encryptedMsg); - break; - } + String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" + + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; + dynamicProperties.put(VirtualFireAlarmConstants.ADAPTER_TOPIC_PROPERTY, publishTopic); + dynamicProperties.put(VirtualFireAlarmConstants.JID_PROPERTY_KEY, + deviceId + "@" + XmppConfig.getInstance().getServerName()); + dynamicProperties.put(VirtualFireAlarmConstants.SUBJECT_PROPERTY_KEY, "POLICTY-REQUEST"); + dynamicProperties.put(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, + VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); + APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.XMPP_ADAPTER_NAME, + dynamicProperties, actualMessage); return Response.ok().build(); } catch (DeviceAccessAuthorizationException e) { log.error(e.getErrorMessage(), e); return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); - } catch (VirtualFireAlarmException e) { - log.error(e); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); } } @@ -260,7 +231,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { } catch (UserStoreException ex) { log.error(ex.getMessage(), ex); return Response.status(500).entity(ex.getMessage()).build(); - } catch (VirtualFirealarmDeviceMgtPluginException ex) { + } catch (VirtualFirealarmXMPPException ex) { log.error(ex.getMessage(), ex); return Response.status(500).entity(ex.getMessage()).build(); } @@ -294,7 +265,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { private ZipArchive createDownloadFile(String owner, String deviceName, String sketchType) throws DeviceManagementException, APIManagerException, JWTClientException, - UserStoreException, VirtualFirealarmDeviceMgtPluginException { + UserStoreException, VirtualFirealarmXMPPException { //create new device id String deviceId = shortUUID(); boolean status = register(deviceId, deviceName); 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 new file mode 100644 index 000000000..204ede004 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.constants; + +public class VirtualFireAlarmConstants { + public final static String DEVICE_TYPE = "virtual_firealarm"; + public final static String DEVICE_PLUGIN_DEVICE_NAME = "DEVICE_NAME"; + public final static String DEVICE_PLUGIN_DEVICE_ID = "VIRTUAL_FIREALARM_DEVICE_ID"; + public final static String STATE_ON = "ON"; + public final static String STATE_OFF = "OFF"; + + public static final String URL_PREFIX = "http://"; + public static final String BULB_CONTEXT = "BULB"; + 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 final static String DEVICE_TYPE_PROVIDER_DOMAIN = "carbon.super"; + + //mqtt tranport related constants + public static final String MQTT_ADAPTER_NAME = "virtual_firealarm_mqtt"; + public static final String MQTT_ADAPTER_TYPE = "oauth-mqtt"; + public static final String ADAPTER_TOPIC_PROPERTY = "topic"; + public static final String MQTT_PORT = "\\$\\{mqtt.broker.port\\}"; + public static final String MQTT_BROKER_HOST = "\\$\\{mqtt.broker.host\\}"; + public static final String CARBON_CONFIG_PORT_OFFSET = "Ports.Offset"; + public static final String DEFAULT_CARBON_LOCAL_IP_PROPERTY = "carbon.local.ip"; + public static final int CARBON_DEFAULT_PORT_OFFSET = 0; + public static final int DEFAULT_MQTT_PORT = 1886; + + //xmpp transport related constants + public static final String XMPP_ADAPTER_NAME = "virtual_firealarm_xmpp"; + public static final String XMPP_ADAPTER_TYPE = "xmpp"; + public static final String PASSWORD_PROPERTY_KEY = "password"; + public static final String JID_PROPERTY_KEY = "jid"; + public static final String CLIENT_JID_PROPERTY_KEY = "xmpp.client.jid"; + public static final String SUBJECT_PROPERTY_KEY = "xmpp.client.subject"; + public static final String MESSAGE_TYPE_PROPERTY_KEY = "xmpp.client.messageType"; + public static final String CHAT_PROPERTY_KEY = "chat"; + + public static final String USERNAME_PROPERTY_KEY = "username"; + public static final String DCR_PROPERTY_KEY = "dcrUrl"; + public static final String BROKER_URL_PROPERTY_KEY = "url"; + public static final String SCOPES_PROPERTY_KEY = "scopes"; + public static final String QOS_PROPERTY_KEY = "qos"; + public static final String CLIENT_ID_PROPERTY_KEY = "qos"; + public static final String CLEAR_SESSION_PROPERTY_KEY = "clearSession"; + public static final String TOPIC = "topic"; + public static final String SUBSCRIBED_TOPIC = "carbon.super/virtual_firealarm/+/publisher"; + + public static final String CONTENT_VALIDATION = "contentValidator"; + public static final String CONTENT_TRANSFORMATION = "contentTransformer"; + public static final String RESOURCE = "resource"; + + public static final String JSON_SERIAL_KEY = "SerialNumber"; + public static final String TEMPERATURE_STREAM_DEFINITION = "org.wso2.iot.devices.temperature"; + public static final String JSON_MESSAGE_KEY = "Msg"; + public static final String JSON_SIGNATURE_KEY = "Sig"; + + public static final String HOST_KEY = "host"; + public static final String PORT_KEY = "port"; + + public static final String SERVER_NAME = "serverName"; + + public static final String MQTT_ADAPTER_TOPIC_PROPERTY_NAME = "mqtt.adapter.topic"; + + public static final String APIM_APPLICATION_TOKEN_VALIDITY_PERIOD = "3600"; +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java deleted file mode 100644 index 277000e0f..000000000 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmServiceUtils.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; - -import org.apache.commons.codec.binary.Base64; -import org.json.JSONObject; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.exception.VirtualFirealarmDeviceMgtPluginException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.impl.VirtualFirealarmSecurityManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception.VirtualFireAlarmException; - -import java.lang.*; -import java.security.PrivateKey; - -/** - * - */ -public class VirtualFireAlarmServiceUtils { - - private static final String JSON_MESSAGE_KEY = "Msg"; - private static final String JSON_SIGNATURE_KEY = "Sig"; - - public static String prepareSecurePayLoad(String message, PrivateKey signatureKey) throws VirtualFireAlarmException { - try { - message = Base64.encodeBase64String(message.getBytes()); - String signedPayload = VirtualFirealarmSecurityManager.signMessage(message, signatureKey); - JSONObject jsonPayload = new JSONObject(); - jsonPayload.put(JSON_MESSAGE_KEY, message); - jsonPayload.put(JSON_SIGNATURE_KEY, signedPayload); - return jsonPayload.toString(); - } catch (VirtualFirealarmDeviceMgtPluginException e) { - throw new VirtualFireAlarmException(e); - } - - } -} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java index fae96848d..a255b9537 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java @@ -1,6 +1,5 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; public class VirtualFireAlarmUtilConstants { diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java index 2c6cd2840..39e938f2b 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java @@ -30,7 +30,7 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin.xmpp.XmppConfig; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.XmppConfig; import org.wso2.carbon.utils.CarbonUtils; import org.wso2.carbon.utils.NetworkUtils; diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java new file mode 100644 index 000000000..57d0b8a0b --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; + + +public class VirtualFirealarmXMPPException extends Exception{ + + private String errorMessage; + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + + public VirtualFirealarmXMPPException(String msg, Exception nestedEx) { + super(msg, nestedEx); + setErrorMessage(msg); + } + + public VirtualFirealarmXMPPException(String message, Throwable cause) { + super(message, cause); + setErrorMessage(message); + } + + public VirtualFirealarmXMPPException(String msg) { + super(msg); + setErrorMessage(msg); + } + + public VirtualFirealarmXMPPException() { + super(); + } + + public VirtualFirealarmXMPPException(Throwable cause) { + super(cause); + } + +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java new file mode 100644 index 000000000..162ea957f --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; + +/** + * holds the information related to account that needs to be created on xmpp server. + */ +public class XmppAccount { + + private String username; + private String password; + private String accountName; + private String email; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java new file mode 100644 index 000000000..d96f14c6e --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +public class XmppConfig { + + private String host; + private int port; + private String username; + private String password; + private String serverName; + private boolean enabled; + private String jid; + private static XmppConfig xmppConfig = new XmppConfig(); + private static final Log log = LogFactory.getLog(XmppConfig.class); + private static final String ENABLED = "enabled"; + private static final String USERNAME = "username"; + private static final String PASSWORD = "password"; + private static final String HOST = "host"; + private static final String PORT = "port"; + private static final String SERVERNAME = "serverName"; + private static final String JID = "jid"; + + private XmppConfig() { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + InputStream input = classLoader.getResourceAsStream("../xmpp.properties"); + Properties properties = new Properties(); + try { + properties.load(input); + enabled = Boolean.parseBoolean(properties.getProperty(ENABLED, "false")); + host = properties.getProperty(HOST); + port = Integer.parseInt(properties.getProperty(PORT)); + username = properties.getProperty(USERNAME); + password = properties.getProperty(PASSWORD); + serverName = properties.getProperty(SERVERNAME); + jid = properties.getProperty(JID); + } catch (IOException e) { + log.error("Failed to load xmpp config properties."); + } + } + + public static XmppConfig getInstance() { + return xmppConfig; + } + + public String getHost() { + return host; + } + + public void setHost(String host) { + this.host = host; + } + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getServerName() { + return serverName; + } + + public void setServerName(String serverName) { + this.serverName = serverName; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getJid() { + return jid; + } + + public void setJid(String jid) { + this.jid = jid; + } +} diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java new file mode 100644 index 000000000..7369f90a4 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; + +import org.jivesoftware.smack.AccountManager; +import org.jivesoftware.smack.ConnectionConfiguration; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPException; + +import java.util.HashMap; +import java.util.Map; + +public class XmppServerClient { + + public static boolean createAccount(XmppAccount xmppAccount) throws VirtualFirealarmXMPPException { + if (XmppConfig.getInstance().isEnabled()) { + if (xmppAccount != null) { + try { + ConnectionConfiguration config = new ConnectionConfiguration(XmppConfig.getInstance().getHost(), + XmppConfig.getInstance().getPort(), + "Accounts"); + XMPPConnection xmppConnection = new XMPPConnection(config); + xmppConnection.connect(); + xmppConnection.login(XmppConfig.getInstance().getUsername(), XmppConfig.getInstance().getPassword()); + AccountManager accountManager = xmppConnection.getAccountManager(); + Map attributes = new HashMap<>(); + attributes.put("username", xmppAccount.getUsername()); + attributes.put("password", xmppAccount.getPassword()); + attributes.put("email", xmppAccount.getEmail()); + attributes.put("name", xmppAccount.getAccountName()); + accountManager.createAccount(xmppAccount.getUsername(), xmppAccount.getPassword(), attributes); + xmppConnection.disconnect(); + return true; + } catch (XMPPException e) { + if (e.getXMPPError().getCode() == 409) { + //AccountAlreadyExist + return true; + } else { + throw new VirtualFirealarmXMPPException( + "XMPP account creation failed. Error: " + e.getLocalizedMessage(), e); + } + } + } else { + throw new VirtualFirealarmXMPPException("Invalid XMPP attributes"); + } + } else { + return true; + } + } +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d250c67de..eb4a397bf 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -35,4 +35,6 @@ true + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/xmpp.properties b/src/main/webapp/WEB-INF/xmpp.properties new file mode 100644 index 000000000..3a173cb92 --- /dev/null +++ b/src/main/webapp/WEB-INF/xmpp.properties @@ -0,0 +1,25 @@ +# +# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +#[XMPP-Configurations] +enabled=false +username=admin +password=admin +host=localhost +port=5222 +serverName=localhost +jid=admin@localhost \ No newline at end of file From c3cd99895cf9e2af2ab0aeec4de24fb9e15cc707 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 7 Jan 2017 11:22:33 +0000 Subject: [PATCH 024/432] [maven-release-plugin] prepare release v3.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c9cc0636..47a7e940b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.5-SNAPSHOT + 3.0.5 ../pom.xml From 2f538b3d1f51c5ec5841727841e1336e685345c1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 7 Jan 2017 11:25:51 +0000 Subject: [PATCH 025/432] [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 47a7e940b..a864e988a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.5 + 3.0.6-SNAPSHOT ../pom.xml From 3fa57e1dc61985c7f07910ac65880879a215da8d Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sun, 8 Jan 2017 21:26:14 +0530 Subject: [PATCH 026/432] moved common configuration to global properties for input and output adapters --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index a37fc8ad4..ab9ed68ed 100644 --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,7 @@ org.wso2.carbon.devicemgt org.wso2.carbon.apimgt.annotations + provided From 64aa89906a75ea6b40c889a51ef0bb9105b2affb Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 12 Jan 2017 19:29:59 +0530 Subject: [PATCH 027/432] moved to gateway mode --- src/main/webapp/WEB-INF/web.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index eb4a397bf..4337c5720 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -16,18 +16,10 @@ CXFServlet /* - - isAdminService - false - doAuthentication true - - providerTenantDomain - carbon.super - From 40e16b9d2ed483221ab39809b520b50485f265e3 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Fri, 13 Jan 2017 04:49:35 +0530 Subject: [PATCH 028/432] moved the traffic through the gateway --- .../service/impl/util/ZipUtil.java | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java index 39e938f2b..e9bcb6c60 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java @@ -25,14 +25,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants; -import org.wso2.carbon.base.ServerConfiguration; +import org.wso2.carbon.core.util.Utils; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException; import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.XmppConfig; import org.wso2.carbon.utils.CarbonUtils; -import org.wso2.carbon.utils.NetworkUtils; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -64,10 +63,10 @@ public class ZipUtil { private static final String HTTP_PORT_PROPERTY = "httpPort"; private static final String LOCALHOST = "localhost"; - private static final String HTTPS_PROTOCOL_APPENDER = "https://"; - private static final String HTTP_PROTOCOL_APPENDER = "http://"; + private static final String HTTPS_PROTOCOL_URL = "https://${iot.gateway.host}:${iot.gateway.https.port}"; + private static final String HTTP_PROTOCOL_URL = "http://${iot.gateway.host}:${iot.gateway.http.port}"; private static final String CONFIG_TYPE = "general"; - private static final String DEFAULT_MQTT_ENDPOINT = "tcp://localhost:1886"; + private static final String DEFAULT_MQTT_ENDPOINT = "tcp://${mqtt.broker.host}:${mqtt.broker.port}"; public static final String HOST_NAME = "HostName"; public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName, @@ -83,13 +82,13 @@ public class ZipUtil { try { iotServerIP = getServerUrl(); - String httpsServerPort = System.getProperty(HTTPS_PORT_PROPERTY); - String httpServerPort = System.getProperty(HTTP_PORT_PROPERTY); - String httpsServerEP = HTTPS_PROTOCOL_APPENDER + iotServerIP + ":" + httpsServerPort; - String httpServerEP = HTTP_PROTOCOL_APPENDER + iotServerIP + ":" + httpServerPort; - String mqttEndpoint = DEFAULT_MQTT_ENDPOINT; + String httpsServerEP = Utils.replaceSystemProperty(HTTPS_PROTOCOL_URL); + String httpServerEP = Utils.replaceSystemProperty(HTTP_PROTOCOL_URL); + String mqttEndpoint = Utils.replaceSystemProperty(DEFAULT_MQTT_ENDPOINT); if (mqttEndpoint.contains(LOCALHOST)) { mqttEndpoint = mqttEndpoint.replace(LOCALHOST, iotServerIP); + httpsServerEP = httpsServerEP.replace(LOCALHOST, iotServerIP); + httpServerEP = httpServerEP.replace(LOCALHOST, iotServerIP); } String xmppEndpoint = ""; @@ -161,16 +160,12 @@ public class ZipUtil { } public static String getServerUrl() { - String hostName = ServerConfiguration.getInstance().getFirstProperty(HOST_NAME); try { - if (hostName == null) { - hostName = NetworkUtils.getLocalHostname(); - } + return org.apache.axis2.util.Utils.getIpAddress(); } catch (SocketException e) { - hostName = "localhost"; log.warn("Failed retrieving the hostname, therefore set to localhost", e); + return "localhost"; } - return hostName; } public static ZipArchive getSketchArchive(String archivesPath, String templateSketchPath, Map contextParams From 5f550ac56618ececd6616547c92f4de8d77cf722 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 14 Jan 2017 12:17:46 +0000 Subject: [PATCH 029/432] [maven-release-plugin] prepare release v3.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab9ed68ed..220b86ceb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.6-SNAPSHOT + 3.0.6 ../pom.xml From 4268aed9d241a83fae5d5f07de5e1e0a1848e50c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 14 Jan 2017 12:22:40 +0000 Subject: [PATCH 030/432] [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 220b86ceb..51f74e071 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.6 + 3.0.7-SNAPSHOT ../pom.xml From 11f27d66611a8df64ebf8d2bf34671a8a96bfae7 Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 19 Jan 2017 10:46:42 +0530 Subject: [PATCH 031/432] Adding permission updater for other device types. --- .../constants/VirtualFireAlarmConstants.java | 5 + ...tualFireAlarmPermissionUpdateListener.java | 113 ++++++++++++++++++ src/main/webapp/WEB-INF/web.xml | 4 +- 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java 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 204ede004..31a140efe 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 @@ -81,4 +81,9 @@ public class VirtualFireAlarmConstants { public static final String MQTT_ADAPTER_TOPIC_PROPERTY_NAME = "mqtt.adapter.topic"; public static final String APIM_APPLICATION_TOKEN_VALIDITY_PERIOD = "3600"; + + public static final String PERM_ENROLL_FIRE_ALARM = "/permission/admin/device-mgt/devices/enroll/firealarm"; + public static final String PERM_OWNING_DEVICE_VIEW = "/permission/admin/device-mgt/devices/owning-device/view"; + + public static final String ROLE_NAME = "internal/devicemgt-user"; } diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java new file mode 100644 index 000000000..829868010 --- /dev/null +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.listener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.CarbonConstants; +import org.wso2.carbon.context.PrivilegedCarbonContext; +import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.constants.VirtualFireAlarmConstants; +import org.wso2.carbon.user.api.AuthorizationManager; +import org.wso2.carbon.user.api.Permission; +import org.wso2.carbon.user.api.UserStoreException; +import org.wso2.carbon.user.api.UserStoreManager; +import org.wso2.carbon.user.core.service.RealmService; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +public class VirtualFireAlarmPermissionUpdateListener implements ServletContextListener { + + private static Log log = LogFactory.getLog(VirtualFireAlarmPermissionUpdateListener.class); + + @Override + public void contextInitialized(ServletContextEvent servletContextEvent) { + + UserStoreManager userStoreManager = getUserStoreManager(); + try { + if (userStoreManager != null) { + if (!userStoreManager.isExistingRole(VirtualFireAlarmConstants.ROLE_NAME)) { + userStoreManager.addRole(VirtualFireAlarmConstants.ROLE_NAME, null, getPermissions()); + } else { + getAuthorizationManager().authorizeRole(VirtualFireAlarmConstants.ROLE_NAME, + VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM, CarbonConstants.UI_PERMISSION_ACTION); + getAuthorizationManager().authorizeRole(VirtualFireAlarmConstants.ROLE_NAME, + VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION); + } + } } catch (UserStoreException e) { + log.error("Error while creating a role and adding a user for Raspberry PI.", e); + } + } + + @Override + public void contextDestroyed(ServletContextEvent servletContextEvent) { + + } + + public static UserStoreManager getUserStoreManager() { + RealmService realmService; + UserStoreManager userStoreManager; + try { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); + if (realmService == null) { + String msg = "Realm service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + int tenantId = ctx.getTenantId(); + userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager(); + realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); + } catch (UserStoreException e) { + String msg = "Error occurred while retrieving current user store manager"; + log.error(msg, e); + throw new IllegalStateException(msg); + } + return userStoreManager; + } + + public static AuthorizationManager getAuthorizationManager() { + RealmService realmService; + AuthorizationManager authorizationManager; + try { + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); + if (realmService == null) { + String msg = "Realm service has not initialized."; + log.error(msg); + throw new IllegalStateException(msg); + } + int tenantId = ctx.getTenantId(); + authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); + } catch (UserStoreException e) { + String msg = "Error occurred while retrieving current user store manager"; + log.error(msg, e); + throw new IllegalStateException(msg); + } + return authorizationManager; + } + + private Permission[] getPermissions() { + + Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM, + CarbonConstants.UI_PERMISSION_ACTION); + Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants + .UI_PERMISSION_ACTION); + + return new Permission[]{androidSense, view}; + } + +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 4337c5720..6f59c5a7c 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -27,6 +27,8 @@ true - + + org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.listener.VirtualFireAlarmPermissionUpdateListener + \ No newline at end of file From 6c34c8568d3eba2fa618483c023fa0e57d6dcb37 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 20 Jan 2017 02:03:09 +0000 Subject: [PATCH 032/432] [maven-release-plugin] prepare release v3.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 51f74e071..af5dfbcb1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.7-SNAPSHOT + 3.0.7 ../pom.xml From 988a0a57853b15cfae2e7e3fbcf4961218c18b2a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 20 Jan 2017 02:04:54 +0000 Subject: [PATCH 033/432] [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 af5dfbcb1..6b960c6ff 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.7 + 3.0.8-SNAPSHOT ../pom.xml From 5b27beff740110192ad547cc6b9042441cf9391c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 20 Jan 2017 13:31:44 +0000 Subject: [PATCH 034/432] [maven-release-plugin] prepare release v3.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b960c6ff..a51b5e4cf 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.8-SNAPSHOT + 3.0.8 ../pom.xml From d17ed2377369c160f08ee88783a77874145ea279 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 20 Jan 2017 13:36:50 +0000 Subject: [PATCH 035/432] [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 a51b5e4cf..890431608 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.8 + 3.0.9-SNAPSHOT ../pom.xml From e3a11b0a446f6981acc2b432d7239d3aa7c790e3 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Tue, 24 Jan 2017 19:57:25 +0530 Subject: [PATCH 036/432] resolved merge issues --- .../impl/VirtualFireAlarmServiceImpl.java | 34 ------------------- .../service/impl/util/APIUtil.java | 13 ------- 2 files changed, 47 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 f5bb1d84b..b283bcb3d 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 @@ -134,40 +134,6 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { } } - @PUT - @Path("device/{deviceId}/policy") - public Response updatePolicy(@PathParam("deviceId") String deviceId, @QueryParam("protocol") String protocol, - @FormParam("policy") String policy) { - String protocolString = protocol.toUpperCase(); - if (log.isDebugEnabled()) { - log.debug("Sending request to update-policy of device [" + deviceId + "] via " + protocolString); - } - try { - if (!APIUtil.getDeviceAccessAuthorizationService().isUserAuthorized( - new DeviceIdentifier(deviceId, VirtualFireAlarmConstants.DEVICE_TYPE), - DeviceGroupConstants.Permissions.DEFAULT_MANAGE_POLICIES_PERMISSIONS)) { - return Response.status(Response.Status.UNAUTHORIZED.getStatusCode()).build(); - } - String actualMessage = VirtualFireAlarmConstants.POLICY_CONTEXT + ":" + policy; - Map dynamicProperties = new HashMap<>(); - String publishTopic = APIUtil.getTenantDomainOftheUser() + "/" - + VirtualFireAlarmConstants.DEVICE_TYPE + "/" + deviceId; - dynamicProperties.put(VirtualFireAlarmConstants.ADAPTER_TOPIC_PROPERTY, publishTopic); - dynamicProperties.put(VirtualFireAlarmConstants.JID_PROPERTY_KEY, - deviceId + "@" + XmppConfig.getInstance().getServerName()); - dynamicProperties.put(VirtualFireAlarmConstants.SUBJECT_PROPERTY_KEY, "POLICTY-REQUEST"); - dynamicProperties.put(VirtualFireAlarmConstants.MESSAGE_TYPE_PROPERTY_KEY, - VirtualFireAlarmConstants.CHAT_PROPERTY_KEY); - APIUtil.getOutputEventAdapterService().publish(VirtualFireAlarmConstants.XMPP_ADAPTER_NAME, - dynamicProperties, actualMessage); - return Response.ok().build(); - } catch (DeviceAccessAuthorizationException e) { - log.error(e.getErrorMessage(), e); - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); - } - } - - @Path("device/stats/{deviceId}") @GET @Consumes("application/json") diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java index d302e7281..bbcf1acef 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java @@ -16,7 +16,6 @@ import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorization import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; -import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; import java.util.ArrayList; @@ -169,18 +168,6 @@ public class APIUtil { return deviceAccessAuthorizationService; } - public static OutputEventAdapterService getOutputEventAdapterService() { - PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - OutputEventAdapterService outputEventAdapterService = - (OutputEventAdapterService) ctx.getOSGiService(OutputEventAdapterService.class, null); - if (outputEventAdapterService == null) { - String msg = "Device Authorization service has not initialized."; - log.error(msg); - throw new IllegalStateException(msg); - } - return outputEventAdapterService; - } - public static PlatformConfigurationManagementService getTenantConfigurationManagementService() { PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); PlatformConfigurationManagementService tenantConfigurationManagementService = From fd9dcdd34bff2497fe052cc3a48f5ce6f55f434c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 30 Jan 2017 18:07:24 +0530 Subject: [PATCH 037/432] [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 890431608..bf10608a1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.9-SNAPSHOT + 3.0.9 ../pom.xml From e9cb15d9299da8dbd93cc84c669b1c533c852526 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 30 Jan 2017 18:07:35 +0530 Subject: [PATCH 038/432] [WSO2 Release] [Jenkins #2500] [Release 3.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 bf10608a1..8a3beef41 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.9 + 3.0.10-SNAPSHOT ../pom.xml From 7cc846b125d68721db888329c3e14bd45a591f75 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Jan 2017 12:58:45 +0530 Subject: [PATCH 039/432] [maven-release-plugin] prepare release v3.0.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a3beef41..ee80a070c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.10-SNAPSHOT + 3.0.10 ../pom.xml From f66e3c775b7ae52fbd56099c1de3fc903ad8189b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Jan 2017 12:58:56 +0530 Subject: [PATCH 040/432] [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 ee80a070c..57abd74f8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.10 + 3.0.11-SNAPSHOT ../pom.xml From 73313d2bbce003eab28d5a0d6d907a54960367c9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Feb 2017 16:05:58 +0530 Subject: [PATCH 041/432] [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 57abd74f8..c6aca5bf7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.11-SNAPSHOT + 3.0.11 ../pom.xml From ad8aa806795c5c5842b08a12bf25d7c32f8fcc94 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Feb 2017 16:06:06 +0530 Subject: [PATCH 042/432] [WSO2 Release] [Jenkins #2510] [Release 3.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 c6aca5bf7..024ef6b57 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.11 + 3.0.12-SNAPSHOT ../pom.xml From 82de6712d66b2bef2e843c3de20a8aa6f7ec11f0 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Mon, 6 Feb 2017 03:47:54 +0530 Subject: [PATCH 043/432] fixed few multi tenant issues --- .../service/impl/VirtualFireAlarmServiceImpl.java | 7 +++++-- 1 file changed, 5 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 b283bcb3d..fbebe12f9 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 @@ -172,7 +172,9 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { public Response downloadSketch(@QueryParam("deviceName") String deviceName, @QueryParam("sketchType") String sketchType) { try { - ZipArchive zipFile = createDownloadFile(APIUtil.getAuthenticatedUser(), deviceName, sketchType); + String user = APIUtil.getAuthenticatedUser() + "@" + PrivilegedCarbonContext.getThreadLocalCarbonContext() + .getTenantDomain(); + ZipArchive zipFile = createDownloadFile(user, deviceName, sketchType); Response.ResponseBuilder response = Response.ok(FileUtils.readFileToByteArray(zipFile.getZipFile())); response.status(Response.Status.OK); response.type("application/zip"); @@ -242,7 +244,8 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { if (apiApplicationKey == null) { String applicationUsername = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUserRealm().getRealmConfiguration() - .getAdminUserName(); + .getAdminUserName() + "@" + PrivilegedCarbonContext.getThreadLocalCarbonContext() + .getTenantDomain(); APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService(); String[] tags = {VirtualFireAlarmConstants.DEVICE_TYPE}; apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys( From ee0693e2aed7bbd9e072eded72109d9fb8a3b971 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 9 Feb 2017 09:59:24 +0530 Subject: [PATCH 044/432] added device management api to be default --- .../virtualfirealarm/service/impl/VirtualFireAlarmService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java index 6585280f0..2726948d2 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java @@ -45,7 +45,7 @@ import javax.ws.rs.core.Response; } ), tags = { - @Tag(name = "virtual_firealarm", description = "") + @Tag(name = "virtual_firealarm,device_management", description = "") } ) @Scopes( From d185b1a3314d81fcec51664008135ebf17ebfd01 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 2 Mar 2017 00:32:39 +0530 Subject: [PATCH 045/432] resolved device type download issue in windows OS and added log support for service clients. --- pom.xml | 12 - .../impl/VirtualFireAlarmServiceImpl.java | 10 +- .../service/impl/util/ZipArchive.java | 12 +- .../service/impl/util/ZipUtil.java | 207 +++++++----------- .../service/impl/util/util/Utils.java | 61 ------ 5 files changed, 90 insertions(+), 212 deletions(-) delete mode 100644 src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java diff --git a/pom.xml b/pom.xml index 024ef6b57..9a894884d 100644 --- a/pom.xml +++ b/pom.xml @@ -51,18 +51,6 @@ - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.analytics.data.publisher - provided - - - org.apache.axis2.wso2 - axis2-client - - - - org.wso2.carbon.devicemgt org.wso2.carbon.certificate.mgt.core 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 fbebe12f9..faec317e0 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 @@ -58,15 +58,11 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; -import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.UUID; @@ -175,12 +171,11 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { String user = APIUtil.getAuthenticatedUser() + "@" + PrivilegedCarbonContext.getThreadLocalCarbonContext() .getTenantDomain(); ZipArchive zipFile = createDownloadFile(user, deviceName, sketchType); - Response.ResponseBuilder response = Response.ok(FileUtils.readFileToByteArray(zipFile.getZipFile())); + Response.ResponseBuilder response = Response.ok(zipFile.getZipFileContent()); response.status(Response.Status.OK); response.type("application/zip"); response.header("Content-Disposition", "attachment; filename=\"" + zipFile.getFileName() + "\""); Response resp = response.build(); - zipFile.getZipFile().delete(); return resp; } catch (IllegalArgumentException ex) { return Response.status(400).entity(ex.getMessage()).build();//bad request @@ -193,9 +188,6 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService { } catch (APIManagerException ex) { log.error(ex.getMessage(), ex); return Response.status(500).entity(ex.getMessage()).build(); - } catch (IOException ex) { - log.error(ex.getMessage(), ex); - return Response.status(500).entity(ex.getMessage()).build(); } catch (UserStoreException ex) { log.error(ex.getMessage(), ex); return Response.status(500).entity(ex.getMessage()).build(); diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java index 22fda92b3..2152a5e36 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java @@ -18,23 +18,23 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; -import java.io.File; +import java.util.zip.ZipOutputStream; /** * This is an utility class to hold zip files. */ public class ZipArchive { - private File zipFile = null; + private byte[] zipFileContent = null; private String fileName = null; - public ZipArchive(String fileName, File zipFile) { + public ZipArchive(String fileName, byte[] zipFile) { this.fileName = fileName; - this.zipFile = zipFile; + this.zipFileContent = zipFile; } - public File getZipFile() { - return zipFile; + public byte[] getZipFileContent() { + return zipFileContent; } public String getFileName() { diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java index e9bcb6c60..496d5eb5a 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java @@ -19,7 +19,6 @@ package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,14 +32,12 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp.XmppConfig; import org.wso2.carbon.utils.CarbonUtils; -import java.io.BufferedInputStream; import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.net.SocketException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -59,24 +56,18 @@ import java.util.zip.ZipOutputStream; public class ZipUtil { private static final Log log = LogFactory.getLog(ZipUtil.class); - private static final String HTTPS_PORT_PROPERTY = "httpsPort"; - private static final String HTTP_PORT_PROPERTY = "httpPort"; private static final String LOCALHOST = "localhost"; private static final String HTTPS_PROTOCOL_URL = "https://${iot.gateway.host}:${iot.gateway.https.port}"; private static final String HTTP_PROTOCOL_URL = "http://${iot.gateway.host}:${iot.gateway.http.port}"; private static final String CONFIG_TYPE = "general"; private static final String DEFAULT_MQTT_ENDPOINT = "tcp://${mqtt.broker.host}:${mqtt.broker.port}"; - public static final String HOST_NAME = "HostName"; public ZipArchive createZipFile(String owner, String deviceType, String deviceId, String deviceName, String apiApplicationKey, String token, String refreshToken) throws DeviceManagementException { String sketchFolder = "repository" + File.separator + "resources" + File.separator + "sketches"; - String archivesPath = - CarbonUtils.getCarbonHome() + File.separator + sketchFolder + File.separator + "archives" + - File.separator + deviceId; String templateSketchPath = sketchFolder + File.separator + deviceType; String iotServerIP; @@ -141,7 +132,7 @@ public class ZipUtil { ? "" : XmppConfig.getInstance().getJid()); ZipArchive zipFile; - zipFile = getSketchArchive(archivesPath, templateSketchPath, contextParams, deviceName); + zipFile = getSketchArchive(templateSketchPath, contextParams, deviceName); return zipFile; } catch (IOException e) { throw new DeviceManagementException("Zip File Creation Failed", e); @@ -159,7 +150,7 @@ public class ZipUtil { return Base64.encodeBase64String(stringToEncode.getBytes()); } - public static String getServerUrl() { + private static String getServerUrl() { try { return org.apache.axis2.util.Utils.getIpAddress(); } catch (SocketException e) { @@ -168,33 +159,27 @@ public class ZipUtil { } } - public static ZipArchive getSketchArchive(String archivesPath, String templateSketchPath, Map contextParams + private ZipArchive getSketchArchive(String templateSketchPath, Map contextParams , String zipFileName) throws DeviceManagementException, IOException { String sketchPath = CarbonUtils.getCarbonHome() + File.separator + templateSketchPath; - FileUtils.deleteDirectory(new File(archivesPath));//clear directory - FileUtils.deleteDirectory(new File(archivesPath + ".zip"));//clear zip - if (!new File(archivesPath).mkdirs()) { //new dir - String message = "Could not create directory at path: " + archivesPath; - log.error(message); - throw new DeviceManagementException(message); - } zipFileName = zipFileName + ".zip"; try { Map> properties = getProperties(sketchPath + File.separator + "sketch" + ".properties"); List templateFiles = properties.get("templates"); + List processTemplateFiles = new ArrayList<>(); for (String templateFile : templateFiles) { - parseTemplate(templateSketchPath + File.separator + templateFile, archivesPath + File.separator + templateFile, - contextParams); + TemplateFile tFile = new TemplateFile(); + tFile.setContent(parseTemplate(templateSketchPath + File.separator + templateFile, contextParams)); + tFile.setFileName(templateFile); + processTemplateFiles.add(tFile); } templateFiles.add("sketch.properties"); // ommit copying the props file - copyFolder(new File(sketchPath), new File(archivesPath), templateFiles); - createZipArchive(archivesPath); - FileUtils.deleteDirectory(new File(archivesPath)); - File zip = new File(archivesPath + ".zip"); - return new org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive(zipFileName, zip); + + byte[] zip = createZipArchive(templateSketchPath, processTemplateFiles); + return new ZipArchive(zipFileName, zip); } catch (IOException ex) { throw new DeviceManagementException( "Error occurred when trying to read property " + "file sketch.properties", ex); @@ -206,9 +191,7 @@ public class ZipUtil { InputStream input = null; try { - input = new FileInputStream(propertyFilePath); - // load a properties file prop.load(input); Map> properties = new HashMap>(); @@ -235,148 +218,124 @@ public class ZipUtil { } } - private static void parseTemplate(String srcFile, String dstFile, Map contextParams) throws IOException { + private static String parseTemplate(String srcFile, Map contextParams) throws IOException { //read from file FileInputStream inputStream = null; - FileOutputStream outputStream = null; try { inputStream = new FileInputStream(srcFile); - outputStream = new FileOutputStream(dstFile); String content = IOUtils.toString(inputStream, StandardCharsets.UTF_8.toString()); Iterator iterator = contextParams.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry mapEntry = (Map.Entry) iterator.next(); content = content.replaceAll("\\$\\{" + mapEntry.getKey() + "\\}", mapEntry.getValue().toString()); } - IOUtils.write(content, outputStream, StandardCharsets.UTF_8.toString()); + return content; } finally { if (inputStream != null) { inputStream.close(); } - if (outputStream != null) { - outputStream.close(); - } } } - private static void copyFolder(File src, File dest, List excludeFileNames) throws IOException { - - if (src.isDirectory()) { - //if directory not exists, create it - if (!dest.exists() && !dest.mkdirs()) { - String message = "Could not create directory at path: " + dest; - log.error(message); - throw new IOException(message); - } - //list all the directory contents - String files[] = src.list(); - - if (files == null) { - log.warn("There are no files insides the directory " + src.getAbsolutePath()); - return; - } - - for (String file : files) { - //construct the src and dest file structure - File srcFile = new File(src, file); - File destFile = new File(dest, file); - //recursive copy - copyFolder(srcFile, destFile, excludeFileNames); - } - - } else { - for (String fileName : excludeFileNames) { - if (src.getName().equals(fileName)) { - return; - } - } - //if file, then copy it - //Use bytes stream to support all file types - InputStream in = null; - OutputStream out = null; - - try { - in = new FileInputStream(src); - out = new FileOutputStream(dest); - - byte[] buffer = new byte[1024]; - - int length; - //copy the file content in bytes - while ((length = in.read(buffer)) > 0) { - out.write(buffer, 0, length); - } - } finally { - if (in != null) { - in.close(); - } - if (out != null) { - out.close(); - } - } - } - } - - private static boolean createZipArchive(String srcFolder) throws IOException { - BufferedInputStream origin = null; + private static byte[] createZipArchive(String srcFolder, List processTemplateFiles) throws IOException { ZipOutputStream out = null; - + ByteArrayOutputStream baos = new ByteArrayOutputStream(); try { - final int BUFFER = 2048; - FileOutputStream dest = new FileOutputStream(new File(srcFolder + ".zip")); - out = new ZipOutputStream(new BufferedOutputStream(dest)); - byte data[] = new byte[BUFFER]; + out = new ZipOutputStream(new BufferedOutputStream(baos)); File subDir = new File(srcFolder); String subdirList[] = subDir.list(); if (subdirList == null) { log.warn("The sub directory " + subDir.getAbsolutePath() + " is empty"); - return false; + return null; } for (String sd : subdirList) { // get a list of files from current directory - File f = new File(srcFolder + "/" + sd); + File f = new File(srcFolder + File.separator + sd); if (f.isDirectory()) { String files[] = f.list(); if (files == null) { log.warn("The current directory " + f.getAbsolutePath() + " is empty. Has no files"); - return false; + return null; } for (int i = 0; i < files.length; i++) { - FileInputStream fi = new FileInputStream(srcFolder + "/" + sd + "/" + files[i]); - origin = new BufferedInputStream(fi, BUFFER); - ZipEntry entry = new ZipEntry(sd + "/" + files[i]); - out.putNextEntry(entry); - int count; - while ((count = origin.read(data, 0, BUFFER)) != -1) { - out.write(data, 0, count); - out.flush(); + boolean fileAdded = false; + for (TemplateFile templateFile : processTemplateFiles) { + if (files[i].equals(templateFile.getFileName())) { + ZipEntry entry = new ZipEntry(templateFile.getFileName()); + out.putNextEntry(entry); + out.write(templateFile.getContent().getBytes()); + out.closeEntry(); + fileAdded = true; + break; + } else if (f.getName().equals("sketch.properties")) { + fileAdded = true; + break; + } } + if (fileAdded) { + continue; + } + ZipEntry entry = new ZipEntry(sd + File.separator + files[i]); + out.putNextEntry(entry); + out.write(IOUtils.toByteArray(new FileInputStream(srcFolder + File.separator + sd + + File.separator + files[i]))); + out.closeEntry(); } } else //it is just a file { - FileInputStream fi = new FileInputStream(f); - origin = new BufferedInputStream(fi, BUFFER); + boolean fileAdded = false; + for (TemplateFile templateFile : processTemplateFiles) { + if (f.getName().equals(templateFile.getFileName())) { + ZipEntry entry = new ZipEntry(templateFile.getFileName()); + out.putNextEntry(entry); + out.write(templateFile.getContent().getBytes()); + out.closeEntry(); + fileAdded = true; + break; + } else if (f.getName().equals("sketch.properties")) { + fileAdded = true; + break; + } + } + if (fileAdded) { + continue; + } ZipEntry entry = new ZipEntry(sd); out.putNextEntry(entry); - int count; - while ((count = origin.read(data, 0, BUFFER)) != -1) { - out.write(data, 0, count); - out.flush(); - } + out.write(IOUtils.toByteArray(new FileInputStream(f))); + out.closeEntry(); } } - out.flush(); + out.finish(); } finally { - if (origin != null) { - origin.close(); - } if (out != null) { out.close(); } } - return true; + return baos.toByteArray(); + } + + public class TemplateFile { + private String content; + private String fileName; + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } } } diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java deleted file mode 100644 index 586de223c..000000000 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/util/Utils.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.util; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.base.ServerConfiguration; -import org.wso2.carbon.device.mgt.common.DeviceManagementException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.ZipArchive; -import org.wso2.carbon.utils.CarbonUtils; -import org.wso2.carbon.utils.NetworkUtils; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.SocketException; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -/** - * Provides utility methods required by the device type plugins. - */ -public class Utils { - - public static final String HOST_NAME = "HostName"; - private static final Log log = LogFactory.getLog(Utils.class); - - - -} From 3b21c824bb4aa5933e7dfd867c7ff02d25bce5b1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 13 Mar 2017 17:43:10 +0530 Subject: [PATCH 046/432] [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a894884d..a5b837d77 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.12-SNAPSHOT + 3.0.12 ../pom.xml From 6f9915fda5862c09ce33cbf53c29d89628db4e3c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 13 Mar 2017 17:43:20 +0530 Subject: [PATCH 047/432] [WSO2 Release] [Jenkins #2576] [Release 3.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 a5b837d77..95d70c990 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.12 + 3.0.13-SNAPSHOT ../pom.xml From d36d01efacd1cea683a056f9347e671111ca2636 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 14 Mar 2017 16:48:11 +0530 Subject: [PATCH 048/432] [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95d70c990..5ee0e3ff2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.13-SNAPSHOT + 3.0.13 ../pom.xml From 3aa1ab70d2fa769e7571a97fa136a9228af4f857 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 14 Mar 2017 16:48:21 +0530 Subject: [PATCH 049/432] [WSO2 Release] [Jenkins #2581] [Release 3.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 5ee0e3ff2..13fddc788 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.13 + 3.0.14-SNAPSHOT ../pom.xml From e4fca8e029d643bc3bc1e20850dec4c468cb44ea Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 15 Mar 2017 18:08:26 +0530 Subject: [PATCH 050/432] [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13fddc788..a1ace21a8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.14-SNAPSHOT + 3.0.14 ../pom.xml From ca181f9fba409dfc841441516ed2f441addbd71a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 15 Mar 2017 18:08:34 +0530 Subject: [PATCH 051/432] [WSO2 Release] [Jenkins #2584] [Release 3.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 a1ace21a8..f9de24275 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.14 + 3.0.15-SNAPSHOT ../pom.xml From 3358d71311a828a7684dd0514aeba730a232a0fc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 21 Mar 2017 20:11:33 +0530 Subject: [PATCH 052/432] [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9de24275..d6e77aeec 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.15-SNAPSHOT + 3.0.15 ../pom.xml From e0d11b14181416e67a15d22f3b2d2b67a8008a86 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 21 Mar 2017 20:11:47 +0530 Subject: [PATCH 053/432] [WSO2 Release] [Jenkins #2593] [Release 3.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 d6e77aeec..30a03667f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.15 + 3.0.16-SNAPSHOT ../pom.xml From 45c1ff8464f7e9b7bc9995b91507b2cbb1ff4ff5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 22 Mar 2017 15:53:34 +0530 Subject: [PATCH 054/432] [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30a03667f..3932aa2f3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.16-SNAPSHOT + 3.0.16 ../pom.xml From f8f5b0f6cff0235d271f5b7e5571d0fcf5f4c727 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 22 Mar 2017 15:53:43 +0530 Subject: [PATCH 055/432] [WSO2 Release] [Jenkins #2596] [Release 3.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 3932aa2f3..a3d65d503 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.16 + 3.0.17-SNAPSHOT ../pom.xml From fc1e878a733b9bc520014b6a7015a638cfcb5372 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 23 Mar 2017 13:14:05 +0530 Subject: [PATCH 056/432] [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a3d65d503..0ce378427 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.17-SNAPSHOT + 3.0.17 ../pom.xml From 0d02ecc30a441e757fe981568640abf05ad1a328 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 23 Mar 2017 13:14:16 +0530 Subject: [PATCH 057/432] [WSO2 Release] [Jenkins #2602] [Release 3.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 0ce378427..1c2c5f679 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.17 + 3.0.18-SNAPSHOT ../pom.xml From a09009a62af9960f662422b4ea73a23ccd84a7a3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 24 Mar 2017 15:45:32 +0530 Subject: [PATCH 058/432] [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1c2c5f679..9261f00d8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.18-SNAPSHOT + 3.0.18 ../pom.xml From 2f2a2743e8a4a5a34e4a1e97362c9c98597d0a85 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 24 Mar 2017 15:45:48 +0530 Subject: [PATCH 059/432] [WSO2 Release] [Jenkins #2605] [Release 3.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 9261f00d8..423b3178b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.18 + 3.0.19-SNAPSHOT ../pom.xml From 10304db26dce56153da246b3aa3441b58456819b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 29 Mar 2017 11:13:18 +0530 Subject: [PATCH 060/432] [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 423b3178b..2ef29d7fe 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.19-SNAPSHOT + 3.0.19 ../pom.xml From 678dc5fe940e6e760580b7f7cbe4083d0aa8a00c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 29 Mar 2017 11:13:40 +0530 Subject: [PATCH 061/432] [WSO2 Release] [Jenkins #2612] [Release 3.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 2ef29d7fe..c7263ee23 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.19 + 3.0.20-SNAPSHOT ../pom.xml From 256cbb00f600e553b5780789129b52ed26a9bcad Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 29 Mar 2017 15:22:46 +0530 Subject: [PATCH 062/432] [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7263ee23..71c9bc11a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.20-SNAPSHOT + 3.0.20 ../pom.xml From 1f3e4623471c29953ea01529ddbc2d966c3fc235 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 29 Mar 2017 15:23:01 +0530 Subject: [PATCH 063/432] [WSO2 Release] [Jenkins #2614] [Release 3.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 71c9bc11a..821e40e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.20 + 3.0.21-SNAPSHOT ../pom.xml From 27f0596dc30639177fea44d288c2949382f56899 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 30 Mar 2017 10:31:12 +0530 Subject: [PATCH 064/432] [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 821e40e9d..bb8ae8cfc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.21-SNAPSHOT + 3.0.21 ../pom.xml From ac7e363655a8254b6bab89aebf3974e03e5d77c6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 30 Mar 2017 10:31:28 +0530 Subject: [PATCH 065/432] [WSO2 Release] [Jenkins #2617] [Release 3.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 bb8ae8cfc..749a69188 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.21 + 3.0.22-SNAPSHOT ../pom.xml From 90c4265506196e61ccd761106d3ed2ed4f411673 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 7 Apr 2017 14:56:13 +0530 Subject: [PATCH 066/432] [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 749a69188..8fe96fee1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.22-SNAPSHOT + 3.0.22 ../pom.xml From 11c61bbea82f8307aec56fbded97cccb6f1ec095 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 7 Apr 2017 14:56:29 +0530 Subject: [PATCH 067/432] [WSO2 Release] [Jenkins #2627] [Release 3.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 8fe96fee1..b71f2bfa1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.22 + 3.0.23-SNAPSHOT ../pom.xml From 66dd62bf322bbf1cc582476bd26d31df3971ef84 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 18 Apr 2017 10:32:45 +0530 Subject: [PATCH 068/432] [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b71f2bfa1..062f94457 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.23-SNAPSHOT + 3.0.23 ../pom.xml From 311304994fd486716f0e41a4e11b08f0d1be9be8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 18 Apr 2017 10:33:01 +0530 Subject: [PATCH 069/432] [WSO2 Release] [Jenkins #2640] [Release 3.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 062f94457..a76fab561 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.23 + 3.0.24-SNAPSHOT ../pom.xml From 68bea916a96b219a83b21b6d12df7d2ca1e67f58 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 21 Apr 2017 16:28:35 +0530 Subject: [PATCH 070/432] [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a76fab561..674ed816a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.24-SNAPSHOT + 3.0.24 ../pom.xml From 14e39a11f092c848246023d4245cc97906b27542 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 21 Apr 2017 16:28:48 +0530 Subject: [PATCH 071/432] [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 674ed816a..e5e5b54fa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.24 + 3.0.25-SNAPSHOT ../pom.xml From ffb84fbb3be9f785ad3214d219e00d6d6b774c6e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 24 Apr 2017 17:57:03 +0530 Subject: [PATCH 072/432] [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5e5b54fa..26777df93 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.25-SNAPSHOT + 3.0.25 ../pom.xml From b991c490f102bedc0b1166d65d24cdf08aae8313 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 24 Apr 2017 17:57:19 +0530 Subject: [PATCH 073/432] [WSO2 Release] [Jenkins #2650] [Release 3.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 26777df93..2d152c685 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.25 + 3.0.26-SNAPSHOT ../pom.xml From 22f6f915b50f5c38901e87253c3c0358412cb80b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 25 Apr 2017 11:47:01 +0530 Subject: [PATCH 074/432] [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d152c685..6f13179c7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.26-SNAPSHOT + 3.0.26 ../pom.xml From bb293467683861ccf7433c4ae6be7016cfa248b1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 25 Apr 2017 11:47:30 +0530 Subject: [PATCH 075/432] [WSO2 Release] [Jenkins #2653] [Release 3.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 6f13179c7..4302c8dd7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.26 + 3.0.27-SNAPSHOT ../pom.xml From bb3dbee65490cc62266a03b7669d7831170ba16d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 25 Apr 2017 13:13:43 +0530 Subject: [PATCH 076/432] [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4302c8dd7..4cc09020c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.27-SNAPSHOT + 3.0.27 ../pom.xml From d41a012e78622bfb63ec0f4fe010b68adc1635d1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 25 Apr 2017 13:14:01 +0530 Subject: [PATCH 077/432] [WSO2 Release] [Jenkins #2654] [Release 3.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 4cc09020c..d43e83e7c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.27 + 3.0.28-SNAPSHOT ../pom.xml From c4a7828b5bde42205c7f256f6721f01223b2577d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 28 Apr 2017 08:38:35 +0530 Subject: [PATCH 078/432] [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d43e83e7c..b0bfc371b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.28-SNAPSHOT + 3.0.28 ../pom.xml From e4faa998c536e0f70cbd25eb260d5a1b51b14d4a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 28 Apr 2017 08:38:44 +0530 Subject: [PATCH 079/432] [WSO2 Release] [Jenkins #2659] [Release 3.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 b0bfc371b..1f6215e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.28 + 3.0.29-SNAPSHOT ../pom.xml From 659d511e482ac2fdc8044321fa7cc3c792da3724 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 28 Apr 2017 10:32:49 +0530 Subject: [PATCH 080/432] [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f6215e9f..c50d72bb3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.29-SNAPSHOT + 3.0.29 ../pom.xml From 5b3fbdc20d1ed2fa5c0b870cdc7f14b3682ed6c7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 28 Apr 2017 10:33:09 +0530 Subject: [PATCH 081/432] [WSO2 Release] [Jenkins #2661] [Release 3.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 c50d72bb3..4eeabecbb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.29 + 3.0.30-SNAPSHOT ../pom.xml From dad263d2aedd4bc2a137c804db42ef275f836524 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 1 May 2017 19:56:48 +0530 Subject: [PATCH 082/432] [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4eeabecbb..a6595332a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.30-SNAPSHOT + 3.0.30 ../pom.xml From 1133a5b3d3ae30540830bae46a71b561de79572a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 1 May 2017 19:57:06 +0530 Subject: [PATCH 083/432] [WSO2 Release] [Jenkins #2666] [Release 3.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 a6595332a..967524bb8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.30 + 3.0.31-SNAPSHOT ../pom.xml From afb67abcbbfa6f15aa067c59a5e061a2b9e01b06 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 2 May 2017 20:47:39 +0530 Subject: [PATCH 084/432] [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 967524bb8..a7e69e10c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.31-SNAPSHOT + 3.0.31 ../pom.xml From a3dd43dadfe72ac9950e3f8c7bd98660f70c53e6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 2 May 2017 20:47:53 +0530 Subject: [PATCH 085/432] [WSO2 Release] [Jenkins #2670] [Release 3.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 a7e69e10c..222e7b4c1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.31 + 3.0.32-SNAPSHOT ../pom.xml From e0a389bace096cd126289d69fb77b7383f8c3a36 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 May 2017 12:44:22 +0530 Subject: [PATCH 086/432] [maven-release-plugin] prepare release v3.0.32 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 222e7b4c1..9fad36276 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.32-SNAPSHOT + 3.0.32 ../pom.xml From 466fc301b2f68368def62e5408bc89c36efde1e6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 May 2017 12:44:37 +0530 Subject: [PATCH 087/432] [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 9fad36276..010abb6ca 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.32 + 3.0.33-SNAPSHOT ../pom.xml From c7a5a27838d4158781924b7febc7fc71352315aa Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 May 2017 18:04:39 +0530 Subject: [PATCH 088/432] [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 010abb6ca..e3cde4d77 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.33-SNAPSHOT + 3.0.33 ../pom.xml From 3be64a651b8194f5319cc30d49093290f2560ad4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 May 2017 18:04:55 +0530 Subject: [PATCH 089/432] [WSO2 Release] [Jenkins #2693] [Release 3.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 e3cde4d77..26350cc0b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 3.0.33 + 3.0.34-SNAPSHOT ../pom.xml From bb66da51e6f9cb827cf86059dedf4fb356a9131d Mon Sep 17 00:00:00 2001 From: sinthuja Date: Mon, 8 May 2017 18:08:47 +0530 Subject: [PATCH 090/432] Fixing the warning and mismatch version in the pom.xml. --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 010abb6ca..5680ac699 100644 --- a/pom.xml +++ b/pom.xml @@ -188,11 +188,6 @@ commons-codec commons-codec - - org.wso2.carbon.devicemgt - org.wso2.carbon.apimgt.annotations - provided - org.igniterealtime.smack.wso2 smack From e90f8a851e140d8729caf9e9cb269b49ce3850c9 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Wed, 10 May 2017 13:51:04 +0530 Subject: [PATCH 091/432] 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 092/432] [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 093/432] [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 094/432] [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 095/432] [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 096/432] [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 097/432] [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 098/432] [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 099/432] [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 100/432] [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 101/432] [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 102/432] [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 103/432] [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 104/432] [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 105/432] [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 106/432] [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 107/432] [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 108/432] [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 109/432] [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 110/432] 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 111/432] [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 112/432] [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 113/432] [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 114/432] [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 115/432] [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 116/432] [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 117/432] [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 118/432] [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 119/432] [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 120/432] [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 121/432] [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 122/432] [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 123/432] [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 124/432] [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 125/432] [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 126/432] [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 127/432] [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 128/432] [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 129/432] 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 130/432] [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 131/432] [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 132/432] 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 133/432] [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 134/432] [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 135/432] [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 136/432] [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 137/432] [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 138/432] [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 139/432] [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 140/432] [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 141/432] [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 142/432] [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 143/432] [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 144/432] [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 145/432] [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 146/432] [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 147/432] [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 148/432] [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 149/432] [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 150/432] [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 151/432] [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 152/432] [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 153/432] [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 154/432] [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 155/432] [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 156/432] [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 157/432] [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 158/432] [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 159/432] [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 160/432] [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 161/432] [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 162/432] [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 163/432] [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 164/432] [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 165/432] [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 166/432] [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 167/432] [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 168/432] [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 169/432] [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 170/432] [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 171/432] [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 172/432] [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 173/432] [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 174/432] [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 175/432] [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 176/432] [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 177/432] [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 178/432] [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 179/432] [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 180/432] [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 181/432] [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 182/432] [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 183/432] 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 184/432] [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 185/432] [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 186/432] [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 187/432] [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 188/432] [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 189/432] [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 190/432] [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 191/432] [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 192/432] [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 193/432] [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 From 47ae0aec0b80ec865788b4af1c2b4d12c1e9d415 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 25 Jul 2017 21:12:16 +0530 Subject: [PATCH 194/432] [WSO2 Release] [Jenkins #2891] [Release 4.0.40] prepare release v4.0.40 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 816b026ab..4057bceb1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.40-SNAPSHOT + 4.0.40 ../pom.xml From 594a36e1281d9643a6edf6f743a78258d4b3ea14 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 25 Jul 2017 21:12:31 +0530 Subject: [PATCH 195/432] [WSO2 Release] [Jenkins #2891] [Release 4.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 4057bceb1..ca9ca91af 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.40 + 4.0.41-SNAPSHOT ../pom.xml From 899384e0a5d8ca2f39ab1a10a0c07007f9bcc30e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 26 Jul 2017 21:10:47 +0530 Subject: [PATCH 196/432] [maven-release-plugin]prepare release v4.0.41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca9ca91af..d6c204677 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.41-SNAPSHOT + 4.0.41 ../pom.xml From e580fe2ee7e93a5d70bf7d88bad8987c882b4975 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 26 Jul 2017 21:11:04 +0530 Subject: [PATCH 197/432] [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 d6c204677..d45f4bb6e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.41 + 4.0.42-SNAPSHOT ../pom.xml From 2366517f97f8eed09d754efdae6460a0d772b571 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 31 Jul 2017 08:50:39 +0000 Subject: [PATCH 198/432] [WSO2 Release] [Jenkins #2903] [Release 4.0.42] prepare release v4.0.42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d45f4bb6e..9375fef87 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.42-SNAPSHOT + 4.0.42 ../pom.xml From 0cf084176c3d50edc66924de7644f3a1a4fdada8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 31 Jul 2017 08:50:53 +0000 Subject: [PATCH 199/432] [WSO2 Release] [Jenkins #2903] [Release 4.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 9375fef87..dfe7e5d6d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.42 + 4.0.43-SNAPSHOT ../pom.xml From 1b5e13f44d71371461d11c8587aa36d7e295e74f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 31 Jul 2017 15:07:35 +0000 Subject: [PATCH 200/432] [WSO2 Release] [Jenkins #2906] [Release 4.0.43] prepare release v4.0.43 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dfe7e5d6d..33eeca370 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.43-SNAPSHOT + 4.0.43 ../pom.xml From a2dcbd6938538f64d31c8343d5cbfef77041514e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 31 Jul 2017 15:07:49 +0000 Subject: [PATCH 201/432] [WSO2 Release] [Jenkins #2906] [Release 4.0.43] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33eeca370..c20875bed 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.43 + 4.0.44-SNAPSHOT ../pom.xml From 62b2810de7e23df19fd7a2d1e109bd76f1ebfe8a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 1 Aug 2017 17:30:44 +0530 Subject: [PATCH 202/432] [WSO2 Release] [Jenkins #2909] [Release 4.0.44] prepare release v4.0.44 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c20875bed..c0b7a915b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.44-SNAPSHOT + 4.0.44 ../pom.xml From d54c7d649768a013acaec2428d2af8d6e3ba343a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 1 Aug 2017 17:30:59 +0530 Subject: [PATCH 203/432] [WSO2 Release] [Jenkins #2909] [Release 4.0.44] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0b7a915b..04f8a5e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.44 + 4.0.45-SNAPSHOT ../pom.xml From 354cb234634f9feb41e4af7ebc6e13baa58e92f4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 2 Aug 2017 13:30:46 +0530 Subject: [PATCH 204/432] [WSO2 Release] [Jenkins #2912] [Release 4.0.45] prepare release v4.0.45 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04f8a5e9f..2637e5187 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.45-SNAPSHOT + 4.0.45 ../pom.xml From 69312aa3444a212aca4b380b2a7835bf5f2db775 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 2 Aug 2017 13:30:56 +0530 Subject: [PATCH 205/432] [WSO2 Release] [Jenkins #2912] [Release 4.0.45] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2637e5187..5e5408843 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.45 + 4.0.46-SNAPSHOT ../pom.xml From 4bee59965e9b2967b904f63bb5fe122bcb85b007 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 2 Aug 2017 15:26:25 +0530 Subject: [PATCH 206/432] [WSO2 Release] [Jenkins #2913] [Release 4.0.46] prepare release v4.0.46 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e5408843..710804239 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.46-SNAPSHOT + 4.0.46 ../pom.xml From 75f9423d4ed56447863c4d55ad9831a6c14c19a3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 2 Aug 2017 15:26:35 +0530 Subject: [PATCH 207/432] [WSO2 Release] [Jenkins #2913] [Release 4.0.46] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 710804239..47c8e16b0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.46 + 4.0.47-SNAPSHOT ../pom.xml From 16204941a2b324ed52994b0aad69b22450c4ce48 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 2 Aug 2017 17:48:43 +0000 Subject: [PATCH 208/432] [WSO2 Release] [Jenkins #2915] [Release 4.0.47] prepare release v4.0.47 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47c8e16b0..771d47990 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.47-SNAPSHOT + 4.0.47 ../pom.xml From 104a51e1ab0020ea42ae827b4851c2190f9f6096 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 2 Aug 2017 17:50:09 +0000 Subject: [PATCH 209/432] [WSO2 Release] [Jenkins #2915] [Release 4.0.47] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 771d47990..284ce1f6d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.47 + 4.0.48-SNAPSHOT ../pom.xml From 405c4549aade08281bfeabd17316d7747a1873fb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 3 Aug 2017 15:36:36 +0000 Subject: [PATCH 210/432] [WSO2 Release] [Jenkins #2918] [Release 4.0.48] prepare release v4.0.48 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 284ce1f6d..32e2c3df5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.48-SNAPSHOT + 4.0.48 ../pom.xml From 446105a233dd3f4e5a4ca30bb4d22e6a016ff24c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 3 Aug 2017 15:36:55 +0000 Subject: [PATCH 211/432] [WSO2 Release] [Jenkins #2918] [Release 4.0.48] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32e2c3df5..94e0c18af 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.48 + 4.0.49-SNAPSHOT ../pom.xml From a9af84966b8122eb82370874e7fc4d76fcc9058f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 5 Aug 2017 09:31:35 +0000 Subject: [PATCH 212/432] [WSO2 Release] [Jenkins #2922] [Release 4.0.49] prepare release v4.0.49 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94e0c18af..3fe545f02 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.49-SNAPSHOT + 4.0.49 ../pom.xml From 60360b5f38b8d9e796edc31c1d85d59583564992 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 5 Aug 2017 09:31:52 +0000 Subject: [PATCH 213/432] [WSO2 Release] [Jenkins #2922] [Release 4.0.49] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fe545f02..3819d9dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.49 + 4.0.50-SNAPSHOT ../pom.xml From 6411e7cdb6545b8546fef48d31daee9e5a3f66c0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 7 Aug 2017 17:33:47 +0000 Subject: [PATCH 214/432] [WSO2 Release] [Jenkins #2926] [Release 4.0.50] prepare release v4.0.50 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3819d9dcd..5c127fc51 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.50-SNAPSHOT + 4.0.50 ../pom.xml From d1c5d46131394b687d65f209abb7ea22237d7992 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 7 Aug 2017 17:35:11 +0000 Subject: [PATCH 215/432] [WSO2 Release] [Jenkins #2926] [Release 4.0.50] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c127fc51..ff35c1404 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.50 + 4.0.51-SNAPSHOT ../pom.xml From b11dbf431167ca957ca138118089926090ea25d1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 8 Aug 2017 00:28:17 +0530 Subject: [PATCH 216/432] [WSO2 Release] [Jenkins #2927] [Release 4.0.51] prepare release v4.0.51 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff35c1404..c380fb5b8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.51-SNAPSHOT + 4.0.51 ../pom.xml From 2de0d8a6eeaa59f8f9ff78007e25c0c100dce48d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 8 Aug 2017 00:28:33 +0530 Subject: [PATCH 217/432] [WSO2 Release] [Jenkins #2927] [Release 4.0.51] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c380fb5b8..2ca1e2afc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.51 + 4.0.52-SNAPSHOT ../pom.xml From 31dea577c25945fe68243d1387b96c60c7df2efe Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 8 Aug 2017 04:00:46 +0530 Subject: [PATCH 218/432] [WSO2 Release] [Jenkins #2928] [Release 4.0.52] prepare release v4.0.52 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ca1e2afc..f3da22ba2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.52-SNAPSHOT + 4.0.52 ../pom.xml From c07c944c3b9c01cbe827d2467ec7e3b574f1c2fc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 8 Aug 2017 04:00:56 +0530 Subject: [PATCH 219/432] [WSO2 Release] [Jenkins #2928] [Release 4.0.52] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3da22ba2..29eb9f894 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.52 + 4.0.53-SNAPSHOT ../pom.xml From 7b7d0d90c68abe0f6bc3760ff0e5f17d5620c9d9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 9 Aug 2017 11:45:00 +0530 Subject: [PATCH 220/432] [WSO2 Release] [Jenkins #2935] [Release 4.0.53] prepare release v4.0.53 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29eb9f894..66616e5db 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.53-SNAPSHOT + 4.0.53 ../pom.xml From 5bd618121efcdd63a8b0bd7ebe11619f0a5cc3a3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 9 Aug 2017 11:45:11 +0530 Subject: [PATCH 221/432] [WSO2 Release] [Jenkins #2935] [Release 4.0.53] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66616e5db..7fac9d7d7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.53 + 4.0.54-SNAPSHOT ../pom.xml From b887752babcb0dc6f06d05ca296647e3a0132b32 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 10 Aug 2017 14:14:47 +0000 Subject: [PATCH 222/432] [maven-release-plugin]prepare release v4.0.54 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7fac9d7d7..ef6028c6d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.54-SNAPSHOT + 4.0.54 ../pom.xml From 58fb813675622d23fa4f85a2f310c7786eac47f1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 10 Aug 2017 14:15:04 +0000 Subject: [PATCH 223/432] [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 ef6028c6d..8d10f54e2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.54 + 4.0.55-SNAPSHOT ../pom.xml From 1c6d6fc4c26188f433810a7d0f2790c3340ff2cc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 11 Aug 2017 07:51:08 +0000 Subject: [PATCH 224/432] [WSO2 Release] [Jenkins #2943] [Release 4.0.55] prepare release v4.0.55 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d10f54e2..937fd9941 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.55-SNAPSHOT + 4.0.55 ../pom.xml From 6d8e6acbd25f4f53d69d4e12d87159e513dbafe8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 11 Aug 2017 07:51:22 +0000 Subject: [PATCH 225/432] [WSO2 Release] [Jenkins #2943] [Release 4.0.55] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 937fd9941..eccd7affd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.55 + 4.0.56-SNAPSHOT ../pom.xml From dd8912fe91d5810821c718da46582c5d3cbff25b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Aug 2017 05:35:35 +0000 Subject: [PATCH 226/432] [WSO2 Release] [Jenkins #2956] [Release 4.0.56] prepare release v4.0.56 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eccd7affd..d5651daa3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.56-SNAPSHOT + 4.0.56 ../pom.xml From 24a608d48ccd1ead5ff9df38f07eaa0947962754 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Aug 2017 05:35:49 +0000 Subject: [PATCH 227/432] [WSO2 Release] [Jenkins #2956] [Release 4.0.56] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5651daa3..a332b7c32 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.56 + 4.0.57-SNAPSHOT ../pom.xml From 6bf943a5912600a0aba22031e200ddd24d6dfa45 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Aug 2017 11:32:54 +0000 Subject: [PATCH 228/432] [WSO2 Release] [Jenkins #2958] [Release 4.0.57] prepare release v4.0.57 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a332b7c32..5550b31ea 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.57-SNAPSHOT + 4.0.57 ../pom.xml From 8a899691949bb6a0a8ab7be6e3aa8460c6964318 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Aug 2017 11:33:09 +0000 Subject: [PATCH 229/432] [WSO2 Release] [Jenkins #2958] [Release 4.0.57] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5550b31ea..610ee14c3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.57 + 4.0.58-SNAPSHOT ../pom.xml From 3d1981dbd3213bc45bd9c0476235f2c8845b7ca2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Aug 2017 18:38:19 +0000 Subject: [PATCH 230/432] [WSO2 Release] [Jenkins #2960] [Release 4.0.58] prepare release v4.0.58 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 610ee14c3..a00d2a374 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.58-SNAPSHOT + 4.0.58 ../pom.xml From 1f5283b0679cd8143267097da865135ee7134258 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Aug 2017 18:38:33 +0000 Subject: [PATCH 231/432] [WSO2 Release] [Jenkins #2960] [Release 4.0.58] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a00d2a374..efe051715 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.58 + 4.0.59-SNAPSHOT ../pom.xml From e9d148445fbda18cf411c64e5cdf7df7b6622758 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 23 Aug 2017 12:12:47 +0000 Subject: [PATCH 232/432] [WSO2 Release] [Jenkins #2963] [Release 4.0.59] prepare release v4.0.59 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efe051715..93848f5cf 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.59-SNAPSHOT + 4.0.59 ../pom.xml From ff6e442992f2b792bdf7111a9afcbc407319b5fb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 23 Aug 2017 12:13:02 +0000 Subject: [PATCH 233/432] [WSO2 Release] [Jenkins #2963] [Release 4.0.59] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93848f5cf..16dd4d425 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.59 + 4.0.60-SNAPSHOT ../pom.xml From a1ef705b282fb3906f91a5593cd804b5185942bb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 24 Aug 2017 10:04:52 +0000 Subject: [PATCH 234/432] [WSO2 Release] [Jenkins #2966] [Release 4.0.60] prepare release v4.0.60 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 16dd4d425..ea049c500 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.60-SNAPSHOT + 4.0.60 ../pom.xml From 329d623e29af51174b4517afa5060bbca4e416b7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 24 Aug 2017 10:05:06 +0000 Subject: [PATCH 235/432] [WSO2 Release] [Jenkins #2966] [Release 4.0.60] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea049c500..317fc52fa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.60 + 4.0.61-SNAPSHOT ../pom.xml From 7ab2c53433bbd32f4e9d718a6c5c33412d01d61a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 28 Aug 2017 08:56:42 +0000 Subject: [PATCH 236/432] [WSO2 Release] [Jenkins #2972] [Release 4.0.61] prepare release v4.0.61 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 317fc52fa..18429b5a1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.61-SNAPSHOT + 4.0.61 ../pom.xml From 3cae4a86437b1e2c6992cc1a162154ef7fdfdbfc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 28 Aug 2017 08:56:56 +0000 Subject: [PATCH 237/432] [WSO2 Release] [Jenkins #2972] [Release 4.0.61] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 18429b5a1..ac72197c4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.61 + 4.0.62-SNAPSHOT ../pom.xml From 9a9f6fcb3dba181134bc971d45824e7518c6add0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 29 Aug 2017 07:17:03 +0000 Subject: [PATCH 238/432] [WSO2 Release] [Jenkins #2975] [Release 4.0.62] prepare release v4.0.62 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac72197c4..8fb764f4d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.62-SNAPSHOT + 4.0.62 ../pom.xml From 7047c161e0e204028246518829dd1c6edf5a3dca Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 29 Aug 2017 07:17:18 +0000 Subject: [PATCH 239/432] [WSO2 Release] [Jenkins #2975] [Release 4.0.62] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fb764f4d..3d4fb8109 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.62 + 4.0.63-SNAPSHOT ../pom.xml From 3d175f73087b7e4ac3e30eac13dde6c49befe652 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 29 Aug 2017 09:22:17 +0000 Subject: [PATCH 240/432] [WSO2 Release] [Jenkins #2977] [Release 4.0.63] prepare release v4.0.63 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d4fb8109..8ef2a7680 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.63-SNAPSHOT + 4.0.63 ../pom.xml From b35dbdcd922cf16b706d10efe9a7c167090ac56a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 29 Aug 2017 09:22:33 +0000 Subject: [PATCH 241/432] [WSO2 Release] [Jenkins #2977] [Release 4.0.63] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ef2a7680..49737273a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.63 + 4.0.64-SNAPSHOT ../pom.xml From 3ec1c5bcd37b1273248e0dc07ecfa73cf0fbaebc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 29 Aug 2017 10:42:31 +0000 Subject: [PATCH 242/432] [WSO2 Release] [Jenkins #2979] [Release 4.0.64] prepare release v4.0.64 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49737273a..ac56fbc7f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.64-SNAPSHOT + 4.0.64 ../pom.xml From 7e8b33c72ac8c630b340a3a3b45c3c5d187dfc65 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 29 Aug 2017 10:42:45 +0000 Subject: [PATCH 243/432] [WSO2 Release] [Jenkins #2979] [Release 4.0.64] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac56fbc7f..e7f4e92c9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.64 + 4.0.65-SNAPSHOT ../pom.xml From e5fb58d434e4aaa814721dcc79c4515641a86945 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 30 Aug 2017 06:07:01 +0000 Subject: [PATCH 244/432] [WSO2 Release] [Jenkins #2982] [Release 4.0.65] prepare release v4.0.65 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 089c16234..99760ab75 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.65-SNAPSHOT + 4.0.65 ../pom.xml From 91aa1bc32fe8d78c338f9f7b4c33251ad274d933 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 30 Aug 2017 06:07:16 +0000 Subject: [PATCH 245/432] [WSO2 Release] [Jenkins #2982] [Release 4.0.65] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99760ab75..dffaa4891 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.65 + 4.0.66-SNAPSHOT ../pom.xml From 2c8c82f7d3603d6e1c1f4978c1cbf36cf8137431 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 08:49:32 +0000 Subject: [PATCH 246/432] [WSO2 Release] [Jenkins #2985] [Release 4.0.66] prepare release v4.0.66 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dffaa4891..0a6705f6f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.66-SNAPSHOT + 4.0.66 ../pom.xml From c8828bdeec53f550aad03808e041e682aa4286dd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 08:49:50 +0000 Subject: [PATCH 247/432] [WSO2 Release] [Jenkins #2985] [Release 4.0.66] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a6705f6f..137d2910f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.66 + 4.0.67-SNAPSHOT ../pom.xml From 62f0966436e2f6f07e20b5b4ac0450ac1226fb28 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 10:06:54 +0000 Subject: [PATCH 248/432] [WSO2 Release] [Jenkins #2986] [Release 4.0.67] prepare release v4.0.67 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 137d2910f..8ccebf4d5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.67-SNAPSHOT + 4.0.67 ../pom.xml From 1a1c15846d54ca4665111f27c613fa15c09052a8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 10:07:07 +0000 Subject: [PATCH 249/432] [WSO2 Release] [Jenkins #2986] [Release 4.0.67] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ccebf4d5..720134a24 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.67 + 4.0.68-SNAPSHOT ../pom.xml From 9be8a7c998f61f4c47ab5f8b0f39c3bc011e15e8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 10:44:11 +0000 Subject: [PATCH 250/432] [WSO2 Release] [Jenkins #2987] [Release 4.0.68] prepare release v4.0.68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 720134a24..e2e51c498 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.68-SNAPSHOT + 4.0.68 ../pom.xml From 6488d29e4d063d8a6b48f878e89896ecbb8adb67 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 10:44:25 +0000 Subject: [PATCH 251/432] [WSO2 Release] [Jenkins #2987] [Release 4.0.68] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2e51c498..5c2a362e7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.68 + 4.0.69-SNAPSHOT ../pom.xml From dcac4181bb66c7ba4f5565a0ec4ad7ffe08a60ff Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 11:28:36 +0000 Subject: [PATCH 252/432] [WSO2 Release] [Jenkins #2988] [Release 4.0.69] prepare release v4.0.69 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c2a362e7..7075360d6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.69-SNAPSHOT + 4.0.69 ../pom.xml From 8b10a1b74282b0e479d8f9ba2ba8c5b769b55e41 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 11:28:49 +0000 Subject: [PATCH 253/432] [WSO2 Release] [Jenkins #2988] [Release 4.0.69] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7075360d6..7c9ea94e9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.69 + 4.0.70-SNAPSHOT ../pom.xml From e58d6f9cce112ee93b26b4058ebe8950d9413532 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 13:01:02 +0000 Subject: [PATCH 254/432] [WSO2 Release] [Jenkins #2989] [Release 4.0.70] prepare release v4.0.70 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c9ea94e9..6d79b5999 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.70-SNAPSHOT + 4.0.70 ../pom.xml From 54fe9e497ac56d354b0cc716470b57a902b86ec4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 13:01:15 +0000 Subject: [PATCH 255/432] [WSO2 Release] [Jenkins #2989] [Release 4.0.70] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d79b5999..0bc8aec66 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.70 + 4.0.71-SNAPSHOT ../pom.xml From 3cc79fbac358e18fefeb32e02625eab4581c393e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 13:38:10 +0000 Subject: [PATCH 256/432] [WSO2 Release] [Jenkins #2990] [Release 4.0.71] prepare release v4.0.71 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bc8aec66..3b1c4cfc0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.71-SNAPSHOT + 4.0.71 ../pom.xml From e1189de9f57d573d4e7f36a64e39a3d2406e04b2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2017 13:38:23 +0000 Subject: [PATCH 257/432] [WSO2 Release] [Jenkins #2990] [Release 4.0.71] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b1c4cfc0..8ab236ecb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.71 + 4.0.72-SNAPSHOT ../pom.xml From 5462aa9cac5e9a45e5f842c9c51cbc587abbc3c1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 1 Sep 2017 08:00:57 +0000 Subject: [PATCH 258/432] [WSO2 Release] [Jenkins #2993] [Release 4.0.72] prepare release v4.0.72 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ab236ecb..a5b83e8ea 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.72-SNAPSHOT + 4.0.72 ../pom.xml From 877c00bfa15806dd73529e64b523f998d11cee32 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 1 Sep 2017 08:01:13 +0000 Subject: [PATCH 259/432] [WSO2 Release] [Jenkins #2993] [Release 4.0.72] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5b83e8ea..af54731c4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.72 + 4.0.73-SNAPSHOT ../pom.xml From 9f7254ff78f59a275721e0c6223db2d77912bb5b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 7 Sep 2017 12:21:19 +0000 Subject: [PATCH 260/432] [WSO2 Release] [Jenkins #3001] [Release 4.0.73] prepare release v4.0.73 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af54731c4..458fbcd6c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.73-SNAPSHOT + 4.0.73 ../pom.xml From 0b680c6e3ca6066fff6b0d5182d0b07a78ccbdab Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 7 Sep 2017 12:21:32 +0000 Subject: [PATCH 261/432] [WSO2 Release] [Jenkins #3001] [Release 4.0.73] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 458fbcd6c..a5048f00c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.73 + 4.0.74-SNAPSHOT ../pom.xml From 87a60753c175a10b08e4eeebbaebc060b55dedd5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 7 Sep 2017 13:01:27 +0000 Subject: [PATCH 262/432] [WSO2 Release] [Jenkins #3002] [Release 4.0.74] prepare release v4.0.74 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5048f00c..dc7671d4b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.74-SNAPSHOT + 4.0.74 ../pom.xml From ce2f916dbae7d845698101d76fe0be0317bb98e2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 7 Sep 2017 13:01:41 +0000 Subject: [PATCH 263/432] [WSO2 Release] [Jenkins #3002] [Release 4.0.74] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc7671d4b..5d570523f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.74 + 4.0.75-SNAPSHOT ../pom.xml From 44277016f24d616ec00372444ce875b07049e709 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 8 Sep 2017 11:01:36 +0000 Subject: [PATCH 264/432] [WSO2 Release] [Jenkins #3005] [Release 4.0.75] prepare release v4.0.75 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d570523f..a7317666d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.75-SNAPSHOT + 4.0.75 ../pom.xml From 456b5e9ec089388e2367d9af6fe299622f6d4483 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 8 Sep 2017 11:01:50 +0000 Subject: [PATCH 265/432] [WSO2 Release] [Jenkins #3005] [Release 4.0.75] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7317666d..3463ecbb8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.75 + 4.0.76-SNAPSHOT ../pom.xml From 80a361d80230cebffe987fdc859d54f5a2961175 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 8 Sep 2017 12:38:16 +0000 Subject: [PATCH 266/432] [WSO2 Release] [Jenkins #3007] [Release 4.0.76] prepare release v4.0.76 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3463ecbb8..37f1f84e7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.76-SNAPSHOT + 4.0.76 ../pom.xml From 084313a5de3a3d7fdec7fbfe1e68d09dbd31b2cd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 8 Sep 2017 12:38:30 +0000 Subject: [PATCH 267/432] [WSO2 Release] [Jenkins #3007] [Release 4.0.76] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37f1f84e7..e290e8d21 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.76 + 4.0.77-SNAPSHOT ../pom.xml From dc64de0b8f78ac47b2673c53901d5b3451b33311 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 11 Sep 2017 09:16:54 +0000 Subject: [PATCH 268/432] [WSO2 Release] [Jenkins #3009] [Release 4.0.77] prepare release v4.0.77 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e290e8d21..ad0b5c020 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.77-SNAPSHOT + 4.0.77 ../pom.xml From 7f3c0ddf84ffcb142dd87c6e0daf3ff06e01e575 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 11 Sep 2017 09:17:08 +0000 Subject: [PATCH 269/432] [WSO2 Release] [Jenkins #3009] [Release 4.0.77] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad0b5c020..b16a0c534 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.77 + 4.0.78-SNAPSHOT ../pom.xml From ce6d2744798e2ae2a20def2cdfcc0306b9dc67a7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 14 Sep 2017 07:20:51 +0000 Subject: [PATCH 270/432] [WSO2 Release] [Jenkins #3011] [Release 4.0.78] prepare release v4.0.78 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b16a0c534..ac191b4eb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.78-SNAPSHOT + 4.0.78 ../pom.xml From c54213f72a29b022f7afdfc83169e94f1a674786 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 14 Sep 2017 07:21:05 +0000 Subject: [PATCH 271/432] [WSO2 Release] [Jenkins #3011] [Release 4.0.78] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac191b4eb..1ec7dcb4f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.78 + 4.0.79-SNAPSHOT ../pom.xml From f79986f6fabc018d597ab379d71cf43870e8839c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 14 Sep 2017 10:24:29 +0000 Subject: [PATCH 272/432] [WSO2 Release] [Jenkins #3013] [Release 4.0.79] prepare release v4.0.79 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ec7dcb4f..173920e29 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.79-SNAPSHOT + 4.0.79 ../pom.xml From 8e406b5f98fea729cd8138c4064dd2f2689516f7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 14 Sep 2017 10:24:44 +0000 Subject: [PATCH 273/432] [WSO2 Release] [Jenkins #3013] [Release 4.0.79] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 173920e29..27f1978f5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.79 + 4.0.80-SNAPSHOT ../pom.xml From f6e9c35613527dd79b4a0ab7f40e1ff9ba85926c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Sep 2017 12:19:50 +0000 Subject: [PATCH 274/432] [WSO2 Release] [Jenkins #3015] [Release 4.0.80] prepare release v4.0.80 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27f1978f5..7b4eac57d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.80-SNAPSHOT + 4.0.80 ../pom.xml From 3944ce712be685c04d872c377ee63e7e0c444c7b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Sep 2017 12:20:04 +0000 Subject: [PATCH 275/432] [WSO2 Release] [Jenkins #3015] [Release 4.0.80] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b4eac57d..8d4ab5718 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.80 + 4.0.81-SNAPSHOT ../pom.xml From a11e80b8d9c99c841cfdfa229809f66493f0a08b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 19 Sep 2017 09:00:19 +0000 Subject: [PATCH 276/432] [WSO2 Release] [Jenkins #3017] [Release 4.0.81] prepare release v4.0.81 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d4ab5718..c29b05e63 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.81-SNAPSHOT + 4.0.81 ../pom.xml From d1df2e2caf412b15647d948a89f6a54fc15a15cd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 19 Sep 2017 09:00:33 +0000 Subject: [PATCH 277/432] [WSO2 Release] [Jenkins #3017] [Release 4.0.81] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c29b05e63..7565fcf30 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.81 + 4.0.82-SNAPSHOT ../pom.xml From 2dc37fe447d2a537560188c020f41ddf54404ff9 Mon Sep 17 00:00:00 2001 From: Ace Date: Thu, 21 Sep 2017 12:00:26 +0530 Subject: [PATCH 278/432] correcting pom versions and bumping APIM dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d4ab5718..7565fcf30 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.81-SNAPSHOT + 4.0.82-SNAPSHOT ../pom.xml From 258c0696b02f00b14a5a08fe4f95e27f74e0a673 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Sep 2017 10:51:08 +0000 Subject: [PATCH 279/432] [WSO2 Release] [Jenkins #3019] [Release 4.0.82] prepare release v4.0.82 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7565fcf30..3716625e7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.82-SNAPSHOT + 4.0.82 ../pom.xml From 116bb9915245a16a96f154ff6e8b128a7cfc3487 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Sep 2017 10:51:23 +0000 Subject: [PATCH 280/432] [WSO2 Release] [Jenkins #3019] [Release 4.0.82] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3716625e7..a853bee85 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.82 + 4.0.83-SNAPSHOT ../pom.xml From 7c900f29356dd8980317a5cdf9df9891b5c97020 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 22 Sep 2017 06:11:46 +0000 Subject: [PATCH 281/432] [WSO2 Release] [Jenkins #3021] [Release 4.0.83] prepare release v4.0.83 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a853bee85..cdd734934 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.83-SNAPSHOT + 4.0.83 ../pom.xml From 4c6cc3c525c42dcafb7dd637573372c0fc328775 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 22 Sep 2017 06:11:59 +0000 Subject: [PATCH 282/432] [WSO2 Release] [Jenkins #3021] [Release 4.0.83] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cdd734934..b15bff139 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.83 + 4.0.84-SNAPSHOT ../pom.xml From 298b35436febdcb233b97c392d781808d46ca366 Mon Sep 17 00:00:00 2001 From: megala21 Date: Mon, 25 Sep 2017 00:41:01 +0530 Subject: [PATCH 283/432] Adding jacoco plugins for unit coverage --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index b15bff139..c63c032a8 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,32 @@ virtual_firealarm + + org.jacoco + jacoco-maven-plugin + + ${basedir}/target/coverage-reports/jacoco-unit.exec + + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + test + + report + + + ${basedir}/target/coverage-reports/jacoco-unit.exec + ${basedir}/target/coverage-reports/site + + + + From cc2dcf2c8bab6b1de4310917a5ccaec51ea61134 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 25 Sep 2017 04:01:32 +0000 Subject: [PATCH 284/432] [WSO2 Release] [Jenkins #3023] [Release 4.0.84] prepare release v4.0.84 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c63c032a8..30df1996b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.84-SNAPSHOT + 4.0.84 ../pom.xml From 7044b14a7dc1db79a80a6ed155d045e7e13f6bd9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 25 Sep 2017 04:01:48 +0000 Subject: [PATCH 285/432] [WSO2 Release] [Jenkins #3023] [Release 4.0.84] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30df1996b..7f975f0f8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.84 + 4.0.85-SNAPSHOT ../pom.xml From 29940900b0843eacb87b9768519792e77fc151aa Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 26 Sep 2017 05:11:14 +0000 Subject: [PATCH 286/432] [WSO2 Release] [Jenkins #3025] [Release 4.0.85] prepare release v4.0.85 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f975f0f8..b9716af65 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.85-SNAPSHOT + 4.0.85 ../pom.xml From bd17eddfeb9d229f52281cfe5c7270b7a6548a27 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 26 Sep 2017 05:11:29 +0000 Subject: [PATCH 287/432] [WSO2 Release] [Jenkins #3025] [Release 4.0.85] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9716af65..8c0343cb3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.85 + 4.0.86-SNAPSHOT ../pom.xml From 6e22ba418a7cb388c540d8e597ff84c94cff5c0d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 29 Sep 2017 12:53:25 +0000 Subject: [PATCH 288/432] [WSO2 Release] [Jenkins #3028] [Release 4.0.86] prepare release v4.0.86 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c0343cb3..a27f80e07 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.86-SNAPSHOT + 4.0.86 ../pom.xml From 58d1fedd9b10432a9614ebf63f1c18a84e416f68 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 29 Sep 2017 12:53:39 +0000 Subject: [PATCH 289/432] [WSO2 Release] [Jenkins #3028] [Release 4.0.86] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a27f80e07..8ae713f84 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.86 + 4.0.87-SNAPSHOT ../pom.xml From a4e41b2cfe1d6bc1664fd1eb5dc73edddc18a90f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 4 Oct 2017 13:14:58 +0530 Subject: [PATCH 290/432] [WSO2 Release] [Jenkins #3032] [Release 4.0.87] prepare release v4.0.87 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ae713f84..44caaee52 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.87-SNAPSHOT + 4.0.87 ../pom.xml From bb3df870cb2e447ccf3c22d5f72795685cbce10e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 4 Oct 2017 13:15:15 +0530 Subject: [PATCH 291/432] [WSO2 Release] [Jenkins #3032] [Release 4.0.87] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44caaee52..6fbc3ed11 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.87 + 4.0.88-SNAPSHOT ../pom.xml From 98fa693fc742b72c807107466ad428ed23bb8663 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 13 Oct 2017 15:54:28 +0000 Subject: [PATCH 292/432] [WSO2 Release] [Jenkins #3035] [Release 4.0.88] prepare release v4.0.88 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fbc3ed11..18054e731 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.88-SNAPSHOT + 4.0.88 ../pom.xml From 92d55c89a046596d6102ebdb70e2c84f250ef49c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 13 Oct 2017 15:54:42 +0000 Subject: [PATCH 293/432] [WSO2 Release] [Jenkins #3035] [Release 4.0.88] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 18054e731..d758ac398 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.88 + 4.0.89-SNAPSHOT ../pom.xml From 40acade488a7d9193a719bbf678147716af0badc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 18 Oct 2017 09:34:54 +0000 Subject: [PATCH 294/432] [WSO2 Release] [Jenkins #3037] [Release 4.0.89] prepare release v4.0.89 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d758ac398..ff68ea615 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.89-SNAPSHOT + 4.0.89 ../pom.xml From c03e0d9f76e74996dbbf3b44ffa79b651d9839ed Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 18 Oct 2017 09:35:08 +0000 Subject: [PATCH 295/432] [WSO2 Release] [Jenkins #3037] [Release 4.0.89] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff68ea615..acb9e29d6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.89 + 4.0.90-SNAPSHOT ../pom.xml From 0d27797c27e8f3b1a93c127610ffacbd5349db60 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 18 Oct 2017 11:36:51 +0000 Subject: [PATCH 296/432] [WSO2 Release] [Jenkins #3039] [Release 4.0.90] prepare release v4.0.90 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index acb9e29d6..d3469607c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.90-SNAPSHOT + 4.0.90 ../pom.xml From d70ded82bf5e832d8db5e094ad29da3867201816 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 18 Oct 2017 11:37:05 +0000 Subject: [PATCH 297/432] [WSO2 Release] [Jenkins #3039] [Release 4.0.90] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3469607c..449eb69bd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.90 + 4.0.91-SNAPSHOT ../pom.xml From 3be4aaabc7657282c72b4ccb2742b3443c6cb3fc Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Mon, 23 Oct 2017 09:57:31 +0530 Subject: [PATCH 298/432] Fixing code formatting issues. --- ...VirtualFireAlarmPermissionUpdateListener.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java index 829868010..92000ad00 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java @@ -35,7 +35,6 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL @Override public void contextInitialized(ServletContextEvent servletContextEvent) { - UserStoreManager userStoreManager = getUserStoreManager(); try { if (userStoreManager != null) { @@ -47,7 +46,8 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL getAuthorizationManager().authorizeRole(VirtualFireAlarmConstants.ROLE_NAME, VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION); } - } } catch (UserStoreException e) { + } + } catch (UserStoreException e) { log.error("Error while creating a role and adding a user for Raspberry PI.", e); } } @@ -101,13 +101,11 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL } private Permission[] getPermissions() { - - Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM, - CarbonConstants.UI_PERMISSION_ACTION); - Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants - .UI_PERMISSION_ACTION); - - return new Permission[]{androidSense, view}; + Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM, + CarbonConstants.UI_PERMISSION_ACTION); + Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants + .UI_PERMISSION_ACTION); + return new Permission[]{androidSense, view}; } } From a7f270bae8ed7cba7c18f739844be1a6ebb3c6dc Mon Sep 17 00:00:00 2001 From: Menaka Jayawardena Date: Thu, 26 Oct 2017 00:18:56 +0530 Subject: [PATCH 299/432] Code formatting and refactoring for Permission Update Listeners of device types. --- ...tualFireAlarmPermissionUpdateListener.java | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java index 92000ad00..16a6897b3 100644 --- a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java +++ b/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java @@ -32,9 +32,13 @@ import javax.servlet.ServletContextListener; public class VirtualFireAlarmPermissionUpdateListener implements ServletContextListener { private static Log log = LogFactory.getLog(VirtualFireAlarmPermissionUpdateListener.class); + private static PrivilegedCarbonContext threadLocalCarbonContext; + private static RealmService realmService; @Override public void contextInitialized(ServletContextEvent servletContextEvent) { + threadLocalCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + realmService = (RealmService) threadLocalCarbonContext.getOSGiService(RealmService.class, null); UserStoreManager userStoreManager = getUserStoreManager(); try { if (userStoreManager != null) { @@ -57,44 +61,34 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL } - public static UserStoreManager getUserStoreManager() { - RealmService realmService; + private UserStoreManager getUserStoreManager() { UserStoreManager userStoreManager; try { - PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); if (realmService == null) { String msg = "Realm service has not initialized."; - log.error(msg); throw new IllegalStateException(msg); } - int tenantId = ctx.getTenantId(); + int tenantId = threadLocalCarbonContext.getTenantId(); userStoreManager = realmService.getTenantUserRealm(tenantId).getUserStoreManager(); realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); } catch (UserStoreException e) { String msg = "Error occurred while retrieving current user store manager"; - log.error(msg, e); throw new IllegalStateException(msg); } return userStoreManager; } - public static AuthorizationManager getAuthorizationManager() { - RealmService realmService; + private AuthorizationManager getAuthorizationManager() { AuthorizationManager authorizationManager; try { - PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); if (realmService == null) { String msg = "Realm service has not initialized."; - log.error(msg); throw new IllegalStateException(msg); } - int tenantId = ctx.getTenantId(); + int tenantId = threadLocalCarbonContext.getTenantId(); authorizationManager = realmService.getTenantUserRealm(tenantId).getAuthorizationManager(); } catch (UserStoreException e) { String msg = "Error occurred while retrieving current user store manager"; - log.error(msg, e); throw new IllegalStateException(msg); } return authorizationManager; @@ -103,9 +97,8 @@ public class VirtualFireAlarmPermissionUpdateListener implements ServletContextL private Permission[] getPermissions() { Permission androidSense = new Permission(VirtualFireAlarmConstants.PERM_ENROLL_FIRE_ALARM, CarbonConstants.UI_PERMISSION_ACTION); - Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants - .UI_PERMISSION_ACTION); + Permission view = new Permission(VirtualFireAlarmConstants.PERM_OWNING_DEVICE_VIEW, + CarbonConstants.UI_PERMISSION_ACTION); return new Permission[]{androidSense, view}; } - -} +} \ No newline at end of file From f0b363000bf6ab429d78af1fc1d440d6c9d655fc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Oct 2017 07:46:26 +0000 Subject: [PATCH 300/432] [WSO2 Release] [Jenkins #3049] [Release 4.0.91] prepare release v4.0.91 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 449eb69bd..2afa9dcdc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.91-SNAPSHOT + 4.0.91 ../pom.xml From e00bd6df9b10266992b1c0e47f0a0a82be74bebe Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 31 Oct 2017 07:46:40 +0000 Subject: [PATCH 301/432] [WSO2 Release] [Jenkins #3049] [Release 4.0.91] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2afa9dcdc..021836f51 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.91 + 4.0.92-SNAPSHOT ../pom.xml From a7bd77d30e8b7c810ad20b0670bb142a21e7d937 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2017 11:56:35 +0000 Subject: [PATCH 302/432] [WSO2 Release] [Jenkins #3051] [Release 4.0.92] prepare release v4.0.92 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 021836f51..79da1cef2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.92-SNAPSHOT + 4.0.92 ../pom.xml From b6f1f2f36f369c2a8a910a4b4c03d644913f088c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2017 11:56:51 +0000 Subject: [PATCH 303/432] [WSO2 Release] [Jenkins #3051] [Release 4.0.92] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79da1cef2..11751f378 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.92 + 4.0.93-SNAPSHOT ../pom.xml From caf8e668334a581d0075fcd52207a513bc251ffa Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 16 Nov 2017 15:59:00 +0000 Subject: [PATCH 304/432] [WSO2 Release] [Jenkins #3053] [Release 4.0.93] prepare release v4.0.93 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11751f378..61508fcae 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.93-SNAPSHOT + 4.0.93 ../pom.xml From 4bd315fff1a93fe8473f3ea06bdbec5ec4fe4c15 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 16 Nov 2017 15:59:16 +0000 Subject: [PATCH 305/432] [WSO2 Release] [Jenkins #3053] [Release 4.0.93] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61508fcae..1767be784 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.93 + 4.0.94-SNAPSHOT ../pom.xml From 725e2e3c5c28108c67b3cfd9e0157d20416f7aa4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 09:07:04 +0000 Subject: [PATCH 306/432] [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare release v4.0.94 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1767be784..119f1135c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.94-SNAPSHOT + 4.0.94 ../pom.xml From 85b5f0b3546cf84974d94821079ef40d6dcf4065 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 09:07:21 +0000 Subject: [PATCH 307/432] [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 119f1135c..75931d16b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.94 + 4.0.95-SNAPSHOT ../pom.xml From 2620a221b82b237ca608bd154bcf12672c89d065 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 09:43:56 +0000 Subject: [PATCH 308/432] [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare release v4.0.95 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75931d16b..00f598621 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.95-SNAPSHOT + 4.0.95 ../pom.xml From 2c90906de050a2b162916ebe3f15bc5af3ea52a5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 09:44:11 +0000 Subject: [PATCH 309/432] [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 00f598621..bfde4d988 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.95 + 4.0.96-SNAPSHOT ../pom.xml From 56c4e3466c1d12aeac67797d61ac91f3ac89743a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 10:55:43 +0000 Subject: [PATCH 310/432] [WSO2 Release] [Jenkins #3058] [Release 4.0.96] prepare release v4.0.96 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfde4d988..5863998c8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.96-SNAPSHOT + 4.0.96 ../pom.xml From 068545685d841ef7bcd76787248d86032025c344 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 10:55:56 +0000 Subject: [PATCH 311/432] [WSO2 Release] [Jenkins #3058] [Release 4.0.96] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5863998c8..19b2267e9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.96 + 4.0.97-SNAPSHOT ../pom.xml From 7da12044fe93c43d51a470a185af18af00be6eef Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 13:02:44 +0000 Subject: [PATCH 312/432] [WSO2 Release] [Jenkins #3060] [Release 4.0.97] prepare release v4.0.97 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19b2267e9..40d90d81a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.97-SNAPSHOT + 4.0.97 ../pom.xml From 518781e1a6905b26f2975cb689d2d579e458089a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 17 Nov 2017 13:02:58 +0000 Subject: [PATCH 313/432] [WSO2 Release] [Jenkins #3060] [Release 4.0.97] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40d90d81a..12628c6e6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.97 + 4.0.98-SNAPSHOT ../pom.xml From 51a8e6539a699867898cede2824c648fe5dcb008 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 23 Nov 2017 12:30:02 +0000 Subject: [PATCH 314/432] [WSO2 Release] [Jenkins #3064] [Release 4.0.98] prepare release v4.0.98 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 12628c6e6..8b72a0afd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.98-SNAPSHOT + 4.0.98 ../pom.xml From 0b4b28ef524f3bf4cc392abe2ecfbf71fb0d71e4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 23 Nov 2017 12:30:19 +0000 Subject: [PATCH 315/432] [WSO2 Release] [Jenkins #3064] [Release 4.0.98] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b72a0afd..34a065d56 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.98 + 4.0.99-SNAPSHOT ../pom.xml From 54867c0f8f6bd6f8f6aadfdfad622f19b630dead Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 23 Nov 2017 14:37:32 +0000 Subject: [PATCH 316/432] [WSO2 Release] [Jenkins #3066] [Release 4.0.99] prepare release v4.0.99 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34a065d56..b0fed9136 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.99-SNAPSHOT + 4.0.99 ../pom.xml From 0b9c3c629a16785f3575c9512e8b020b3e7e0a25 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 23 Nov 2017 14:37:47 +0000 Subject: [PATCH 317/432] [WSO2 Release] [Jenkins #3066] [Release 4.0.99] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0fed9136..f9b65595c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.99 + 4.0.100-SNAPSHOT ../pom.xml From 3de57c720289abb79cb3ccdbe9d5d60de1c28e55 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 29 Nov 2017 16:30:29 +0000 Subject: [PATCH 318/432] [WSO2 Release] [Jenkins #3068] [Release 4.0.100] prepare release v4.0.100 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9b65595c..6fc6d0879 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.100-SNAPSHOT + 4.0.100 ../pom.xml From 638ed16ac0137890071e66bbb7f5356739bfad66 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 29 Nov 2017 16:30:44 +0000 Subject: [PATCH 319/432] [WSO2 Release] [Jenkins #3068] [Release 4.0.100] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fc6d0879..adceaf167 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.100 + 4.0.101-SNAPSHOT ../pom.xml From fc584ebe9bcd61bf5a37e69a1a88103451f87d61 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 30 Nov 2017 06:01:18 +0000 Subject: [PATCH 320/432] [WSO2 Release] [Jenkins #3070] [Release 4.0.101] prepare release v4.0.101 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adceaf167..4a83754b3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.101-SNAPSHOT + 4.0.101 ../pom.xml From f36b119cde6a22c918180471ff2e7b5349d3fa7b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 30 Nov 2017 06:01:33 +0000 Subject: [PATCH 321/432] [WSO2 Release] [Jenkins #3070] [Release 4.0.101] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a83754b3..1fd3d81e7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.101 + 4.0.102-SNAPSHOT ../pom.xml From 88687671be69b7c04e8f87528eb38ab428641ee8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 13 Dec 2017 03:58:06 +0000 Subject: [PATCH 322/432] [WSO2 Release] [Jenkins #3072] [Release 4.0.102] prepare release v4.0.102 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fd3d81e7..838f59d01 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.102-SNAPSHOT + 4.0.102 ../pom.xml From ce109abeac53f1fb4bb281739a6d40ab2a140188 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 13 Dec 2017 03:58:20 +0000 Subject: [PATCH 323/432] [WSO2 Release] [Jenkins #3072] [Release 4.0.102] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 838f59d01..09efa2e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.102 + 4.0.103-SNAPSHOT ../pom.xml From a3e7f224010e61e07fbd71deb9b37696e0e5e848 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 13 Dec 2017 07:06:19 +0000 Subject: [PATCH 324/432] [WSO2 Release] [Jenkins #3074] [Release 4.0.103] prepare release v4.0.103 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 09efa2e1e..681552b32 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.103-SNAPSHOT + 4.0.103 ../pom.xml From f47189624296f32486dd0aa1de911f4afd17a47e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 13 Dec 2017 07:06:33 +0000 Subject: [PATCH 325/432] [WSO2 Release] [Jenkins #3074] [Release 4.0.103] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 681552b32..42c1dda17 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.103 + 4.0.104-SNAPSHOT ../pom.xml From ec9fce18a36a4129d45bd86b3fa777b1dc250cc8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 14 Dec 2017 09:24:58 +0000 Subject: [PATCH 326/432] [WSO2 Release] [Jenkins #3076] [Release 4.0.104] prepare release v4.0.104 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42c1dda17..55f09db5e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.104-SNAPSHOT + 4.0.104 ../pom.xml From 4e26aae32cfc7df398940b6c28d41f185185ae5f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 14 Dec 2017 09:25:13 +0000 Subject: [PATCH 327/432] [WSO2 Release] [Jenkins #3076] [Release 4.0.104] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55f09db5e..d9d8f0862 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.104 + 4.0.105-SNAPSHOT ../pom.xml From 482ae2adf3f2684845904c01de692d42475814e5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Dec 2017 13:48:13 +0000 Subject: [PATCH 328/432] [WSO2 Release] [Jenkins #3079] [Release 4.0.105] prepare release v4.0.105 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9d8f0862..c0dc2b148 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.105-SNAPSHOT + 4.0.105 ../pom.xml From bdbddd9de0cc202c76773c7ad57c48215c17886d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Dec 2017 13:48:28 +0000 Subject: [PATCH 329/432] [WSO2 Release] [Jenkins #3079] [Release 4.0.105] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0dc2b148..849896621 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.105 + 4.0.106-SNAPSHOT ../pom.xml From bb232420a7529e5e617e249d8c7427ab6668d3af Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Dec 2017 16:06:38 +0000 Subject: [PATCH 330/432] [WSO2 Release] [Jenkins #3081] [Release 4.0.106] prepare release v4.0.106 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 849896621..192aa8317 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.106-SNAPSHOT + 4.0.106 ../pom.xml From 95b7009c4b59b0fbd918ffa4c868625c4945b4b0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Dec 2017 16:06:54 +0000 Subject: [PATCH 331/432] [WSO2 Release] [Jenkins #3081] [Release 4.0.106] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 192aa8317..8cd69fc76 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.106 + 4.0.107-SNAPSHOT ../pom.xml From c8e2a95c75f660d982eb0f391bffea33e10e389a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 24 Dec 2017 17:28:12 +0000 Subject: [PATCH 332/432] [WSO2 Release] [Jenkins #3084] [Release 4.0.107] prepare release v4.0.107 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cd69fc76..1a51f546f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.107-SNAPSHOT + 4.0.107 ../pom.xml From 006472a90ce7078116cb0dea3c6ea8a61595a277 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 24 Dec 2017 17:28:29 +0000 Subject: [PATCH 333/432] [WSO2 Release] [Jenkins #3084] [Release 4.0.107] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a51f546f..3ef2e391e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.107 + 4.0.108-SNAPSHOT ../pom.xml From 014a0b2ba86759ad56452332be22b1ee576ac2ae Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2018 02:17:00 +0000 Subject: [PATCH 334/432] [WSO2 Release] [Jenkins #3086] [Release 4.0.108] prepare release v4.0.108 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ef2e391e..397c43ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.108-SNAPSHOT + 4.0.108 ../pom.xml From 287c9db2d3e9f861ac07471f8ac070b69640e519 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2018 02:17:15 +0000 Subject: [PATCH 335/432] [WSO2 Release] [Jenkins #3086] [Release 4.0.108] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 397c43ccb..1292b495b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.108 + 4.0.109-SNAPSHOT ../pom.xml From 7e8714a3480714cc0b3097ae6110fc79a4e3bf92 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2018 05:58:20 +0000 Subject: [PATCH 336/432] [WSO2 Release] [Jenkins #3088] [Release 4.0.109] prepare release v4.0.109 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1292b495b..95c3594ea 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.109-SNAPSHOT + 4.0.109 ../pom.xml From f691f06c9bfe18287be64becbe186e523d573206 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2018 05:58:33 +0000 Subject: [PATCH 337/432] [WSO2 Release] [Jenkins #3088] [Release 4.0.109] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95c3594ea..5fd8f3af3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.109 + 4.0.110-SNAPSHOT ../pom.xml From 1d4d815a2f16ffac685996f724d9e8f573419120 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 11 Jan 2018 04:58:23 +0000 Subject: [PATCH 338/432] [WSO2 Release] [Jenkins #3090] [Release 4.0.110] prepare release v4.0.110 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd8f3af3..b2ab4a137 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.110-SNAPSHOT + 4.0.110 ../pom.xml From 940f2ef7b8732ca418f36a9de64e8eb294d6b452 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 11 Jan 2018 04:58:39 +0000 Subject: [PATCH 339/432] [WSO2 Release] [Jenkins #3090] [Release 4.0.110] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2ab4a137..9352b9e74 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.110 + 4.0.111-SNAPSHOT ../pom.xml From 6a99a058f2d48305703e94f3ba066520e8bc3b24 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 11 Jan 2018 07:41:36 +0000 Subject: [PATCH 340/432] [WSO2 Release] [Jenkins #3092] [Release 4.0.111] prepare release v4.0.111 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9352b9e74..646ff3d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.111-SNAPSHOT + 4.0.111 ../pom.xml From d19adef2e545327e76d26afa95a7b9195b477f6e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 11 Jan 2018 07:41:52 +0000 Subject: [PATCH 341/432] [WSO2 Release] [Jenkins #3092] [Release 4.0.111] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 646ff3d1b..344ed2d47 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.111 + 4.0.112-SNAPSHOT ../pom.xml From 8e41256d5c25e6b710af88d13d06f01d88e3b2de Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Jan 2018 09:02:58 +0000 Subject: [PATCH 342/432] [WSO2 Release] [Jenkins #3094] [Release 4.0.112] prepare release v4.0.112 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 344ed2d47..7664ff8c6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.112-SNAPSHOT + 4.0.112 ../pom.xml From 2f3d22ca8442e53b9d8fdd7cf997c69f00cd483e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Jan 2018 09:03:13 +0000 Subject: [PATCH 343/432] [WSO2 Release] [Jenkins #3094] [Release 4.0.112] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7664ff8c6..8f1dd490e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.112 + 4.0.113-SNAPSHOT ../pom.xml From fb34afa971863731efb42dfc77f85bd7f390da85 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Jan 2018 14:20:44 +0000 Subject: [PATCH 344/432] [WSO2 Release] [Jenkins #3096] [Release 4.0.113] prepare release v4.0.113 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f1dd490e..efe56e470 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.113-SNAPSHOT + 4.0.113 ../pom.xml From 8e2efd628410c6451d7caf54e0cd0a5ab45e533c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Jan 2018 14:21:00 +0000 Subject: [PATCH 345/432] [WSO2 Release] [Jenkins #3096] [Release 4.0.113] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efe56e470..92ebda02f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.113 + 4.0.114-SNAPSHOT ../pom.xml From 6af906d579e1fea1f68dc3d5e1bf1728c37a20fd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2018 03:03:34 +0000 Subject: [PATCH 346/432] [WSO2 Release] [Jenkins #3098] [Release 4.0.114] prepare release v4.0.114 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92ebda02f..7f557ec01 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.114-SNAPSHOT + 4.0.114 ../pom.xml From 71f5bea37a85e321154ee23501d219f92264c89e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2018 03:03:47 +0000 Subject: [PATCH 347/432] [WSO2 Release] [Jenkins #3098] [Release 4.0.114] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f557ec01..fb47911c2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.114 + 4.0.115-SNAPSHOT ../pom.xml From fad46765e9f5cde97cc57c4ba4b9ffae1ac28147 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2018 12:42:41 +0000 Subject: [PATCH 348/432] [WSO2 Release] [Jenkins #3100] [Release 4.0.115] prepare release v4.0.115 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb47911c2..22c0d3366 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.115-SNAPSHOT + 4.0.115 ../pom.xml From f5a09b150e6e0c126a2f65eefd379bb6a0a06261 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2018 12:42:55 +0000 Subject: [PATCH 349/432] [WSO2 Release] [Jenkins #3100] [Release 4.0.115] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22c0d3366..ef5c0560f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.115 + 4.0.116-SNAPSHOT ../pom.xml From 511cf7302dd16eff0d46af6e6e3c1bd590ae43ed Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2018 13:23:47 +0000 Subject: [PATCH 350/432] [WSO2 Release] [Jenkins #3102] [Release 4.0.116] prepare release v4.0.116 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef5c0560f..1d717bddb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.116-SNAPSHOT + 4.0.116 ../pom.xml From 31a73f406e5e1ba5131fc588dde97280e3c306db Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2018 13:24:02 +0000 Subject: [PATCH 351/432] [WSO2 Release] [Jenkins #3102] [Release 4.0.116] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d717bddb..8e1554313 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.116 + 4.0.117-SNAPSHOT ../pom.xml From 6a56be64eea2cead6e871ff12e4a5f4b9bcae69e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Jan 2018 05:49:01 +0000 Subject: [PATCH 352/432] [WSO2 Release] [Jenkins #3104] [Release 4.0.117] prepare release v4.0.117 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e1554313..68f2731e6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.117-SNAPSHOT + 4.0.117 ../pom.xml From 1fca4a24cf415532f017515eaa58ceaf5958e700 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Jan 2018 05:49:15 +0000 Subject: [PATCH 353/432] [WSO2 Release] [Jenkins #3104] [Release 4.0.117] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68f2731e6..c90e67b69 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.117 + 4.0.118-SNAPSHOT ../pom.xml From ad94e361ac67eaeaf0ec4a966494b9d2df30dcdd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 26 Jan 2018 08:59:09 +0000 Subject: [PATCH 354/432] [WSO2 Release] [Jenkins #3106] [Release 4.0.118] prepare release v4.0.118 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c90e67b69..7353ab580 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.118-SNAPSHOT + 4.0.118 ../pom.xml From 117c40a6b063eb77d0d9db33b90ce780eed7b53f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 26 Jan 2018 08:59:23 +0000 Subject: [PATCH 355/432] [WSO2 Release] [Jenkins #3106] [Release 4.0.118] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7353ab580..5cd7c9cc8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.118 + 4.0.119-SNAPSHOT ../pom.xml From 1a8f0a183b02c9f3b715cd5142f4adc589572c14 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 27 Jan 2018 04:33:26 +0000 Subject: [PATCH 356/432] [WSO2 Release] [Jenkins #3108] [Release 4.0.119] prepare release v4.0.119 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5cd7c9cc8..5c1a025ca 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.119-SNAPSHOT + 4.0.119 ../pom.xml From 66a3b4ff273967751c49971b1bd8efc88b2a0ef4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 27 Jan 2018 04:33:41 +0000 Subject: [PATCH 357/432] [WSO2 Release] [Jenkins #3108] [Release 4.0.119] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c1a025ca..193e02cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.119 + 4.0.120-SNAPSHOT ../pom.xml From 117b5352f259c9fcae640d6c0d77aa5b41193bef Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 28 Jan 2018 15:29:10 +0000 Subject: [PATCH 358/432] [WSO2 Release] [Jenkins #3110] [Release 4.0.120] prepare release v4.0.120 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 193e02cd5..c25483ec7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.120-SNAPSHOT + 4.0.120 ../pom.xml From 09862c4ee93d619523aec58f6655405dc19fc052 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 28 Jan 2018 15:29:25 +0000 Subject: [PATCH 359/432] [WSO2 Release] [Jenkins #3110] [Release 4.0.120] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c25483ec7..1d6f06fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.120 + 4.0.121-SNAPSHOT ../pom.xml From 73ae1394ba0b8bbfac847c8f5681c3ea1ee5bb7c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 05:35:54 +0000 Subject: [PATCH 360/432] [WSO2 Release] [Jenkins #3112] [Release 4.0.121] prepare release v4.0.121 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d6f06fe8..af8d221b7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.121-SNAPSHOT + 4.0.121 ../pom.xml From 3df61fb26b34b95ab2b27fbe44db02603438022a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 05:36:09 +0000 Subject: [PATCH 361/432] [WSO2 Release] [Jenkins #3112] [Release 4.0.121] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af8d221b7..5d33e33f1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.121 + 4.0.122-SNAPSHOT ../pom.xml From 1f1e225dbba6c5b1a9b624a16ad6f40709b4b07f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 11:24:07 +0000 Subject: [PATCH 362/432] [WSO2 Release] [Jenkins #3114] [Release 4.0.122] prepare release v4.0.122 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d33e33f1..8a1df0b73 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.122-SNAPSHOT + 4.0.122 ../pom.xml From e86626a985ee282df37eb375267da185795810b4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 11:24:22 +0000 Subject: [PATCH 363/432] [WSO2 Release] [Jenkins #3114] [Release 4.0.122] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a1df0b73..2f2672349 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.122 + 4.0.123-SNAPSHOT ../pom.xml From 40345c664e23fb9b669fb9acd4c0261390187621 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 11:53:19 +0000 Subject: [PATCH 364/432] [WSO2 Release] [Jenkins #3116] [Release 4.0.123] prepare release v4.0.123 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f2672349..d60d213f5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.123-SNAPSHOT + 4.0.123 ../pom.xml From a1799159c62e62a9cce8c3e7bc7c7191e1c2c4f8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 11:53:35 +0000 Subject: [PATCH 365/432] [WSO2 Release] [Jenkins #3116] [Release 4.0.123] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d60d213f5..e7ffca017 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.123 + 4.0.124-SNAPSHOT ../pom.xml From 494c5abecc6ba00f78f7f79a9d155d4f720bee7b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 12:43:38 +0000 Subject: [PATCH 366/432] [WSO2 Release] [Jenkins #3118] [Release 4.0.124] prepare release v4.0.124 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7ffca017..1002fb6b2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.124-SNAPSHOT + 4.0.124 ../pom.xml From dcc91f0a48ca4f50a7322172fb8c8d79a8b55309 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2018 12:43:53 +0000 Subject: [PATCH 367/432] [WSO2 Release] [Jenkins #3118] [Release 4.0.124] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1002fb6b2..efbb02922 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.124 + 4.0.125-SNAPSHOT ../pom.xml From 28dba6bcb189e591e7a6392d9b6eb229a2da0349 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Feb 2018 06:16:37 +0000 Subject: [PATCH 368/432] [WSO2 Release] [Jenkins #3120] [Release 4.0.125] prepare release v4.0.125 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efbb02922..e9eda7f14 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.125-SNAPSHOT + 4.0.125 ../pom.xml From 3d976d1a31269f011b41bd3ed73d2e3b57ab564f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Feb 2018 06:16:51 +0000 Subject: [PATCH 369/432] [WSO2 Release] [Jenkins #3120] [Release 4.0.125] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9eda7f14..9a13e7c4f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.125 + 4.0.126-SNAPSHOT ../pom.xml From fe336174906158b25d022876b0069357cf1b46eb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 6 Feb 2018 15:10:14 +0000 Subject: [PATCH 370/432] [WSO2 Release] [Jenkins #3122] [Release 4.0.126] prepare release v4.0.126 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a13e7c4f..468582d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.126-SNAPSHOT + 4.0.126 ../pom.xml From 5626005a0077b5525775beb73afbd23c538b1861 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 6 Feb 2018 15:10:29 +0000 Subject: [PATCH 371/432] [WSO2 Release] [Jenkins #3122] [Release 4.0.126] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 468582d3f..e4fdf4087 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.126 + 4.0.127-SNAPSHOT ../pom.xml From 60f74077f2c498f5fd6f18e25fb0e236361278df Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Feb 2018 04:00:36 +0000 Subject: [PATCH 372/432] [WSO2 Release] [Jenkins #3124] [Release 4.0.127] prepare release v4.0.127 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4fdf4087..fb68ad41d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.127-SNAPSHOT + 4.0.127 ../pom.xml From f10d5789735b1195e22a6ab6387287717ec0b36f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Feb 2018 04:00:51 +0000 Subject: [PATCH 373/432] [WSO2 Release] [Jenkins #3124] [Release 4.0.127] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb68ad41d..37b444602 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.127 + 4.0.128-SNAPSHOT ../pom.xml From 18619c7e15087063de12cb84c7c289907eeac271 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 18 Feb 2018 07:19:52 +0000 Subject: [PATCH 374/432] [WSO2 Release] [Jenkins #3126] [Release 4.0.128] prepare release v4.0.128 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37b444602..3ecac1d8f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.128-SNAPSHOT + 4.0.128 ../pom.xml From d75c76320bdfaafe13e837a769a7008a235e544f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 18 Feb 2018 07:20:07 +0000 Subject: [PATCH 375/432] [WSO2 Release] [Jenkins #3126] [Release 4.0.128] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ecac1d8f..de076c88d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.128 + 4.0.129-SNAPSHOT ../pom.xml From d8efecd1d38daba6e4506ef413333cfc34a02f3a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 22 Feb 2018 10:24:10 +0000 Subject: [PATCH 376/432] [WSO2 Release] [Jenkins #3128] [Release 4.0.129] prepare release v4.0.129 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de076c88d..4b5edfc79 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.129-SNAPSHOT + 4.0.129 ../pom.xml From ff762e51d47514ddecbe843e760ccbc79f96d179 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 22 Feb 2018 10:24:20 +0000 Subject: [PATCH 377/432] [WSO2 Release] [Jenkins #3128] [Release 4.0.129] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b5edfc79..b87691074 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.129 + 4.0.130-SNAPSHOT ../pom.xml From 488e3d960b7aa5e8b7a99bdb247da02224ad2241 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 24 Feb 2018 03:44:11 +0000 Subject: [PATCH 378/432] [WSO2 Release] [Jenkins #3130] [Release 4.0.130] prepare release v4.0.130 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b87691074..f5f729650 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.130-SNAPSHOT + 4.0.130 ../pom.xml From fef8be5cb607775d2551780c1889ec380971e419 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 24 Feb 2018 03:44:21 +0000 Subject: [PATCH 379/432] [WSO2 Release] [Jenkins #3130] [Release 4.0.130] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f5f729650..5533c25d1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.130 + 4.0.131-SNAPSHOT ../pom.xml From 7598b6e4a1e9894a3c49c7b3c3a915aace6bb4b8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 25 Feb 2018 11:03:00 +0000 Subject: [PATCH 380/432] [WSO2 Release] [Jenkins #3132] [Release 4.0.131] prepare release v4.0.131 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5533c25d1..6c5affd26 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.131-SNAPSHOT + 4.0.131 ../pom.xml From bfb8f81a1f9c4bb99db015f898c82d6a32371625 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 25 Feb 2018 11:03:12 +0000 Subject: [PATCH 381/432] [WSO2 Release] [Jenkins #3132] [Release 4.0.131] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c5affd26..ff47f3822 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.131 + 4.0.132-SNAPSHOT ../pom.xml From 577fcfd59685e4006cac8e4b165f309e40ec9501 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Feb 2018 14:30:43 +0000 Subject: [PATCH 382/432] [WSO2 Release] [Jenkins #3134] [Release 4.0.132] prepare release v4.0.132 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff47f3822..2cb0b7355 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.132-SNAPSHOT + 4.0.132 ../pom.xml From 2db09db15f4f74c4c2e9d24032b774e18b0be22a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Feb 2018 14:30:53 +0000 Subject: [PATCH 383/432] [WSO2 Release] [Jenkins #3134] [Release 4.0.132] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cb0b7355..79c8729ea 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.132 + 4.0.133-SNAPSHOT ../pom.xml From c2740b928c32dff7fde82471fedf639553b4dd8b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Feb 2018 17:49:43 +0000 Subject: [PATCH 384/432] [WSO2 Release] [Jenkins #3136] [Release 4.0.133] prepare release v4.0.133 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79c8729ea..c2a2e37f3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.133-SNAPSHOT + 4.0.133 ../pom.xml From f1c13a9c3c377a706017795d9cd2440f1b486979 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Feb 2018 17:49:53 +0000 Subject: [PATCH 385/432] [WSO2 Release] [Jenkins #3136] [Release 4.0.133] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2a2e37f3..b0ca62505 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.133 + 4.0.134-SNAPSHOT ../pom.xml From 9c97a624eda12f0ea7b095ec8a7689aeeef1ecb0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Mar 2018 18:27:51 +0000 Subject: [PATCH 386/432] [WSO2 Release] [Jenkins #3138] [Release 4.0.134] prepare release v4.0.134 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b0ca62505..5bccca332 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.134-SNAPSHOT + 4.0.134 ../pom.xml From 468f4f777073480a5c4f267df6b0286a80ca7d2e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Mar 2018 18:28:02 +0000 Subject: [PATCH 387/432] [WSO2 Release] [Jenkins #3138] [Release 4.0.134] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bccca332..83340de53 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.134 + 4.0.135-SNAPSHOT ../pom.xml From db8bfaaf146ded57486b98b0fa48a79261baa4d9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 3 Mar 2018 16:48:22 +0000 Subject: [PATCH 388/432] [WSO2 Release] [Jenkins #3140] [Release 4.0.135] prepare release v4.0.135 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83340de53..0e906f8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.135-SNAPSHOT + 4.0.135 ../pom.xml From ee77e59256f499f724d5c02520d93b4c13fa1eea Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 3 Mar 2018 16:48:32 +0000 Subject: [PATCH 389/432] [WSO2 Release] [Jenkins #3140] [Release 4.0.135] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e906f8ee..000bb0ec3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.135 + 4.0.136-SNAPSHOT ../pom.xml From a75bb56ad65e1dcbf65e46c66cc85ece93970c93 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 3 Mar 2018 20:26:23 +0000 Subject: [PATCH 390/432] [WSO2 Release] [Jenkins #3142] [Release 4.0.136] prepare release v4.0.136 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 000bb0ec3..66148011a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.136-SNAPSHOT + 4.0.136 ../pom.xml From 2619e73c1206a1a7e43832e22e2172c4c1e80490 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 3 Mar 2018 20:26:33 +0000 Subject: [PATCH 391/432] [WSO2 Release] [Jenkins #3142] [Release 4.0.136] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66148011a..f7ae20faa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.136 + 4.0.137-SNAPSHOT ../pom.xml From 3adfc70a45c14b302d851c626f028282e475fb70 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Mon, 12 Mar 2018 16:28:28 +0530 Subject: [PATCH 392/432] Updating the version to 4.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7ae20faa..5f9c18e81 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.0.137-SNAPSHOT + 4.1.0-SNAPSHOT ../pom.xml From 34f2e1e96e475160cb020b287528cfd19072fd45 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Mar 2018 11:34:53 +0000 Subject: [PATCH 393/432] [WSO2 Release] [Jenkins #3144] [Release 4.1.0] prepare release v4.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f9c18e81..b30476cbe 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.0-SNAPSHOT + 4.1.0 ../pom.xml From 54e478d900dc87117adc47dc086be48857cccd35 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Mar 2018 11:35:05 +0000 Subject: [PATCH 394/432] [WSO2 Release] [Jenkins #3144] [Release 4.1.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 b30476cbe..fe19589da 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.0 + 4.1.1-SNAPSHOT ../pom.xml From 141f9b45431c5c47bca50cd4b18dca10fafbf75a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 13 Mar 2018 05:46:38 +0000 Subject: [PATCH 395/432] [WSO2 Release] [Jenkins #3146] [Release 4.1.1] prepare release v4.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe19589da..7fdd50398 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.1-SNAPSHOT + 4.1.1 ../pom.xml From 9172d6f9465306df4dec8ea147de70e5c7be75c2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 13 Mar 2018 05:46:49 +0000 Subject: [PATCH 396/432] [WSO2 Release] [Jenkins #3146] [Release 4.1.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 7fdd50398..078771863 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.1 + 4.1.2-SNAPSHOT ../pom.xml From e5a21a2d4cc0345c222618cd6a0ee4f3a3ce4c4f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 14 Mar 2018 07:59:38 +0000 Subject: [PATCH 397/432] [WSO2 Release] [Jenkins #3148] [Release 4.1.2] prepare release v4.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 078771863..403eb731c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.2-SNAPSHOT + 4.1.2 ../pom.xml From 4a774f034e757c7371de2dd14721c39ceec2ab7f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 14 Mar 2018 07:59:49 +0000 Subject: [PATCH 398/432] [WSO2 Release] [Jenkins #3148] [Release 4.1.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 403eb731c..73bf7b499 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.2 + 4.1.3-SNAPSHOT ../pom.xml From c22f34e98f0555fd57a2493dc51a83690c903c79 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Mar 2018 09:05:24 +0000 Subject: [PATCH 399/432] [WSO2 Release] [Jenkins #3150] [Release 4.1.3] prepare release v4.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73bf7b499..4b0960444 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.3-SNAPSHOT + 4.1.3 ../pom.xml From 58fb8c00c78ac0d1b9b885b220bc5e82c941e57b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Mar 2018 09:05:34 +0000 Subject: [PATCH 400/432] [WSO2 Release] [Jenkins #3150] [Release 4.1.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 4b0960444..53d2019ab 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.3 + 4.1.4-SNAPSHOT ../pom.xml From 6188e3e7256c73a2efc55c1aeb36cc6b2f1389c8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Mar 2018 12:06:49 +0000 Subject: [PATCH 401/432] [WSO2 Release] [Jenkins #3152] [Release 4.1.4] prepare release v4.1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53d2019ab..7890a067b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.4-SNAPSHOT + 4.1.4 ../pom.xml From 6afa957aac8e0bb80afec5bca0d375927532d65c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Mar 2018 12:06:59 +0000 Subject: [PATCH 402/432] [WSO2 Release] [Jenkins #3152] [Release 4.1.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 7890a067b..f0a6759df 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.4 + 4.1.5-SNAPSHOT ../pom.xml From e7e517aba01fed87e87f3c2de8b4a53514c54871 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 21 Mar 2018 04:31:01 +0000 Subject: [PATCH 403/432] [WSO2 Release] [Jenkins #3154] [Release 4.1.5] prepare release v4.1.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0a6759df..e50ce6980 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.5-SNAPSHOT + 4.1.5 ../pom.xml From cbbb6faca5e3e57727b41964b024c431046a1b5c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 21 Mar 2018 04:31:13 +0000 Subject: [PATCH 404/432] [WSO2 Release] [Jenkins #3154] [Release 4.1.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 e50ce6980..104453f7d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.5 + 4.1.6-SNAPSHOT ../pom.xml From 928826e9629feaa4f758d9360d6a072f44f5f624 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 5 Apr 2018 13:49:53 +0000 Subject: [PATCH 405/432] [WSO2 Release] [Jenkins #3159] [Release 4.1.6] prepare release v4.1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 104453f7d..c1f815ac9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.6-SNAPSHOT + 4.1.6 ../pom.xml From 82789474048daf1778528cfa2eee1c2f1ab91ff9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 5 Apr 2018 13:50:04 +0000 Subject: [PATCH 406/432] [WSO2 Release] [Jenkins #3159] [Release 4.1.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 c1f815ac9..0dbb747ee 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.6 + 4.1.7-SNAPSHOT ../pom.xml From ce3bc11237b31a6ad07ed78dcfa8ff57882bd259 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 13 Aug 2018 08:48:16 +0000 Subject: [PATCH 407/432] [maven-release-plugin] prepare release v4.1.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0dbb747ee..a83de91f5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.7-SNAPSHOT + 4.1.7 ../pom.xml From fc47c6949c950e13dcbf1b16c122e77003413881 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 13 Aug 2018 08:48:27 +0000 Subject: [PATCH 408/432] [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 a83de91f5..8dd69e0d0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.7 + 4.1.8-SNAPSHOT ../pom.xml From 3251ebbe259a18f8c5cd0dd192d550df4dabe026 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 22 Aug 2018 15:06:51 +0000 Subject: [PATCH 409/432] [maven-release-plugin] prepare release v4.1.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dd69e0d0..dd794eb26 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.8-SNAPSHOT + 4.1.8 ../pom.xml From 6c6cd16cc4239d1a5b743a6dab890687ccddec7e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 22 Aug 2018 15:07:02 +0000 Subject: [PATCH 410/432] [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 dd794eb26..c3af62fa6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.8 + 4.1.9-SNAPSHOT ../pom.xml From 81cd27eebb9187cc20ca8e96cb10d36503504d32 Mon Sep 17 00:00:00 2001 From: Madhawa Perera Date: Tue, 18 Sep 2018 14:23:04 +0530 Subject: [PATCH 411/432] version bump from 4.1.9 to 4.1.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3af62fa6..5c18c0a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.9-SNAPSHOT + 4.1.11-SNAPSHOT ../pom.xml From 0814d7468a8db45d3484aa7a1860d3d3fc5e44c7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 18 Sep 2018 09:24:03 +0000 Subject: [PATCH 412/432] [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c18c0a7f..78ad3dae8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.11-SNAPSHOT + 4.1.11 ../pom.xml From 011dc162f509aba371dac6d7f2906484c6ff4e13 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 18 Sep 2018 09:24:16 +0000 Subject: [PATCH 413/432] [WSO2 Release] [Jenkins #3178] [Release 4.1.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 78ad3dae8..bb003f222 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.11 + 4.1.12-SNAPSHOT ../pom.xml From 1ec7244433925c3fb5ed55b4d40b2bcf225e6144 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 Oct 2018 05:27:27 +0000 Subject: [PATCH 414/432] [WSO2 Release] [Jenkins #3180] [Release 4.1.12] prepare release v4.1.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb003f222..6970f9dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.12-SNAPSHOT + 4.1.12 ../pom.xml From 0a9e7c8aba7df64b85ead573f154ed8a965096ed Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 Oct 2018 05:27:38 +0000 Subject: [PATCH 415/432] [WSO2 Release] [Jenkins #3180] [Release 4.1.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 6970f9dcd..8e1f99afb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.12 + 4.1.13-SNAPSHOT ../pom.xml From bba60c7cbf848fa800ff240e8a54423010bf40e3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Oct 2018 13:04:41 +0000 Subject: [PATCH 416/432] [WSO2 Release] [Jenkins #3182] [Release 4.1.13] prepare release v4.1.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e1f99afb..f612eb3b5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.13-SNAPSHOT + 4.1.13 ../pom.xml From 76211f2f58f0f9a450d546bc7bd838200c4d6ad4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Oct 2018 13:04:53 +0000 Subject: [PATCH 417/432] [WSO2 Release] [Jenkins #3182] [Release 4.1.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 f612eb3b5..b29094ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.13 + 4.1.14-SNAPSHOT ../pom.xml From 81dcc2dba60b061fb9d3d044b95153d7487d700b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Oct 2018 17:58:14 +0000 Subject: [PATCH 418/432] [WSO2 Release] [Jenkins #3184] [Release 4.1.14] prepare release v4.1.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b29094ddd..3393a2bff 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.14-SNAPSHOT + 4.1.14 ../pom.xml From 07c5addc96abd307db8e60a58948221a45476772 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Oct 2018 17:58:26 +0000 Subject: [PATCH 419/432] [WSO2 Release] [Jenkins #3184] [Release 4.1.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 3393a2bff..4b14bc8ba 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.14 + 4.1.15-SNAPSHOT ../pom.xml From 2d3f2f25c49e1fcb3afdafa93867d1a1ee499ed7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Oct 2018 06:40:17 +0000 Subject: [PATCH 420/432] [WSO2 Release] [Jenkins #3186] [Release 4.1.15] prepare release v4.1.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b14bc8ba..f91ef5841 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.15-SNAPSHOT + 4.1.15 ../pom.xml From 981650776e2beba0a8efcb4a44445ad2236128b1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Oct 2018 06:40:28 +0000 Subject: [PATCH 421/432] [WSO2 Release] [Jenkins #3186] [Release 4.1.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 f91ef5841..47b846628 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.15 + 4.1.16-SNAPSHOT ../pom.xml From 3e0eee697144eadc5ef76897fd3277fbfe3dd17f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Oct 2018 05:47:15 +0000 Subject: [PATCH 422/432] [WSO2 Release] [Jenkins #3190] [Release 4.1.16] prepare release v4.1.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47b846628..37da67af4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.16-SNAPSHOT + 4.1.16 ../pom.xml From 52a4c1e58f48d547cce94aa08d06ca45adfbac06 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Oct 2018 05:47:27 +0000 Subject: [PATCH 423/432] [WSO2 Release] [Jenkins #3190] [Release 4.1.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 37da67af4..5b4915378 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.16 + 4.1.17-SNAPSHOT ../pom.xml From 8a42a025ab91a4aa48cfa5f2ddc084381fda17ea Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Oct 2018 16:30:51 +0000 Subject: [PATCH 424/432] [WSO2 Release] [Jenkins #3192] [Release 4.1.17] prepare release v4.1.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b4915378..3607c3ed3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.17-SNAPSHOT + 4.1.17 ../pom.xml From 160a4d8dd14a730aa490870ca720917ba192ceb8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Oct 2018 16:31:03 +0000 Subject: [PATCH 425/432] [WSO2 Release] [Jenkins #3192] [Release 4.1.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 3607c3ed3..097cf6a81 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.17 + 4.1.18-SNAPSHOT ../pom.xml From 4786462f096e0ddfa90c895deb716ea350ad3840 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Oct 2018 19:46:29 +0000 Subject: [PATCH 426/432] [WSO2 Release] [Jenkins #3194] [Release 4.1.18] prepare release v4.1.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 097cf6a81..9740ab5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.18-SNAPSHOT + 4.1.18 ../pom.xml From e704511d015a6d3b0b81646464edc91cd157ead6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Oct 2018 19:46:42 +0000 Subject: [PATCH 427/432] [WSO2 Release] [Jenkins #3194] [Release 4.1.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 9740ab5e0..335baf732 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.18 + 4.1.19-SNAPSHOT ../pom.xml From 94f53768585f553c04e1a81e1745920bbcd334bd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 25 Oct 2018 09:10:34 +0000 Subject: [PATCH 428/432] [WSO2 Release] [Jenkins #3196] [Release 4.1.19] prepare release v4.1.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 335baf732..c8265b338 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.19-SNAPSHOT + 4.1.19 ../pom.xml From f2238404d5f0161c9db590a4ce7cf1a7f5a1c987 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 25 Oct 2018 09:10:46 +0000 Subject: [PATCH 429/432] [WSO2 Release] [Jenkins #3196] [Release 4.1.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 c8265b338..2a33e2d8a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.19 + 4.1.20-SNAPSHOT ../pom.xml From ca1a24525799f2e0128bc53b67429fa95a386a8a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 31 Oct 2018 06:09:58 +0000 Subject: [PATCH 430/432] [WSO2 Release] [Jenkins #3198] [Release 4.1.20] prepare release v4.1.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a33e2d8a..cb9205156 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.20-SNAPSHOT + 4.1.20 ../pom.xml From decedf05dccf436b85d399145a0de3a4f673097e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 31 Oct 2018 06:10:10 +0000 Subject: [PATCH 431/432] [WSO2 Release] [Jenkins #3198] [Release 4.1.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 cb9205156..f84043397 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin org.wso2.carbon.devicemgt-plugins - 4.1.20 + 4.1.21-SNAPSHOT ../pom.xml From 3b69fc61aafeeb490470529ca478a0a26180ad40 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Mon, 24 Apr 2023 11:30:30 +0530 Subject: [PATCH 432/432] adding virtual fire alaram api implementation --- .../org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml | 0 .../virtualfirealarm/service/impl/VirtualFireAlarmService.java | 0 .../service/impl/VirtualFireAlarmServiceImpl.java | 0 .../service/impl/constants/VirtualFireAlarmConstants.java | 0 .../mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java | 0 .../service/impl/exception/VirtualFireAlarmException.java | 0 .../impl/listener/VirtualFireAlarmPermissionUpdateListener.java | 0 .../mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java | 0 .../service/impl/util/VirtualFireAlarmUtilConstants.java | 0 .../mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java | 0 .../mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java | 0 .../service/impl/xmpp/VirtualFirealarmXMPPException.java | 0 .../mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java | 0 .../mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java | 0 .../iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java | 0 .../src}/main/webapp/META-INF/permissions.xml | 0 .../src}/main/webapp/META-INF/webapp-classloading.xml | 0 .../src}/main/webapp/WEB-INF/cxf-servlet.xml | 0 .../src}/main/webapp/WEB-INF/web.xml | 0 .../src}/main/webapp/WEB-INF/xmpp.properties | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename pom.xml => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/webapp/META-INF/permissions.xml (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/webapp/META-INF/webapp-classloading.xml (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/webapp/WEB-INF/cxf-servlet.xml (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/webapp/WEB-INF/web.xml (100%) rename {src => components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src}/main/webapp/WEB-INF/xmpp.properties (100%) diff --git a/pom.xml b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml similarity index 100% rename from pom.xml rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java diff --git a/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java similarity index 100% rename from src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java diff --git a/src/main/webapp/META-INF/permissions.xml b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from src/main/webapp/META-INF/permissions.xml rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/META-INF/permissions.xml diff --git a/src/main/webapp/META-INF/webapp-classloading.xml b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from src/main/webapp/META-INF/webapp-classloading.xml rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from src/main/webapp/WEB-INF/cxf-servlet.xml rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/src/main/webapp/WEB-INF/web.xml b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/main/webapp/WEB-INF/web.xml rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml diff --git a/src/main/webapp/WEB-INF/xmpp.properties b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/xmpp.properties similarity index 100% rename from src/main/webapp/WEB-INF/xmpp.properties rename to components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/webapp/WEB-INF/xmpp.properties