community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactored device-mgt extension component

Browse Source
This commit is contained in:
Amalka Subasinghe 2023-05-11 12:14:29 +05:30
parent 0bf6b3899e
commit 75309b8d96
130 changed files with 238 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
View File

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

8
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
View File

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

8
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.device.mgt.extensions.defaultrole.manager</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Entgra IoT - Default User Roles Management Module</name> <name>Entgra IoT - Default User Roles Management Module</name>
<description>Entgra IoT - Default User Roles Management Module Implementation</description> <description>Entgra IoT - Default User Roles Management Module Implementation</description>
@ -59,7 +59,7 @@
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>IoT - User Roles Management Bundle</Bundle-Description> <Bundle-Description>IoT - User Roles Management Bundle</Bundle-Description>
<Private-Package>io.entgra.device.mgt.extensions.defaultrole.manager.internal</Private-Package> <Private-Package>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal</Private-Package>
<Import-Package> <Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
@ -79,8 +79,8 @@
org.wso2.carbon.user.mgt.common org.wso2.carbon.user.mgt.common
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
!io.entgra.device.mgt.extensions.defaultrole.manager.internal, !io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal,
io.entgra.device.mgt.extensions.defaultrole.manager.*;version="${project.version}" io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.*;version="${project.version}"
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

6
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRolesConfigManager.java
View File

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
import io.entgra.device.mgt.extensions.defaultrole.manager.exception.DefaultRoleManagerException; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.exception.DefaultRoleManagerException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document; import org.w3c.dom.Document;

8
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/IoTSStartupHandler.java
View File

