refactor packaging of output transport adaptors

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml

@@ -93,12 +93,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.device.mgt.output.adapter.http.internal,
-                            org.wso2.carbon.device.mgt.output.adapter.http.internal.*
+                            io.entgra.device.mgt.plugins.output.adapter.http.internal,
+                            io.entgra.device.mgt.plugins.output.adapter.http.internal.*
                         </Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.output.adapter.http.internal,
-                            !org.wso2.carbon.device.mgt.output.adapter.http.internal.*,
+                            !io.entgra.device.mgt.plugins.output.adapter.http.internal,
+                            !io.entgra.device.mgt.plugins.output.adapter.http.internal.*,
                             org.wso2.carbon.device.mgt.output.adapter.http.*
                         </Export-Package>
                         <Import-Package>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapter.java

@@ -15,7 +15,7 @@
 *  specific language governing permissions and limitations
 *  under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.http;
+package io.entgra.device.mgt.plugins.output.adapter.http;
 
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
@@ -36,11 +36,11 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.http.internal.OutputAdapterServiceDataHolder;
-import org.wso2.carbon.device.mgt.output.adapter.http.util.HTTPConnectionConfiguration;
-import org.wso2.carbon.device.mgt.output.adapter.http.util.HTTPEventAdapterConstants;
-import org.wso2.carbon.device.mgt.output.adapter.http.util.HTTPUtil;
-import org.wso2.carbon.device.mgt.output.adapter.http.util.RegistrationProfile;
+import io.entgra.device.mgt.plugins.output.adapter.http.internal.OutputAdapterServiceDataHolder;
+import io.entgra.device.mgt.plugins.output.adapter.http.util.HTTPConnectionConfiguration;
+import io.entgra.device.mgt.plugins.output.adapter.http.util.HTTPEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.http.util.HTTPUtil;
+import io.entgra.device.mgt.plugins.output.adapter.http.util.RegistrationProfile;
 import org.wso2.carbon.event.output.adapter.core.EventAdapterUtil;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/HTTPEventAdapterFactory.java

@@ -15,9 +15,9 @@
 *  specific language governing permissions and limitations
 *  under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.http;
+package io.entgra.device.mgt.plugins.output.adapter.http;
 
-import org.wso2.carbon.device.mgt.output.adapter.http.util.HTTPEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.http.util.HTTPEventAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.MessageType;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/HTTPEventAdapterServiceComponent.java

@@ -15,12 +15,12 @@
 *  specific language governing permissions and limitations
 *  under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.http.internal;
+package io.entgra.device.mgt.plugins.output.adapter.http.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.output.adapter.http.HTTPEventAdapterFactory;
+import io.entgra.device.mgt.plugins.output.adapter.http.HTTPEventAdapterFactory;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/OutputAdapterServiceDataHolder.java

@@ -12,7 +12,7 @@
  * CONDITIONS OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.wso2.carbon.device.mgt.output.adapter.http.internal;
+package io.entgra.device.mgt.plugins.output.adapter.http.internal;
 
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/util/HTTPConnectionConfiguration.java

@@ -15,7 +15,7 @@
 *  specific language governing permissions and limitations
 *  under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.http.util;
+package io.entgra.device.mgt.plugins.output.adapter.http.util;
 
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/util/HTTPEventAdapterConstants.java

@@ -15,7 +15,7 @@
 *  specific language governing permissions and limitations
 *  under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.http.util;
