From 6181f983d8d7d06c3ba69a33fd02dff0b1b33361 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 3 May 2023 14:25:36 +0530 Subject: [PATCH] refactor packages in virtual fire alarm feature --- .../pom.xml | 4 ++-- .../virtualfirealarm/agent/Bootstrap.java | 4 ++-- .../http/FireAlarmHTTPCommunicator.java | 14 +++++------ .../mqtt/FireAlarmMQTTCommunicator.java | 14 +++++------ .../xmpp/FireAlarmXMPPCommunicator.java | 15 ++++++------ .../agent/core/AgentConfiguration.java | 2 +- .../agent/core/AgentConstants.java | 2 +- .../agent/core/AgentManager.java | 19 +++++++-------- .../agent/core/AgentUtilOperations.java | 12 +++++----- .../agent/enrollment/EnrollmentManager.java | 9 ++++--- .../AgentCoreOperationException.java | 2 +- .../agent/transport/CommunicationUtils.java | 2 +- .../agent/transport/TransportHandler.java | 2 +- .../transport/TransportHandlerException.java | 2 +- .../agent/transport/TransportUtils.java | 7 ++---- .../transport/http/HTTPTransportHandler.java | 6 ++--- .../transport/mqtt/MQTTTransportHandler.java | 7 +++--- .../transport/xmpp/XMPPTransportHandler.java | 6 ++--- .../agent/virtual/VirtualHardwareManager.java | 8 +++---- .../agent/virtual/ui/AgentUI.java | 8 +++---- .../service/impl/VirtualFireAlarmService.java | 2 +- .../impl/VirtualFireAlarmServiceImpl.java | 24 +++++++++---------- .../constants/VirtualFireAlarmConstants.java | 2 +- .../service/impl/dao/DeviceEventsDAO.java | 4 ++-- .../impl/dao/DeviceEventsDAOFactory.java | 2 +- .../service/impl/dao/DeviceEventsDAOImpl.java | 4 ++-- .../api}/service/impl/dto/SensorRecord.java | 5 +--- .../exception/VirtualFireAlarmException.java | 2 +- ...tualFireAlarmPermissionUpdateListener.java | 4 ++-- .../api}/service/impl/util/APIUtil.java | 2 +- .../util/VirtualFireAlarmUtilConstants.java | 2 +- .../api}/service/impl/util/ZipArchive.java | 4 +--- .../api}/service/impl/util/ZipUtil.java | 4 ++-- .../xmpp/VirtualFirealarmXMPPException.java | 2 +- .../api}/service/impl/xmpp/XmppAccount.java | 2 +- .../api}/service/impl/xmpp/XmppConfig.java | 2 +- .../service/impl/xmpp/XmppServerClient.java | 2 +- .../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- 39 files changed, 103 insertions(+), 115 deletions(-) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/Bootstrap.java (89%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java (97%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java (93%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/core/AgentConfiguration.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/core/AgentConstants.java (99%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/core/AgentManager.java (92%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/core/AgentUtilOperations.java (97%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/enrollment/EnrollmentManager.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/exception/AgentCoreOperationException.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/CommunicationUtils.java (99%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/TransportHandler.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/TransportHandlerException.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/TransportUtils.java (97%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java (92%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java (97%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/virtual/VirtualHardwareManager.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/{org/wso2/carbon/device/mgt/iot => io/entgra/device/mgt/plugins}/virtualfirealarm/agent/virtual/ui/AgentUI.java (99%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/VirtualFireAlarmService.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/VirtualFireAlarmServiceImpl.java (92%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/constants/VirtualFireAlarmConstants.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/dao/DeviceEventsDAO.java (84%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/dao/DeviceEventsDAOFactory.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/dao/DeviceEventsDAOImpl.java (94%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/dto/SensorRecord.java (80%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/exception/VirtualFireAlarmException.java (93%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java (96%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/util/APIUtil.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/util/VirtualFireAlarmUtilConstants.java (94%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/util/ZipArchive.java (90%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/util/ZipUtil.java (98%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/xmpp/VirtualFirealarmXMPPException.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/xmpp/XmppAccount.java (95%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/xmpp/XmppConfig.java (97%) rename components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/{org/wso2/carbon/device/mgt/iot/virtualfirealarm => io/entgra/device/mgt/plugins/virtualfirealarm/api}/service/impl/xmpp/XmppServerClient.java (97%) diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index aec0153f4..47b731025 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -52,8 +52,8 @@ - org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.Bootstrap - + io.entgra.device.mgt.plugins.virtualfirealarm.agent.Bootstrap + diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/Bootstrap.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/Bootstrap.java similarity index 89% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/Bootstrap.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/Bootstrap.java index 63d4b2595..1ab711254 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/Bootstrap.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/Bootstrap.java @@ -16,9 +16,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentManager; public class Bootstrap { diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java similarity index 97% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java index ead68c528..767fc9c66 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/http/FireAlarmHTTPCommunicator.java @@ -16,19 +16,19 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.communication.http; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.communication.http; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.AbstractHandler; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportUtils; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.http.HTTPTransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception.AgentCoreOperationException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportUtils; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.http.HTTPTransportHandler; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java index 777671038..72ea62835 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/mqtt/FireAlarmMQTTCommunicator.java @@ -16,19 +16,19 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.communication.mqtt; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.communication.mqtt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.MqttSecurityException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentUtilOperations; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.mqtt.MQTTTransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentUtilOperations; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception.AgentCoreOperationException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.mqtt.MQTTTransportHandler; import java.nio.charset.StandardCharsets; import java.util.concurrent.Executors; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java similarity index 93% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java index 0780f2d84..4c09763e8 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/communication/xmpp/FireAlarmXMPPCommunicator.java @@ -16,18 +16,17 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.communication.xmpp; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.communication.xmpp; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jivesoftware.smack.packet.Message; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConfiguration; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentUtilOperations; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.xmpp.XMPPTransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentUtilOperations; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception.AgentCoreOperationException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.xmpp.XMPPTransportHandler; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConfiguration.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentConfiguration.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConfiguration.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentConfiguration.java index 7d8f1dc57..a10bea224 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConfiguration.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentConfiguration.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.core; /** * A Configuration class that holds all the Agent specific details that are read from the diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConstants.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentConstants.java similarity index 99% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConstants.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentConstants.java index 57fbc4ec4..10c895b0a 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentConstants.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentConstants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.core; public class AgentConstants { public static final String DEVICE_TYPE = "virtual_firealarm"; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentManager.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentManager.java similarity index 92% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentManager.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentManager.java index df3435c27..ae81392a6 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentManager.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentManager.java @@ -16,19 +16,18 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.core; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.communication.http.FireAlarmHTTPCommunicator; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.communication.mqtt.FireAlarmMQTTCommunicator; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.communication.xmpp.FireAlarmXMPPCommunicator; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.enrollment.EnrollmentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandler; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportUtils; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.virtual.VirtualHardwareManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.communication.http.FireAlarmHTTPCommunicator; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.communication.mqtt.FireAlarmMQTTCommunicator; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.communication.xmpp.FireAlarmXMPPCommunicator; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception.AgentCoreOperationException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportUtils; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.virtual.VirtualHardwareManager; import java.util.ArrayList; import java.util.HashMap; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentUtilOperations.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java similarity index 97% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentUtilOperations.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java index fa2a59275..e90ebbf5e 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/core/AgentUtilOperations.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/core/AgentUtilOperations.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.core; import org.apache.commons.codec.binary.Base64; import org.apache.commons.configuration.ConfigurationException; @@ -25,11 +25,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jetty.http.HttpStatus; import org.json.JSONObject; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.enrollment.EnrollmentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.CommunicationUtils; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportUtils; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.enrollment.EnrollmentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception.AgentCoreOperationException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.CommunicationUtils; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportUtils; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/enrollment/EnrollmentManager.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/enrollment/EnrollmentManager.java index 26006620f..066ffeb0f 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/enrollment/EnrollmentManager.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/enrollment/EnrollmentManager.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.enrollment; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.enrollment; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,12 +39,11 @@ import org.jscep.client.verification.CertificateVerifier; import org.jscep.client.verification.OptimisticCertificateVerifier; import org.jscep.transaction.TransactionException; import org.jscep.transport.response.Capabilities; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception.AgentCoreOperationException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception.AgentCoreOperationException; import sun.security.x509.X509CertImpl; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.math.BigInteger; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/exception/AgentCoreOperationException.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/exception/AgentCoreOperationException.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/exception/AgentCoreOperationException.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/exception/AgentCoreOperationException.java index fac321ef9..0c4a73807 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/exception/AgentCoreOperationException.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/exception/AgentCoreOperationException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.exception; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.exception; public class AgentCoreOperationException extends Exception{ diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/CommunicationUtils.java similarity index 99% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/CommunicationUtils.java index 46a43a0ba..35ead0602 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/CommunicationUtils.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/CommunicationUtils.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportHandler.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportHandler.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportHandler.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportHandler.java index fa45cdbb0..9fc18b402 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportHandler.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport; /** * This interface consists of the core functionality related to the transport between any device and the server. The diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportHandlerException.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportHandlerException.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportHandlerException.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportHandlerException.java index 9ae69a998..a9a6a4c53 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportHandlerException.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportHandlerException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport; public class TransportHandlerException extends Exception { private static final long serialVersionUID = 2736466230451105440L; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportUtils.java similarity index 97% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportUtils.java index b55aee02d..fa21364ff 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/TransportUtils.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/TransportUtils.java @@ -16,15 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; import java.io.BufferedReader; -import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.net.DatagramSocket; @@ -42,7 +40,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import java.util.Random; public class TransportUtils { private static final Log log = LogFactory.getLog(TransportUtils.class); diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java similarity index 92% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java index c771eb8ed..64bbf9e86 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/http/HTTPTransportHandler.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.http; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.http; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jetty.server.Server; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandler; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportUtils; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportUtils; /** * This is an abstract class that implements the "TransportHandler" interface. The interface is an abstraction for diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java similarity index 97% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java index f7c6864c1..be0040f2c 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/mqtt/MQTTTransportHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.mqtt; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.mqtt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,9 +27,8 @@ import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.MqttSecurityException; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandler; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java index 4ac76f45b..a7c097e50 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/transport/xmpp/XMPPTransportHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.xmpp; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.xmpp; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,8 +33,8 @@ import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.filter.ToContainsFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandler; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.transport.TransportHandlerException; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandler; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.transport.TransportHandlerException; /** * This is an abstract class that implements the "TransportHandler" interface. The interface is an abstraction for diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/virtual/VirtualHardwareManager.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/virtual/VirtualHardwareManager.java index fdb271e79..e831f7376 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/VirtualHardwareManager.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/virtual/VirtualHardwareManager.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.virtual; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.virtual; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentUtilOperations; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.virtual.ui.AgentUI; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentUtilOperations; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.virtual.ui.AgentUI; import javax.sound.midi.InvalidMidiDataException; import javax.sound.midi.MidiSystem; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/virtual/ui/AgentUI.java similarity index 99% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/virtual/ui/AgentUI.java index 15b544389..9313bddfa 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/agent/virtual/ui/AgentUI.java @@ -16,11 +16,11 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.virtual.ui; +package io.entgra.device.mgt.plugins.virtualfirealarm.agent.virtual.ui; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.virtual.VirtualHardwareManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.core.AgentManager; +import io.entgra.device.mgt.plugins.virtualfirealarm.agent.virtual.VirtualHardwareManager; import java.awt.*; import java.net.URL; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java index e9a080abe..d677210fe 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl; import io.swagger.annotations.*; import org.wso2.carbon.apimgt.annotations.api.Scope; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java similarity index 92% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java index d8f298eaf..c38015053 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmServiceImpl.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,17 +33,17 @@ import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; 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.dao.DeviceEventsDAO; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dao.DeviceEventsDAOImpl; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util.APIUtil; -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 io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.constants.VirtualFireAlarmConstants; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao.DeviceEventsDAO; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao.DeviceEventsDAOImpl; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dto.SensorRecord; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util.APIUtil; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util.ZipArchive; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util.ZipUtil; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.VirtualFirealarmXMPPException; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppAccount; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppConfig; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.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; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/constants/VirtualFireAlarmConstants.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/constants/VirtualFireAlarmConstants.java index 16a1bccbc..71f0c2a89 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/constants/VirtualFireAlarmConstants.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/constants/VirtualFireAlarmConstants.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.constants; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.constants; public class VirtualFireAlarmConstants { public final static String DEVICE_TYPE = "virtual_firealarm"; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAO.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAO.java similarity index 84% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAO.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAO.java index 84f8a29ab..dc3d15324 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAO.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAO.java @@ -17,9 +17,9 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dao; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dto.SensorRecord; public interface DeviceEventsDAO { diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAOFactory.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOFactory.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAOFactory.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOFactory.java index 5d3820bd1..a70d40cb3 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAOFactory.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dao; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao; import org.wso2.carbon.device.mgt.common.exceptions.*; import org.wso2.carbon.device.mgt.core.dao.util.*; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAOImpl.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOImpl.java similarity index 94% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAOImpl.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOImpl.java index 9bbd73613..f4a980259 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dao/DeviceEventsDAOImpl.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dao/DeviceEventsDAOImpl.java @@ -17,11 +17,11 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dao; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dao; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto.SensorRecord; +import io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.dto.SensorRecord; import org.wso2.carbon.device.mgt.common.exceptions.*; import java.sql.Connection; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dto/SensorRecord.java similarity index 80% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dto/SensorRecord.java index 833851ea9..9b52fc7fd 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/dto/SensorRecord.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/dto/SensorRecord.java @@ -1,12 +1,9 @@ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.dto; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.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 diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/exception/VirtualFireAlarmException.java similarity index 93% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/exception/VirtualFireAlarmException.java index 4305ec7c0..1892ad2c3 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/exception/VirtualFireAlarmException.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/exception/VirtualFireAlarmException.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.exception; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.exception; public class VirtualFireAlarmException extends Exception { private static final long serialVersionUID = 118512086957330189L; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java similarity index 96% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java index 16a6897b3..5bec0d1e7 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/listener/VirtualFireAlarmPermissionUpdateListener.java @@ -13,13 +13,13 @@ * 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; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.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 io.entgra.device.mgt.plugins.virtualfirealarm.api.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; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/APIUtil.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/APIUtil.java index cc31583e1..0dfef38cd 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/APIUtil.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/APIUtil.java @@ -1,4 +1,4 @@ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/VirtualFireAlarmUtilConstants.java similarity index 94% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/VirtualFireAlarmUtilConstants.java index a255b9537..6de48fdd7 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/VirtualFireAlarmUtilConstants.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/VirtualFireAlarmUtilConstants.java @@ -1,4 +1,4 @@ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util; public class VirtualFireAlarmUtilConstants { diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipArchive.java similarity index 90% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipArchive.java index 2152a5e36..6f809e8ab 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipArchive.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipArchive.java @@ -16,9 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; - -import java.util.zip.ZipOutputStream; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util; /** * This is an utility class to hold zip files. diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipUtil.java similarity index 98% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipUtil.java index ed05d03c6..3a47f6f31 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/util/ZipUtil.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/util/ZipUtil.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.util; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.util; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; @@ -29,7 +29,7 @@ import org.wso2.carbon.device.mgt.common.exceptions.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 io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp.XmppConfig; import org.wso2.carbon.utils.CarbonUtils; import java.io.BufferedOutputStream; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/VirtualFirealarmXMPPException.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/VirtualFirealarmXMPPException.java index 57d0b8a0b..9c50fe0f2 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/VirtualFirealarmXMPPException.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/VirtualFirealarmXMPPException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp; public class VirtualFirealarmXMPPException extends Exception{ diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppAccount.java similarity index 95% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppAccount.java index 162ea957f..93f218e8a 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppAccount.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppAccount.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp; /** * holds the information related to account that needs to be created on xmpp server. diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppConfig.java similarity index 97% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppConfig.java index d96f14c6e..c73c6da20 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppConfig.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppConfig.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppServerClient.java similarity index 97% rename from components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java rename to components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppServerClient.java index 7369f90a4..d7444ddb5 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/xmpp/XmppServerClient.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/xmpp/XmppServerClient.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.xmpp; +package io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.xmpp; import org.jivesoftware.smack.AccountManager; import org.jivesoftware.smack.ConnectionConfiguration; diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 37a69c268..0570decf1 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -26,7 +26,7 @@ + class="io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.VirtualFireAlarmServiceImpl"> diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml index ff13bc494..88b6ced22 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/webapp/WEB-INF/web.xml @@ -32,7 +32,7 @@ - org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.listener.VirtualFireAlarmPermissionUpdateListener + io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.listener.VirtualFireAlarmPermissionUpdateListener \ No newline at end of file