@ -17,11 +17,11 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
import io.entgra.device.mgt.extensions.defaultrole.manager.bean.Role; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.Role;
import io.entgra.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.CarbonConstants;

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/DefaultRolesConfig.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.bean; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/bean/Role.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/bean/Role.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.bean; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/exception/DefaultRoleManagerException.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.exception; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.exception;
public class DefaultRoleManagerException extends Exception { public class DefaultRoleManagerException extends Exception {

4
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerDataHolder.java
View File

@ -16,9 +16,9 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.internal; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal;
import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.user.api.UserRealm; import org.wso2.carbon.user.api.UserRealm;

6
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/internal/RoleManagerServiceComponent.java
View File

@ -17,15 +17,15 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.internal; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal;
import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.core.ServerStartupObserver; import org.wso2.carbon.core.ServerStartupObserver;
import io.entgra.device.mgt.extensions.defaultrole.manager.IoTSStartupHandler; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.IoTSStartupHandler;
import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.utils.ConfigurationContextService; import org.wso2.carbon.utils.ConfigurationContextService;

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/BaseTest.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/BaseTest.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.test; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeSuite; import org.testng.annotations.BeforeSuite;

7
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/extensions/defaultrole/manager/test/DefaultRoleReadingTest.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/defaultrole/manager/DefaultRoleReadingTest.java
View File

@ -16,12 +16,11 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.defaultrole.manager.test; package io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.entgra.device.mgt.extensions.defaultrole.manager.DefaultRolesConfigManager; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig;
import io.entgra.device.mgt.extensions.defaultrole.manager.bean.DefaultRolesConfig; import io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
import io.entgra.device.mgt.extensions.defaultrole.manager.internal.RoleManagerDataHolder;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.testng.Assert; import org.testng.Assert;

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/dbscripts/h2.sql → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/dbscripts/h2.sql
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/carbon.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/carbon.xml
View File

8
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/cdm-config.xml
View File

@ -33,16 +33,16 @@
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider> <Provider>
org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider
</Provider> </Provider>
<Provider> <Provider>
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider
</Provider> </Provider>
<Provider> <Provider>
org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider
</Provider> </Provider>
<Provider> <Provider>
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider
</Provider> </Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/datasources/data-source-config.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/default-roles-config.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/default-roles-config.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/jmx.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/jmx.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/launch.ini → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/launch.ini
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.mappings → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.mappings
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.types → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/mime.types
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/log4j.properties → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/log4j.properties
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/registry.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/registry.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/security/authenticators.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/security/authenticators.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/web.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/tomcat/web.xml
View File

0
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/user-mgt.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/carbon-home/repository/conf/user-mgt.xml
View File

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/src/test/resources/testng.xml
View File

@ -24,7 +24,7 @@
<test name="Unit Tests" preserve-order="true"> <test name="Unit Tests" preserve-order="true">
<classes> <classes>
<class name="io.entgra.device.mgt.extensions.defaultrole.manager.test.DefaultRoleReadingTest"/> <class name="io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.DefaultRoleReadingTest"/>
</classes> </classes>
</test> </test>
</suite> </suite>

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Type Deployer</name> <name>WSO2 Carbon - Device Type Deployer</name>
<description>WSO2 Carbon - Device Type Deployer Implementation</description> <description>WSO2 Carbon - Device Type Deployer Implementation</description>
@ -126,8 +126,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>Device Type Deployer Bundle</Bundle-Description> <Bundle-Description>Device Type Deployer Bundle</Bundle-Description>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal, !io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal,
org.wso2.carbon.device.mgt.extensions.device.type.deployer.* io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
javax.naming, javax.naming,

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployer.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
import org.apache.axis2.deployment.Deployer; import org.apache.axis2.deployment.Deployer;
import org.apache.axis2.deployment.DeploymentException; import org.apache.axis2.deployment.DeploymentException;
@ -30,7 +30,7 @@ import org.wso2.carbon.application.deployer.CarbonApplication;
import org.wso2.carbon.application.deployer.config.Artifact; import org.wso2.carbon.application.deployer.config.Artifact;
import org.wso2.carbon.application.deployer.config.CappFile; import org.wso2.carbon.application.deployer.config.CappFile;
import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler; import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployer.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.AbstractDeployer; import org.apache.axis2.deployment.AbstractDeployer;
@ -29,8 +29,8 @@ import org.osgi.framework.ServiceRegistration;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal.DeviceTypeManagementDataHolder;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypeConfigUtil; import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypeConfigUtil;
import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeConfigIdentifier; import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeConfigIdentifier;
import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerService; import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeManagerService;
import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceTypeConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceTypeConfiguration;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementDataHolder.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.RegistryService;

3
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/internal/DeviceTypeManagementServiceComponent.java
View File

@ -16,13 +16,12 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.internal; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler; import org.wso2.carbon.application.deployer.handler.AppDeploymentHandler;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer;
import org.wso2.carbon.ndatasource.core.DataSourceService; import org.wso2.carbon.ndatasource.core.DataSourceService;
import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.utils.ConfigurationContextService; import org.wso2.carbon.utils.ConfigurationContextService;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.wso2.carbon.device.mgt.extensions.device.type.template.config.exception.DeviceTypeConfigurationException; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.exception.DeviceTypeConfigurationException;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/util/DeviceTypePluginConstants.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util;
/** /**
* This holds the constants used for this bundle. * This holds the constants used for this bundle.

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/main/resources/META-INF/component.xml
View File

@ -17,11 +17,11 @@
<deployer> <deployer>
<directory>devicetypes</directory> <directory>devicetypes</directory>
<extension>xml</extension> <extension>xml</extension>
<class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer</class> <class>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer</class>
</deployer> </deployer>
<!--<deployer>--> <!--<deployer>-->
<!--<directory>devicetypes-ui</directory>--> <!--<directory>devicetypes-ui</directory>-->
<!--<class>org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeUIDeployer</class>--> <!--<class>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeUIDeployer</class>-->
<!--</deployer>--> <!--</deployer>-->
</deployers> </deployers>
</component> </component>

5
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypeCAppDeployerTest.java
View File

@ -16,8 +16,9 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployer;
import org.apache.axis2.deployment.DeploymentException; import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.engine.AxisConfiguration;
import org.mockito.Mockito; import org.mockito.Mockito;
@ -28,7 +29,7 @@ import org.wso2.carbon.application.deployer.config.ApplicationConfiguration;
import org.wso2.carbon.application.deployer.config.Artifact; import org.wso2.carbon.application.deployer.config.Artifact;
import org.wso2.carbon.application.deployer.config.CappFile; import org.wso2.carbon.application.deployer.config.CappFile;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants; import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.util.DeviceTypePluginConstants;
import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.exceptions.RegistryException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

3
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java
View File

@ -16,8 +16,9 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.extensions.device.type.deployer; package io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer;
import io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployer;
import org.apache.axis2.deployment.DeploymentException; import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.deployment.repository.util.DeploymentFileData; import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.junit.Assert; import org.junit.Assert;

0
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/android.xml
View File

0
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/invalidAndroid.xml
View File

0
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/log4j.properties
View File

0
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml
View File

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/src/test/resources/testng.xml
View File

@ -22,8 +22,8 @@
<parameter name="useDefaultListeners" value="false"/> <parameter name="useDefaultListeners" value="false"/>
<test name="Extension Unit Tests" preserve-order="true"> <test name="Extension Unit Tests" preserve-order="true">
<classes> <classes>
<class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/> <class name="io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypePluginDeployerTest"/>
<class name="org.wso2.carbon.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployerTest"/> <class name="io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.DeviceTypeCAppDeployerTest"/>
</classes> </classes>
</test> </test>
</suite> </suite>

6
components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.device.mgt.extensions.logger</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Entgra IoT - Logger Impl</name> <name>Entgra IoT - Logger Impl</name>
<description>Entgra IoT - Entgra Logger Implementation</description> <description>Entgra IoT - Entgra Logger Implementation</description>
@ -50,11 +50,11 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>Entgra Logger Bundle</Bundle-Description> <Bundle-Description>Entgra Logger Bundle</Bundle-Description>
<Import-Package> <Import-Package>
io.entgra.device.mgt.extensions.logger, io.entgra.device.mgt.core.device.mgt.extensions.logger,
org.apache.commons.logging org.apache.commons.logging
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
io.entgra.device.mgt.extensions.logger.* io.entgra.device.mgt.core.device.mgt.extensions.logger.*
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/LogContext.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/LogContext.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.logger; package io.entgra.device.mgt.core.device.mgt.extensions.logger;
public class LogContext { public class LogContext {
} }

4
components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/logger/spi/EntgraLogger.java
View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.logger.spi; package io.entgra.device.mgt.core.device.mgt.extensions.logger.spi;
import io.entgra.device.mgt.extensions.logger.LogContext; import io.entgra.device.mgt.core.device.mgt.extensions.logger.LogContext;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
public interface EntgraLogger extends Log { public interface EntgraLogger extends Log {

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.extensions.pull.notification</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.pull.notification</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Pull Notification Provider Implementation</name> <name>WSO2 Carbon - Pull Notification Provider Implementation</name>
<description>WSO2 Carbon - Pull Notification Provider Implementation</description> <description>WSO2 Carbon - Pull Notification Provider Implementation</description>
@ -78,8 +78,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>Pull Notification Provider Bundle</Bundle-Description> <Bundle-Description>Pull Notification Provider Bundle</Bundle-Description>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.extensions.pull.notification.internal, !io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal,
org.wso2.carbon.device.mgt.extensions.pull.notification.* io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/PullNotificationSubscriberImpl.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.pull.notification; package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
@ -33,7 +33,7 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.ComplianceFeature;
import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException; import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException;
import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;
import org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal.PullNotificationDataHolder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationDataHolder.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.pull.notification.internal; package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal;
import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager; import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/src/main/java/org/wso2/carbon/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/pull/notification/internal/PullNotificationServiceComponent.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.pull.notification.internal; package io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -26,7 +26,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService; import io.entgra.device.mgt.core.policy.mgt.core.PolicyManagerService;
/** /**
* @scr.component name="org.wso2.carbon.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true" * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal.PullNotificationServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider" * @scr.reference name="carbon.device.mgt.provider"
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
* cardinality="1..1" * cardinality="1..1"

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - FCM Based Push Notification Provider Implementation</name> <name>WSO2 Carbon - FCM Based Push Notification Provider Implementation</name>
<description>WSO2 Carbon - FCM Based Push Notification Provider Implementation</description> <description>WSO2 Carbon - FCM Based Push Notification Provider Implementation</description>
@ -130,8 +130,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>FCM Based Push Notification Provider Bundle</Bundle-Description> <Bundle-Description>FCM Based Push Notification Provider Bundle</Bundle-Description>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal, !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal,
org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.* io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
com.google.gson, com.google.gson,

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -29,7 +29,7 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -24,7 +24,7 @@ import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
/** /**
* @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true" * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider" * @scr.reference name="carbon.device.mgt.provider"
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
* cardinality="1..1" * cardinality="1..1"

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</name> <name>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</name>
<description>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</description> <description>WSO2 Carbon - HTTP Based Push Notification Provider Implementation</description>
@ -121,8 +121,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>MQTT Based Push Notification Provider Bundle</Bundle-Description> <Bundle-Description>MQTT Based Push Notification Provider Bundle</Bundle-Description>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal, !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal,
org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.* io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.apache.commons.logging, org.apache.commons.logging,

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPBasedPushNotificationProvider.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java
View File

@ -1,4 +1,4 @@
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HostConfiguration;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http;
import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpClient;

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/http/internal/HTTPPushNotificationServiceComponent.java
View File

@ -16,14 +16,14 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
/** /**
* @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.internal.HTTPPushNotificationServiceComponent" immediate="true" * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal.HTTPPushNotificationServiceComponent" immediate="true"
*/ */
public class HTTPPushNotificationServiceComponent { public class HTTPPushNotificationServiceComponent {

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</name> <name>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</name>
<description>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</description> <description>WSO2 Carbon - MQTT Based Push Notification Provider Implementation</description>
@ -143,8 +143,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>MQTT Based Push Notification Provider Bundle</Bundle-Description> <Bundle-Description>MQTT Based Push Notification Provider Bundle</Bundle-Description>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal, !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal,
org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.* io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.apache.commons.logging, org.apache.commons.logging,

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProvider.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -28,8 +28,8 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
import org.wso2.carbon.event.output.adapter.core.MessageType; import org.wso2.carbon.event.output.adapter.core.MessageType;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;

5
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTDataHolder.java
View File

@ -16,15 +16,12 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
import java.util.List;
import java.util.Stack;
public class MQTTDataHolder { public class MQTTDataHolder {
private OutputEventAdapterService outputEventAdapterService; private OutputEventAdapterService outputEventAdapterService;

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/MQTTPushNotificationServiceComponent.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
/** /**
* @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTPushNotificationServiceComponent" immediate="true" * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTPushNotificationServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider" * @scr.reference name="carbon.device.mgt.provider"
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
* cardinality="1..1" * cardinality="1..1"

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/internal/util/MQTTAdapterConstants.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util;
public final class MQTTAdapterConstants { public final class MQTTAdapterConstants {

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/CarbonContextInitializationUtil.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;

8
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTBasedPushNotificationProviderTest.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.testng.Assert; import org.testng.Assert;
@ -25,12 +25,12 @@ import org.testng.annotations.Test;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService; import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService;
import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.exceptions.RegistryException;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

8
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategyTest.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.testng.Assert; import org.testng.Assert;
@ -29,14 +29,14 @@ import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfi
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation; import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.MQTTDataHolder;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal.util.MQTTAdapterConstants;
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;
import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService; import org.wso2.carbon.event.output.adapter.core.internal.CarbonOutputEventAdapterService;
import org.wso2.carbon.registry.core.exceptions.RegistryException; import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
import static org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation.POLICY_OPERATION_CODE; import static org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation.POLICY_OPERATION_CODE;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;

0
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml
View File

0
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/log4j.properties → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/log4j.properties
View File

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/testng.xml
View File

@ -22,8 +22,8 @@
<parameter name="useDefaultListeners" value="false"/> <parameter name="useDefaultListeners" value="false"/>
<test name="Extension Unit Tests" preserve-order="true"> <test name="Extension Unit Tests" preserve-order="true">
<classes> <classes>
<class name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProviderTest"/> <class name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProviderTest"/>
<class name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTNotificationStrategyTest"/> <class name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTNotificationStrategyTest"/>
</classes> </classes>
</test> </test>
</suite> </suite>

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</name> <name>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</name>
<description>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</description> <description>WSO2 Carbon - XMPP Based Push Notification Provider Implementation</description>
@ -130,8 +130,8 @@
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version> <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
<Bundle-Description>XMPP Based Push Notification Provider Bundle</Bundle-Description> <Bundle-Description>XMPP Based Push Notification Provider Bundle</Bundle-Description>
<Export-Package> <Export-Package>
!org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal, !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal,
org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.* io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.apache.commons.logging, org.apache.commons.logging,

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPBasedPushNotificationProvider.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

6
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -25,8 +25,8 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.XMPPDataHolder; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.XMPPDataHolder;
import org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.util.XMPPAdapterConstants; import io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.util.XMPPAdapterConstants;
import org.wso2.carbon.event.output.adapter.core.MessageType; import org.wso2.carbon.event.output.adapter.core.MessageType;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration;
import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException;

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPDataHolder.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;

4
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
/** /**
* @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true" * @scr.component name="io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider" * @scr.reference name="carbon.device.mgt.provider"
* interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService" * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
* cardinality="1..1" * cardinality="1..1"

2
components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/push/notification/provider/xmpp/internal/util/XMPPAdapterConstants.java
View File

@ -16,7 +16,7 @@
* under the License. * under the License.
* *
*/ */
package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.internal.util; package io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal.util;
public final class XMPPAdapterConstants { public final class XMPPAdapterConstants {

4
components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/pom.xml → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml
View File

@ -28,7 +28,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.device.mgt.extensions.stateengine</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.stateengine</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Entgra IoT - State Engine </name> <name>Entgra IoT - State Engine </name>
<description>Entgra IoT - State Engine Components</description> <description>Entgra IoT - State Engine Components</description>
@ -64,7 +64,7 @@
org.wso2.carbon.device.mgt.common.* org.wso2.carbon.device.mgt.common.*
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
io.entgra.device.mgt.extensions.stateengine.*, io.entgra.device.mgt.core.device.mgt.extensions.stateengine.*,
org.wso2.carbon.logging org.wso2.carbon.logging
</Export-Package> </Export-Package>
</instructions> </instructions>

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/dto/StateUpdateResult.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/dto/StateUpdateResult.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.stateengine.dto; package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.dto;
import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.EnrolmentInfo;

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/exception/StateValidationException.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/exception/StateValidationException.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.stateengine.exception; package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.exception;
public class StateValidationException extends Exception { public class StateValidationException extends Exception {

6
components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/spi/DeviceStateMachine.java
View File

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.stateengine.spi; package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.spi;
import io.entgra.device.mgt.extensions.stateengine.dto.StateUpdateResult; import io.entgra.device.mgt.core.device.mgt.extensions.stateengine.dto.StateUpdateResult;
import io.entgra.device.mgt.extensions.stateengine.exception.StateValidationException; import io.entgra.device.mgt.core.device.mgt.extensions.stateengine.exception.StateValidationException;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.EnrolmentInfo;

2
components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/extensions/stateengine/util/StateEngineUtil.java → components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/src/main/java/io/entgra/device/mgt/core/device/mgt/extensions/stateengine/util/StateEngineUtil.java
View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
package io.entgra.device.mgt.extensions.stateengine.util; package io.entgra.device.mgt.core.device.mgt.extensions.stateengine.util;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;

18
components/device-mgt-extensions/pom.xml
View File

@ -34,15 +34,15 @@
<url>http://wso2.org</url> <url>http://wso2.org</url>
<modules> <modules>
<module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http</module>
<module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm</module>
<module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt</module>
<module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp</module>
<module>org.wso2.carbon.device.mgt.extensions.device.type.deployer</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer</module>
<module>org.wso2.carbon.device.mgt.extensions.pull.notification</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.pull.notification</module>
<module>io.entgra.device.mgt.extensions.logger</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.logger</module>
<module>io.entgra.device.mgt.extensions.defaultrole.manager</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager</module>
<module>io.entgra.device.mgt.extensions.stateengine</module> <module>io.entgra.device.mgt.core.device.mgt.extensions.stateengine</module>
</modules> </modules>
</project> </project>

6
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
View File

@ -114,7 +114,7 @@
org.wso2.carbon.identity.jwt.client.extension.service, org.wso2.carbon.identity.jwt.client.extension.service,
org.apache.commons.codec.binary, org.apache.commons.codec.binary,
io.entgra.server.bootup.heartbeat.beacon, io.entgra.server.bootup.heartbeat.beacon,
io.entgra.device.mgt.extensions.logger.*, io.entgra.device.mgt.core.device.mgt.extensions.logger.*,
io.entgra.notification.logger.* io.entgra.notification.logger.*
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
@ -354,6 +354,10 @@
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.task.mgt.common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.notification.logger</artifactId> <artifactId>io.entgra.notification.logger</artifactId>

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java
View File

@ -18,7 +18,7 @@
package org.wso2.carbon.device.mgt.core.notification.mgt; package org.wso2.carbon.device.mgt.core.notification.mgt;
import io.entgra.device.mgt.extensions.logger.spi.EntgraLogger; import io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger;
import io.entgra.notification.logger.DeviceLogContext; import io.entgra.notification.logger.DeviceLogContext;
import io.entgra.notification.logger.impl.EntgraDeviceLoggerImpl; import io.entgra.notification.logger.impl.EntgraDeviceLoggerImpl;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;

8
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
View File

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

8
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml
View File

@ -31,10 +31,10 @@
<SchedulerTaskInitialDelay>2000</SchedulerTaskInitialDelay> <SchedulerTaskInitialDelay>2000</SchedulerTaskInitialDelay>
<SchedulerTaskEnabled>true</SchedulerTaskEnabled> <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
<PushNotificationProviders> <PushNotificationProviders>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider> <Provider>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
</PushNotificationProviders> </PushNotificationProviders>
</PushNotificationConfiguration> </PushNotificationConfiguration>
<PullNotificationConfiguration> <PullNotificationConfiguration>

Some files were not shown because too many files have changed in this diff Show More