+package io.entgra.device.mgt.plugins.output.adapter.http.util;
 
 public class HTTPEventAdapterConstants {
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/util/HTTPUtil.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.http.util;
+package io.entgra.device.mgt.plugins.output.adapter.http.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/util/PropertyUtils.java

@@ -16,7 +16,7 @@
 *  under the License.
 */
 
-package org.wso2.carbon.device.mgt.output.adapter.http.util;
+package io.entgra.device.mgt.plugins.output.adapter.http.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/util/RegistrationProfile.java

@@ -15,7 +15,7 @@
 *  specific language governing permissions and limitations
 *  under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.http.util;
+package io.entgra.device.mgt.plugins.output.adapter.http.util;
 
 /**
  * This class represents the data that are required to register

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml

@@ -106,12 +106,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.device.mgt.output.adapter.mqtt.internal,
-                            org.wso2.carbon.device.mgt.output.adapter.mqtt.internal.*
+                            io.entgra.device.mgt.plugins.output.adapter.mqtt.internal,
+                            io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.*
                         </Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.output.adapter.mqtt.internal,
-                            !org.wso2.carbon.device.mgt.output.adapter.mqtt.internal.*,
+                            !io.entgra.device.mgt.plugins.output.adapter.mqtt.internal,
+                            !io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.*,
                             org.wso2.carbon.device.mgt.output.adapter.mqtt.*,
                         </Export-Package>
                         <Import-Package>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapter.java

@@ -15,14 +15,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.mqtt.util.MQTTAdapterPublisher;
-import org.wso2.carbon.device.mgt.output.adapter.mqtt.util.MQTTEventAdapterConstants;
-import org.wso2.carbon.device.mgt.output.adapter.mqtt.util.MQTTBrokerConnectionConfiguration;
+import io.entgra.device.mgt.plugins.output.adapter.mqtt.util.MQTTAdapterPublisher;
+import io.entgra.device.mgt.plugins.output.adapter.mqtt.util.MQTTEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.mqtt.util.MQTTBrokerConnectionConfiguration;
 import org.wso2.carbon.event.output.adapter.core.EventAdapterUtil;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java

@@ -15,9 +15,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt;
 
-import org.wso2.carbon.device.mgt.output.adapter.mqtt.util.MQTTEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.mqtt.util.MQTTEventAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.*;
 
 import java.util.*;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/MQTTEventAdapterServiceComponent.java

@@ -15,12 +15,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.internal;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.output.adapter.mqtt.MQTTEventAdapterFactory;
+import io.entgra.device.mgt.plugins.output.adapter.mqtt.MQTTEventAdapterFactory;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/OutputAdapterServiceDataHolder.java

@@ -12,7 +12,7 @@
  * CONDITIONS OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.internal;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.internal;
 
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTAdapterPublisher.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.util;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -42,7 +42,6 @@ import org.wso2.carbon.apimgt.keymgt.extension.exception.KeyMgtException;
 import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtService;
 import org.wso2.carbon.apimgt.keymgt.extension.service.KeyMgtServiceImpl;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.mqtt.internal.OutputAdapterServiceDataHolder;
 import org.wso2.carbon.event.output.adapter.core.exception.ConnectionUnavailableException;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException;
@@ -51,13 +50,6 @@ import org.wso2.carbon.identity.jwt.client.extension.exception.JWTClientExceptio
 import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
 import org.wso2.carbon.user.api.UserStoreException;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-
 /**
  * MQTT publisher related configuration initialization and publishing capabilties are implemented here.
  */

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.util;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.util;
 
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTEventAdapterConstants.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.util;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.util;
 
 
 public final class MQTTEventAdapterConstants {

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTUtil.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.util;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/PropertyUtils.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.util;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/RegistrationProfile.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.device.mgt.output.adapter.mqtt.util;
+package io.entgra.device.mgt.plugins.output.adapter.mqtt.util;
 
 /**
  * This class represents the data that are required to register

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/HttpSessionConfigurator.java

@@ -18,9 +18,9 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint;
 
-import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants.Constants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.constants.Constants;
 
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/SubscriptionEndpoint.java

@@ -17,11 +17,11 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint;
 
+import io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.util.ServiceHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util.ServiceHolder;
 
 import javax.websocket.CloseReason;
 import javax.websocket.Session;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/SuperTenantSubscriptionEndpoint.java

@@ -16,17 +16,17 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint;
 
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.AuthenticationInfo;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.Authenticator;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.Authorizer;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.constants.Constants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.util.ServiceHolder;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants.Constants;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util.ServiceHolder;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
 import javax.websocket.CloseReason;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/TenantSubscriptionEndpoint.java

@@ -16,17 +16,17 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint;
 
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.AuthenticationInfo;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.Authenticator;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.Authorizer;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.constants.Constants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.util.ServiceHolder;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants.Constants;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util.ServiceHolder;
 
 import javax.websocket.CloseReason;
 import javax.websocket.EndpointConfig;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/constants/Constants.java

@@ -18,7 +18,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.constants;
 
 public class Constants {
     public static final String HTTP_HEADERS = "HttpHeaders";

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/util/ServiceHolder.java

@@ -16,13 +16,13 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.util;
 
+import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerService;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.service.WebsocketValidationService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.WebsocketOutputCallbackControllerService;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.service.WebsocketValidationService;
 
 public class ServiceHolder {
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/endpoint/util/UIConstants.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint.util;
 
 /**
  * This class contains the constants related to websocket client.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml

@@ -128,13 +128,13 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.device.mgt.output.adapter.websocket.internal,
-                            org.wso2.carbon.device.mgt.output.adapter.websocket.internal.*
+                            io.entgra.device.mgt.plugins.output.adapter.websocket.internal,
+                            io.entgra.device.mgt.plugins.output.adapter.websocket.internal.*
                         </Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.output.adapter.websocket.internal,
-                            !org.wso2.carbon.device.mgt.output.adapter.websocket.internal.*,
-                            org.wso2.carbon.device.mgt.output.adapter.websocket.*
+                            !io.entgra.device.mgt.plugins.output.adapter.websocket.internal,
+                            !io.entgra.device.mgt.plugins.output.adapter.websocket.internal.*,
+                            io.entgra.device.mgt.plugins.output.adapter.websocket.*
                         </Export-Package>
                         <Import-Package>
                             org.wso2.carbon.event.output.adapter.core.*,

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketEventAdapter.java

@@ -16,7 +16,7 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket;
+package io.entgra.device.mgt.plugins.output.adapter.websocket;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,10 +24,10 @@ import org.json.JSONObject;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.databridge.commons.StreamDefinition;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.constants.WebsocketConstants;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.internal.WebsocketEventAdaptorServiceDataHolder;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.WebSocketSessionRequest;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.WebsocketEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.constants.WebsocketConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.internal.WebsocketEventAdaptorServiceDataHolder;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.WebSocketSessionRequest;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.WebsocketEventAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.EventAdapterUtil;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketEventAdapterFactory.java

@@ -16,16 +16,16 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket;
+package io.entgra.device.mgt.plugins.output.adapter.websocket;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.service.WebsocketValidationService;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.service.WebsocketValidationServiceImpl;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.WebsocketEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.Authenticator;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.Authorizer;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.service.WebsocketValidationService;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.service.WebsocketValidationServiceImpl;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.WebsocketEventAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.MessageType;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketOutputCallbackControllerService.java

@@ -17,7 +17,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket;
+package io.entgra.device.mgt.plugins.output.adapter.websocket;
 
 import javax.websocket.Session;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/WebsocketOutputCallbackControllerServiceImpl.java

@@ -16,12 +16,12 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket;
+package io.entgra.device.mgt.plugins.output.adapter.websocket;
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.internal.WebsocketEventAdaptorServiceDataHolder;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.WebSocketSessionRequest;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.WebsocketEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.internal.WebsocketEventAdaptorServiceDataHolder;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.WebSocketSessionRequest;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.WebsocketEventAdapterConstants;
 
 import javax.websocket.Session;
 import java.util.Iterator;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authentication/AuthenticationInfo.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authentication;
 
 import java.util.Map;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authentication/Authenticator.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authentication;
 
 import java.util.List;
 import java.util.Map;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authentication/OAuthAuthenticator.java

@@ -12,9 +12,9 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authentication;
 
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.oauth.OAuthTokenValdiator;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth.OAuthTokenValdiator;
 
 import java.util.List;
 import java.util.Map;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authentication/oauth/OAuthTokenValdiator.java

@@ -12,15 +12,15 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.oauth;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth;
 
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.constants.WebsocketConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.AuthenticationInfo;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.constants.WebsocketConstants;
 import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
 import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;
 import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authentication/oauth/OAuthTokenValidaterStubFactory.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.oauth;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
@@ -33,9 +33,9 @@ import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.pool.BasePoolableObjectFactory;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.oauth.exception.OAuthTokenValidationException;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.constants.WebsocketConstants;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.PropertyUtils;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth.exception.OAuthTokenValidationException;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.constants.WebsocketConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.PropertyUtils;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authentication/oauth/exception/OAuthTokenValidationException.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.oauth.exception;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth.exception;
 
 /**
  * This Exception will be thrown, when there any interference with token validation flow.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/Authorizer.java

@@ -16,9 +16,9 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization;
 
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.AuthenticationInfo;
 
 import javax.websocket.Session;
 import java.util.Map;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/DeviceAuthorizer.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization;
 
 import feign.Client;
 import feign.Feign;
@@ -28,16 +28,16 @@ import feign.slf4j.Slf4jLogger;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.base.ServerConfiguration;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.OAuthRequestInterceptor;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.AuthorizationRequest;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.AuthenticationInfo;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.OAuthRequestInterceptor;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.AuthorizationRequest;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto
         .DeviceAccessAuthorizationAdminService;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.DeviceAuthorizationResult;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.constants.WebsocketConstants;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.PropertyUtils;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.WebSocketSessionRequest;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.DeviceAuthorizationResult;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.DeviceIdentifier;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.constants.WebsocketConstants;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.PropertyUtils;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.WebSocketSessionRequest;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 
 import javax.net.ssl.*;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client;
 
 import feign.Client;
 import feign.Feign;
@@ -29,12 +29,12 @@ import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.base.ServerConfiguration;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.AccessTokenInfo;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.ApiApplicationKey;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.ApiApplicationRegistrationService;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.ApiRegistrationProfile;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto.TokenIssuerService;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.util.PropertyUtils;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.AccessTokenInfo;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.ApiApplicationKey;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.ApiApplicationRegistrationService;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.ApiRegistrationProfile;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto.TokenIssuerService;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.util.PropertyUtils;
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 
 import javax.net.ssl.HostnameVerifier;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/AccessTokenInfo.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 /**
  * This hold access token info that returned from the api call

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/ApiApplicationKey.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 /**
  * This holds api application consumer key and secret.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/ApiApplicationRegistrationService.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/ApiRegistrationProfile.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 
 /**

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/AuthorizationRequest.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 import java.util.List;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/DeviceAccessAuthorizationAdminService.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 
 import javax.ws.rs.Consumes;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/DeviceAuthorizationResult.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 import java.util.ArrayList;
 import java.util.List;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/DeviceIdentifier.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 import java.io.Serializable;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/OAuthApplicationInfo.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 /**
  * This class represents an OAuth application populated with necessary data.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/RegisterInfo.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 /**
  * This holds the data related to registration.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/RegistrationProfile.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 
 /**

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/dto/TokenIssuerService.java

@@ -24,7 +24,7 @@
  * See the License for the specific language governing permissions and limitations under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client.dto;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.client.dto;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.FormParam;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/constants/WebsocketConstants.java

@@ -16,7 +16,7 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.constants;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.constants;
 
 /**
  * This holds the constants related to this feature

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/internal/WebsocketEventAdaptorServiceDataHolder.java

@@ -16,9 +16,9 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.internal;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.internal;
 
-import org.wso2.carbon.device.mgt.output.adapter.websocket.WebsocketOutputCallbackControllerServiceImpl;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerServiceImpl;
 import org.wso2.carbon.event.stream.core.EventStreamService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/internal/WebsocketLocalEventAdapterServiceComponent.java

@@ -16,15 +16,15 @@
  *  under the License.
  *
  */
-package org.wso2.carbon.device.mgt.output.adapter.websocket.internal;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.WebsocketEventAdapterFactory;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.WebsocketOutputCallbackControllerServiceImpl;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketEventAdapterFactory;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerServiceImpl;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.WebsocketOutputCallbackControllerService;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerService;
 import org.wso2.carbon.event.stream.core.EventStreamService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/service/WebsocketValidationService.java

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.service;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.service;
 
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.Authenticator;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.Authorizer;
 
 /**
  * This returns the configured authenticator and authorizer for websocket.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/service/WebsocketValidationServiceImpl.java

@@ -16,10 +16,10 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.service;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.service;
 
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
-import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.Authenticator;
+import io.entgra.device.mgt.plugins.output.adapter.websocket.authorization.Authorizer;
 
 /**
  * This returns the configured authenticator and authorizer for websocket.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/util/PropertyUtils.java

@@ -16,7 +16,7 @@
 * under the License.
 */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.util;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.util;
 
 import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/util/WebSocketSessionRequest.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.util;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/util/WebsocketEventAdapterConstants.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.output.adapter.websocket.util;
+package io.entgra.device.mgt.plugins.output.adapter.websocket.util;
 
 /**
  * This class contains the constants related to websocket Output Event Adaptor.

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml

@@ -83,12 +83,12 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Private-Package>
-                            org.wso2.carbon.device.mgt.output.adapter.xmpp.internal,
-                            org.wso2.carbon.device.mgt.output.adapter.xmpp.internal.*
+                            io.entgra.device.mgt.plugins.output.adapter.xmpp.internal,
+                            io.entgra.device.mgt.plugins.output.adapter.xmpp.internal.*
                         </Private-Package>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.output.adapter.xmpp.internal,
-                            !org.wso2.carbon.device.mgt.output.adapter.xmpp.internal.*,
+                            !io.entgra.device.mgt.plugins.output.adapter.xmpp.internal,
+                            !io.entgra.device.mgt.plugins.output.adapter.xmpp.internal.*,
                             org.wso2.carbon.device.mgt.output.adapter.xmpp.*,
                         </Export-Package>
                         <Import-Package>

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/XMPPEventAdapter.java

@@ -15,14 +15,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.xmpp;
+package io.entgra.device.mgt.plugins.output.adapter.xmpp;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.output.adapter.xmpp.util.XMPPEventAdapterConstants;
-import org.wso2.carbon.device.mgt.output.adapter.xmpp.util.XMPPAdapterPublisher;
-import org.wso2.carbon.device.mgt.output.adapter.xmpp.util.XMPPServerConnectionConfiguration;
+import io.entgra.device.mgt.plugins.output.adapter.xmpp.util.XMPPEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.xmpp.util.XMPPAdapterPublisher;
+import io.entgra.device.mgt.plugins.output.adapter.xmpp.util.XMPPServerConnectionConfiguration;
 import org.wso2.carbon.event.output.adapter.core.EventAdapterUtil;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapter;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/XMPPEventAdapterFactory.java

@@ -15,9 +15,9 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.xmpp;
+package io.entgra.device.mgt.plugins.output.adapter.xmpp;
 
-import org.wso2.carbon.device.mgt.output.adapter.xmpp.util.XMPPEventAdapterConstants;
+import io.entgra.device.mgt.plugins.output.adapter.xmpp.util.XMPPEventAdapterConstants;
 import org.wso2.carbon.event.output.adapter.core.*;
 
 import java.util.*;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/internal/XMPPEventAdapterServiceComponent.java

@@ -15,12 +15,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.xmpp.internal;
+package io.entgra.device.mgt.plugins.output.adapter.xmpp.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.output.adapter.xmpp.XMPPEventAdapterFactory;
+import io.entgra.device.mgt.plugins.output.adapter.xmpp.XMPPEventAdapterFactory;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
 
 

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/util/XMPPAdapterPublisher.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.xmpp.util;
+package io.entgra.device.mgt.plugins.output.adapter.xmpp.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/util/XMPPEventAdapterConstants.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.xmpp.util;
+package io.entgra.device.mgt.plugins.output.adapter.xmpp.util;
 
 
 public final class XMPPEventAdapterConstants {

components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/util/XMPPServerConnectionConfiguration.java

@@ -15,7 +15,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.wso2.carbon.device.mgt.output.adapter.xmpp.util;
+package io.entgra.device.mgt.plugins.output.adapter.xmpp.util;
 
 public class XMPPServerConnectionConfiguration {