From 68eb8a16449441bfaea505703b406e69ef4a0851 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Wed, 3 May 2023 14:53:40 +0530
Subject: [PATCH] refactor packaging of mobile puglins

---
 .../pom.xml                                            | 10 +++++-----
 .../pom.xml                                            |  6 +++---
 .../AndroidDeviceManagementServiceComponent.java       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
index cef8bf1d9..b00d7815b 100644
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
@@ -73,8 +73,8 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Export-Package>
-                            org.wso2.extension.siddhi.execution.json,
-                            org.wso2.extension.siddhi.execution.json.*
+                            io.entgra.device.mgt.plugins.extension.siddhi.execution.json,
+                            io.entgra.device.mgt.plugins.extension.siddhi.execution.json.*
                         </Export-Package>
                         <Import-Package>
                             org.json;version="${orbit.version.json.range}",
@@ -100,7 +100,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
-                    <destFile>../org.wso2.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</destFile>
+                    <destFile>../io.entgra.device.mgt.plugins.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</destFile>
                 </configuration>
                 <executions>
                     <execution>
@@ -116,8 +116,8 @@
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <dataFile>../org.wso2.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</dataFile>
-                            <outputDirectory>../org.wso2.extension.siddhi.execution.json/target/coverage-reports/site</outputDirectory>
+                            <dataFile>../io.entgra.device.mgt.plugins.extension.siddhi.execution.json/target/coverage-reports/jacoco-unit.exec</dataFile>
+                            <outputDirectory>../io.entgra.device.mgt.plugins.extension.siddhi.execution.json/target/coverage-reports/site</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
index 0dcee7f4d..8c674d970 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
@@ -54,7 +54,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version>
                         <Bundle-Description>Device Management Mobile Android Impl Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.device.mgt.mobile.android.internal</Private-Package>
+                        <Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
@@ -79,8 +79,8 @@
                             com.google.gson.*
                         </Import-Package>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.mobile.android.internal,
-                            org.wso2.carbon.device.mgt.mobile.android.*
+                            !io.entgra.device.mgt.plugins.mobile.android.internal,
+                            io.entgra.device.mgt.plugins.mobile.android.*
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java
index 165b152f4..ac2e108fb 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/src/main/java/io/entgra/device/mgt/plugins/mobile/android/internal/AndroidDeviceManagementServiceComponent.java
@@ -27,7 +27,7 @@ import org.wso2.carbon.ndatasource.core.DataSourceService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.mobile.android.impl.internal.AndroidDeviceManagementServiceComponent"
+ * @scr.component name="io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementServiceComponent"
  * immediate="true"
  * @scr.reference name="org.wso2.carbon.ndatasource"
  * interface="org.wso2.carbon.ndatasource.core.DataSourceService"