refactor packages in virtual fire alarm feature

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml

@@ -52,8 +52,8 @@
 					<archive>
 						<manifest>
 							<mainClass>
-								org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.Bootstrap
-							</mainClass>
+                                io.entgra.device.mgt.plugins.virtualfirealarm.agent.Bootstrap
+                            </mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>

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 {
 

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;

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;

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;

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

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

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;

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;

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;

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{

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;

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

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;

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

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

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;

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

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;

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;

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;

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;

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

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 {
 

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.*;

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;

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

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;

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;

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;

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 {

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.

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;

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{

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.

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;

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;

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 @@
     <jaxrs:server id="VirtualFireAlarm" address="/">
         <jaxrs:serviceBeans>
             <bean id="VirtualFireAlarmService"
-                  class="org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.VirtualFireAlarmServiceImpl">
+                  class="io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.VirtualFireAlarmServiceImpl">
             </bean>
         </jaxrs:serviceBeans>
         <jaxrs:providers>

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 @@
     </context-param>
 
     <listener>
-        <listener-class>org.wso2.carbon.device.mgt.iot.virtualfirealarm.service.impl.listener.VirtualFireAlarmPermissionUpdateListener</listener-class>
+        <listener-class>io.entgra.device.mgt.plugins.virtualfirealarm.api.service.impl.listener.VirtualFireAlarmPermissionUpdateListener</listener-class>
     </listener>
 
 </web-app>