From baf7661e9d54f9157ea304194eea63ff1e2d7048 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 10 May 2023 20:08:20 +0530 Subject: [PATCH] refactored task mgt component --- .../org.wso2.carbon.device.mgt.core/pom.xml | 4 +-- .../impl/DynamicPartitionedScheduleTask.java | 2 +- .../pom.xml | 4 +-- .../task/mgt/common/bean/DynamicTask.java | 2 +- .../mgt/common/constant/TaskMgtConstants.java | 2 +- .../IllegalTransactionStateException.java | 2 +- .../exception/TaskManagementDAOException.java | 2 +- .../exception/TaskManagementException.java | 2 +- .../exception/TaskNotFoundException.java | 2 +- .../TransactionManagementException.java | 2 +- .../UnsupportedDatabaseEngineException.java | 2 +- .../mgt/common/spi/TaskManagementService.java | 8 +++--- .../pom.xml | 12 ++++---- .../core/config/TaskConfigurationManager.java | 8 +++--- .../mgt/core/config/TaskManagementConfig.java | 2 +- .../TaskManagementConfigRepository.java | 4 +-- .../config/datasource/DataSourceConfig.java | 2 +- .../datasource/JNDILookupDefinition.java | 2 +- .../task/mgt/core/dao/DynamicTaskDAO.java | 6 ++-- .../task/mgt/core/dao/DynamicTaskPropDAO.java | 4 +-- .../dao/common/TaskManagementDAOFactory.java | 28 +++++++++---------- .../mgt/core/dao/impl/DynamicTaskDAOImpl.java | 12 ++++---- .../core/dao/impl/DynamicTaskPropDAOImpl.java | 12 ++++---- .../core/dao/util/TaskManagementDAOUtil.java | 4 +-- .../core/internal/TaskManagerDataHolder.java | 4 +-- .../internal/TaskManagerServiceComponent.java | 14 +++++----- .../service/TaskManagementServiceImpl.java | 26 ++++++++--------- .../mgt/core/util/TaskManagementUtil.java | 8 +++--- components/task-mgt/task-manager/pom.xml | 4 +-- .../pom.xml | 20 ++++++++----- .../task/mgt/watcher/IoTSStartupHandler.java | 12 ++++---- .../internal/TaskWatcherDataHolder.java | 4 +-- .../internal/TaskWatcherServiceComponent.java | 14 +++++----- components/task-mgt/task-watcher/pom.xml | 2 +- .../pom.xml | 10 +++---- pom.xml | 10 +++---- 36 files changed, 132 insertions(+), 126 deletions(-) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common => io.entgra.device.mgt.core.task.mgt.common}/pom.xml (93%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/bean/DynamicTask.java (97%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/constant/TaskMgtConstants.java (97%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/exception/IllegalTransactionStateException.java (95%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/exception/TaskManagementDAOException.java (93%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/exception/TaskManagementException.java (93%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/exception/TaskNotFoundException.java (94%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/exception/TransactionManagementException.java (95%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/exception/UnsupportedDatabaseEngineException.java (95%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.common/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core}/task/mgt/common/spi/TaskManagementService.java (83%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core => io.entgra.device.mgt.core.task.mgt.core}/pom.xml (92%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/config/TaskConfigurationManager.java (90%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/config/TaskManagementConfig.java (96%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/config/TaskManagementConfigRepository.java (90%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/config/datasource/DataSourceConfig.java (95%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/config/datasource/JNDILookupDefinition.java (96%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/dao/DynamicTaskDAO.java (86%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/dao/DynamicTaskPropDAO.java (89%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/dao/common/TaskManagementDAOFactory.java (88%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java (94%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java (91%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/dao/util/TaskManagementDAOUtil.java (96%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/internal/TaskManagerDataHolder.java (93%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/internal/TaskManagerServiceComponent.java (90%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/service/TaskManagementServiceImpl.java (94%) rename components/task-mgt/task-manager/{io.entgra.task.mgt.core/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core}/task/mgt/core/util/TaskManagementUtil.java (91%) rename components/task-mgt/task-watcher/{io.entgra.task.mgt.watcher => io.entgra.device.mgt.core.task.mgt.watcher}/pom.xml (86%) rename components/task-mgt/task-watcher/{io.entgra.task.mgt.watcher/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core}/task/mgt/watcher/IoTSStartupHandler.java (96%) rename components/task-mgt/task-watcher/{io.entgra.task.mgt.watcher/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core}/task/mgt/watcher/internal/TaskWatcherDataHolder.java (94%) rename components/task-mgt/task-watcher/{io.entgra.task.mgt.watcher/src/main/java/io/entgra => io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core}/task/mgt/watcher/internal/TaskWatcherServiceComponent.java (92%) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 00938f19184..33efc964958 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -103,7 +103,7 @@ org.wso2.carbon.ndatasource.core, org.wso2.carbon.ntask.core.*, org.wso2.carbon.ntask.common, - io.entgra.task.mgt.common.*, + io.entgra.device.mgt.core.task.mgt.common.*, org.apache.commons.collections;version="${commons-collections.version.range}", org.wso2.carbon.email.sender.*, io.swagger.annotations.*;resolution:=optional, @@ -352,7 +352,7 @@ io.entgra.device.mgt.core - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.common io.entgra.device.mgt.core diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java index ad3269be004..7e6d0f916d6 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java @@ -19,7 +19,7 @@ package org.wso2.carbon.device.mgt.core.task.impl; import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DynamicTaskContext; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml similarity index 93% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/pom.xml rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml index fb22fd0d98e..494f55f2d91 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/pom.xml +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.common bundle Entgra IoT - Task Management Common Entgra IoT - Task Management Common @@ -44,7 +44,7 @@ ${carbon.device.mgt.version} Task Management Common Bundle - io.entgra.task.mgt.common.* + io.entgra.device.mgt.core.task.mgt.common.* diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/bean/DynamicTask.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/bean/DynamicTask.java similarity index 97% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/bean/DynamicTask.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/bean/DynamicTask.java index ece8d4dc265..22fa2868ce3 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/bean/DynamicTask.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/bean/DynamicTask.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.bean; +package io.entgra.device.mgt.core.task.mgt.common.bean; import java.util.Map; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/constant/TaskMgtConstants.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java similarity index 97% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/constant/TaskMgtConstants.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java index 2ffe9609642..2c485c03d33 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/constant/TaskMgtConstants.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.constant; +package io.entgra.device.mgt.core.task.mgt.common.constant; public class TaskMgtConstants { public static final class DataSourceProperties { diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/IllegalTransactionStateException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/IllegalTransactionStateException.java similarity index 95% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/IllegalTransactionStateException.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/IllegalTransactionStateException.java index 4c4c996c594..f8f02bd7e16 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/IllegalTransactionStateException.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/IllegalTransactionStateException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.exception; +package io.entgra.device.mgt.core.task.mgt.common.exception; public class IllegalTransactionStateException extends RuntimeException { diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementDAOException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementDAOException.java similarity index 93% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementDAOException.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementDAOException.java index 9b683dba20e..b66285be54d 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementDAOException.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementDAOException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.exception; +package io.entgra.device.mgt.core.task.mgt.common.exception; public class TaskManagementDAOException extends Exception { diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementException.java similarity index 93% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementException.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementException.java index d9705e6438a..5266008b76b 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskManagementException.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskManagementException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.exception; +package io.entgra.device.mgt.core.task.mgt.common.exception; public class TaskManagementException extends Exception { diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskNotFoundException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskNotFoundException.java similarity index 94% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskNotFoundException.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskNotFoundException.java index 2d2f568fe23..87d9ceb9bde 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TaskNotFoundException.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TaskNotFoundException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.exception; +package io.entgra.device.mgt.core.task.mgt.common.exception; /** * Represents the exception thrown during validating the request. diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TransactionManagementException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TransactionManagementException.java similarity index 95% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TransactionManagementException.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TransactionManagementException.java index 5e43237e436..4ca6801627c 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/TransactionManagementException.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/TransactionManagementException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.exception; +package io.entgra.device.mgt.core.task.mgt.common.exception; public class TransactionManagementException extends Exception { diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/UnsupportedDatabaseEngineException.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/UnsupportedDatabaseEngineException.java similarity index 95% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/UnsupportedDatabaseEngineException.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/UnsupportedDatabaseEngineException.java index a29f954e12a..ad3009d96c2 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/exception/UnsupportedDatabaseEngineException.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/exception/UnsupportedDatabaseEngineException.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.exception; +package io.entgra.device.mgt.core.task.mgt.common.exception; /** * This runtime exception will be thrown if the server has configured with unsupported DB engine. diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/spi/TaskManagementService.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java similarity index 83% rename from components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/spi/TaskManagementService.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java index fac557e0bd3..5c0b0754775 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.common/src/main/java/io/entgra/task/mgt/common/spi/TaskManagementService.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.common.spi; +package io.entgra.device.mgt.core.task.mgt.common.spi; -import io.entgra.task.mgt.common.exception.TaskNotFoundException; -import io.entgra.task.mgt.common.exception.TaskManagementException; -import io.entgra.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskNotFoundException; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; import java.util.List; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml similarity index 92% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/pom.xml rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml index 36b6b994227..a92d1046e22 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/pom.xml +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - io.entgra.task.mgt.core + io.entgra.device.mgt.core.task.mgt.core bundle Entgra IoT - Task manager Core Entgra IoT - Task manager Core @@ -48,7 +48,7 @@ ${project.artifactId} ${carbon.device.mgt.version} Task Management Core Bundle - io.entgra.task.mgt.core.internal + io.entgra.device.mgt.core.task.mgt.core.internal org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -59,7 +59,7 @@ javax.xml.bind, javax.sql, javax.naming, - io.entgra.task.mgt.common.*, + io.entgra.device.mgt.core.task.mgt.common.*, org.wso2.carbon.utils.*, org.wso2.carbon.ntask.core.*, org.wso2.carbon.ntask.common, @@ -72,8 +72,8 @@ io.entgra.server.bootup.heartbeat.beacon.service, - !io.entgra.task.mgt.core.internal, - io.entgra.task.mgt.core.* + !io.entgra.device.mgt.core.task.mgt.core.internal, + io.entgra.device.mgt.core.task.mgt.core.* @@ -99,7 +99,7 @@ io.entgra.device.mgt.core - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.common provided diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskConfigurationManager.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskConfigurationManager.java similarity index 90% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskConfigurationManager.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskConfigurationManager.java index 2779a07ff9e..d245cf4cd24 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskConfigurationManager.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskConfigurationManager.java @@ -15,11 +15,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.config; +package io.entgra.device.mgt.core.task.mgt.core.config; -import io.entgra.task.mgt.common.constant.TaskMgtConstants; -import io.entgra.task.mgt.common.exception.TaskManagementException; -import io.entgra.task.mgt.core.util.TaskManagementUtil; +import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; import org.w3c.dom.Document; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfig.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfig.java similarity index 96% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfig.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfig.java index 2b3ae468ac9..fb9ec5e488c 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfig.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfig.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.config; +package io.entgra.device.mgt.core.task.mgt.core.config; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfigRepository.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfigRepository.java similarity index 90% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfigRepository.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfigRepository.java index a81617f738f..26f78cc0210 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/TaskManagementConfigRepository.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/TaskManagementConfigRepository.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.config; +package io.entgra.device.mgt.core.task.mgt.core.config; -import io.entgra.task.mgt.core.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/DataSourceConfig.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/DataSourceConfig.java similarity index 95% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/DataSourceConfig.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/DataSourceConfig.java index b4c4d9fc2d2..05cacf68f18 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/DataSourceConfig.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/DataSourceConfig.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.config.datasource; +package io.entgra.device.mgt.core.task.mgt.core.config.datasource; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/JNDILookupDefinition.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/JNDILookupDefinition.java similarity index 96% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/JNDILookupDefinition.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/JNDILookupDefinition.java index 5101af8d495..1fba6b9973b 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/config/datasource/JNDILookupDefinition.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/config/datasource/JNDILookupDefinition.java @@ -16,7 +16,7 @@ * under the License. */ -package io.entgra.task.mgt.core.config.datasource; +package io.entgra.device.mgt.core.task.mgt.core.config.datasource; import javax.xml.bind.annotation.*; import java.util.List; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskDAO.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java similarity index 86% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskDAO.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java index 317870dba1a..d1eb9afd089 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskDAO.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.dao; +package io.entgra.device.mgt.core.task.mgt.core.dao; -import io.entgra.task.mgt.common.bean.DynamicTask; -import io.entgra.task.mgt.common.exception.TaskManagementDAOException; +import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException; import java.util.List; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskPropDAO.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java similarity index 89% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskPropDAO.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java index b458417298b..6f5759b24f8 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/DynamicTaskPropDAO.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.dao; +package io.entgra.device.mgt.core.task.mgt.core.dao; -import io.entgra.task.mgt.common.exception.TaskManagementDAOException; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException; import java.util.Map; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/common/TaskManagementDAOFactory.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java similarity index 88% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/common/TaskManagementDAOFactory.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java index c8f8623777b..cf3bff0dc92 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/common/TaskManagementDAOFactory.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java @@ -15,19 +15,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.dao.common; - -import io.entgra.task.mgt.common.constant.TaskMgtConstants; -import io.entgra.task.mgt.common.exception.IllegalTransactionStateException; -import io.entgra.task.mgt.common.exception.TransactionManagementException; -import io.entgra.task.mgt.common.exception.UnsupportedDatabaseEngineException; -import io.entgra.task.mgt.core.config.datasource.DataSourceConfig; -import io.entgra.task.mgt.core.config.datasource.JNDILookupDefinition; -import io.entgra.task.mgt.core.dao.DynamicTaskDAO; -import io.entgra.task.mgt.core.dao.DynamicTaskPropDAO; -import io.entgra.task.mgt.core.dao.impl.DynamicTaskDAOImpl; -import io.entgra.task.mgt.core.dao.impl.DynamicTaskPropDAOImpl; -import io.entgra.task.mgt.core.dao.util.TaskManagementDAOUtil; +package io.entgra.device.mgt.core.task.mgt.core.dao.common; + +import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.exception.IllegalTransactionStateException; +import io.entgra.device.mgt.core.task.mgt.common.exception.TransactionManagementException; +import io.entgra.device.mgt.core.task.mgt.common.exception.UnsupportedDatabaseEngineException; +import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.task.mgt.core.config.datasource.JNDILookupDefinition; +import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO; +import io.entgra.device.mgt.core.task.mgt.core.dao.impl.DynamicTaskDAOImpl; +import io.entgra.device.mgt.core.task.mgt.core.dao.impl.DynamicTaskPropDAOImpl; +import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -183,7 +183,7 @@ public class TaskManagementDAOFactory { "Device Management Repository data source configuration " + "is null and " + "thus, is not initialized"); } - io.entgra.task.mgt.core.config.datasource.JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition(); + JNDILookupDefinition jndiConfig = config.getJndiLookupDefinition(); if (jndiConfig != null) { if (log.isDebugEnabled()) { log.debug("Initializing Device Management Repository data source using the JNDI " + diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java similarity index 94% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java index 80fcb98e154..90d73ca21b4 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.dao.impl; +package io.entgra.device.mgt.core.task.mgt.core.dao.impl; -import io.entgra.task.mgt.common.bean.DynamicTask; -import io.entgra.task.mgt.common.exception.TaskManagementDAOException; -import io.entgra.task.mgt.core.dao.DynamicTaskDAO; -import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory; -import io.entgra.task.mgt.core.dao.util.TaskManagementDAOUtil; +import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory; +import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil; +import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException; +import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java similarity index 91% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java index 66d6920feb5..fb613e683e3 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.dao.impl; +package io.entgra.device.mgt.core.task.mgt.core.dao.impl; -import io.entgra.task.mgt.common.constant.TaskMgtConstants; -import io.entgra.task.mgt.common.exception.TaskManagementDAOException; -import io.entgra.task.mgt.core.dao.DynamicTaskPropDAO; -import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory; -import io.entgra.task.mgt.core.dao.util.TaskManagementDAOUtil; +import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO; +import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory; +import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/util/TaskManagementDAOUtil.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/util/TaskManagementDAOUtil.java similarity index 96% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/util/TaskManagementDAOUtil.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/util/TaskManagementDAOUtil.java index c9ba9ea07ae..324249d7506 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/dao/util/TaskManagementDAOUtil.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/util/TaskManagementDAOUtil.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.dao.util; +package io.entgra.device.mgt.core.task.mgt.core.dao.util; -import io.entgra.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerDataHolder.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java similarity index 93% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerDataHolder.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java index 8de0cbb40fe..aa8265a7852 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerDataHolder.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerDataHolder.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.internal; +package io.entgra.device.mgt.core.task.mgt.core.internal; import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; -import io.entgra.task.mgt.common.spi.TaskManagementService; +import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; import org.wso2.carbon.ntask.core.service.TaskService; public class TaskManagerDataHolder { diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerServiceComponent.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java similarity index 90% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerServiceComponent.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java index 9021b070eca..947dd5340f8 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/internal/TaskManagerServiceComponent.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/internal/TaskManagerServiceComponent.java @@ -15,15 +15,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.internal; +package io.entgra.device.mgt.core.task.mgt.core.internal; +import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory; import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; -import io.entgra.task.mgt.core.config.TaskManagementConfig; -import io.entgra.task.mgt.core.config.datasource.DataSourceConfig; -import io.entgra.task.mgt.common.spi.TaskManagementService; -import io.entgra.task.mgt.core.config.TaskConfigurationManager; -import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory; -import io.entgra.task.mgt.core.service.TaskManagementServiceImpl; +import io.entgra.device.mgt.core.task.mgt.core.config.TaskManagementConfig; +import io.entgra.device.mgt.core.task.mgt.core.config.datasource.DataSourceConfig; +import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; +import io.entgra.device.mgt.core.task.mgt.core.config.TaskConfigurationManager; +import io.entgra.device.mgt.core.task.mgt.core.service.TaskManagementServiceImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/service/TaskManagementServiceImpl.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java similarity index 94% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/service/TaskManagementServiceImpl.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java index fe3a7cb97e6..91334172bf9 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/service/TaskManagementServiceImpl.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java @@ -15,21 +15,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.service; +package io.entgra.device.mgt.core.task.mgt.core.service; +import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO; +import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory; +import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder; +import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil; import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.task.mgt.common.bean.DynamicTask; -import io.entgra.task.mgt.common.constant.TaskMgtConstants; -import io.entgra.task.mgt.common.exception.TaskManagementDAOException; -import io.entgra.task.mgt.common.exception.TaskManagementException; -import io.entgra.task.mgt.common.exception.TaskNotFoundException; -import io.entgra.task.mgt.common.exception.TransactionManagementException; -import io.entgra.task.mgt.common.spi.TaskManagementService; -import io.entgra.task.mgt.core.dao.DynamicTaskDAO; -import io.entgra.task.mgt.core.dao.DynamicTaskPropDAO; -import io.entgra.task.mgt.core.dao.common.TaskManagementDAOFactory; -import io.entgra.task.mgt.core.internal.TaskManagerDataHolder; -import io.entgra.task.mgt.core.util.TaskManagementUtil; +import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskNotFoundException; +import io.entgra.device.mgt.core.task.mgt.common.exception.TransactionManagementException; +import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; +import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/util/TaskManagementUtil.java b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java similarity index 91% rename from components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/util/TaskManagementUtil.java rename to components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java index 5308fc29c9c..b4a2a7e3b7f 100755 --- a/components/task-mgt/task-manager/io.entgra.task.mgt.core/src/main/java/io/entgra/task/mgt/core/util/TaskManagementUtil.java +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.core.util; +package io.entgra.device.mgt.core.task.mgt.core.util; import com.google.gson.Gson; import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.task.mgt.common.constant.TaskMgtConstants; -import io.entgra.task.mgt.common.exception.TaskManagementException; -import io.entgra.task.mgt.core.internal.TaskManagerDataHolder; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; +import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/task-mgt/task-manager/pom.xml b/components/task-mgt/task-manager/pom.xml index 95f26adef58..c375f2f3024 100755 --- a/components/task-mgt/task-manager/pom.xml +++ b/components/task-mgt/task-manager/pom.xml @@ -32,8 +32,8 @@ http://entgra.io - io.entgra.task.mgt.core - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.core + io.entgra.device.mgt.core.task.mgt.common \ No newline at end of file diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/pom.xml b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml similarity index 86% rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/pom.xml rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml index f85b4f3b5c6..ac95521f944 100755 --- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/pom.xml +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - io.entgra.task.mgt.watcher + io.entgra.device.mgt.core.task.mgt.watcher bundle Entgra IoT - Task Watcher Entgra IoT - Task Watcher @@ -48,11 +48,11 @@ ${project.artifactId} ${carbon.device.mgt.version} Task Watcher Bundle - io.entgra.task.mgt.watcher.internal + io.entgra.device.mgt.core.task.mgt.watcher.internal io.entgra.server.bootup.heartbeat.beacon.*, - io.entgra.task.mgt.common.*, - io.entgra.task.mgt.core.*, + io.entgra.device.mgt.core.task.mgt.common.*, + io.entgra.device.mgt.core.task.mgt.core.*, org.apache.commons.logging, org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", @@ -64,7 +64,7 @@ org.wso2.carbon.user.core.*, - io.entgra.task.mgt.watcher.* + io.entgra.device.mgt.core.task.mgt.watcher.* @@ -90,12 +90,12 @@ io.entgra.device.mgt.core - io.entgra.task.mgt.core + io.entgra.device.mgt.core.task.mgt.core provided io.entgra.device.mgt.core - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.common provided @@ -133,6 +133,12 @@ org.wso2.carbon.utils provided + + + org.wso2.carbon.commons + org.wso2.carbon.ntask.core + provided + \ No newline at end of file diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/IoTSStartupHandler.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java similarity index 96% rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/IoTSStartupHandler.java rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java index 355fba38250..16794243ada 100755 --- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/IoTSStartupHandler.java +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/IoTSStartupHandler.java @@ -16,14 +16,14 @@ * under the License. */ -package io.entgra.task.mgt.watcher; +package io.entgra.device.mgt.core.task.mgt.watcher; import io.entgra.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException; -import io.entgra.task.mgt.common.bean.DynamicTask; -import io.entgra.task.mgt.common.constant.TaskMgtConstants; -import io.entgra.task.mgt.common.exception.TaskManagementException; -import io.entgra.task.mgt.core.util.TaskManagementUtil; -import io.entgra.task.mgt.watcher.internal.TaskWatcherDataHolder; +import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask; +import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants; +import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException; +import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil; +import io.entgra.device.mgt.core.task.mgt.watcher.internal.TaskWatcherDataHolder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherDataHolder.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java similarity index 94% rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherDataHolder.java rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java index 9e2953ae25d..39a3ef89f16 100755 --- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherDataHolder.java +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherDataHolder.java @@ -15,10 +15,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.watcher.internal; +package io.entgra.device.mgt.core.task.mgt.watcher.internal; import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; -import io.entgra.task.mgt.common.spi.TaskManagementService; +import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; import org.wso2.carbon.ntask.core.service.TaskService; import org.wso2.carbon.user.core.service.RealmService; diff --git a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherServiceComponent.java b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java similarity index 92% rename from components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherServiceComponent.java rename to components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java index 209113df84a..da3c47c9626 100755 --- a/components/task-mgt/task-watcher/io.entgra.task.mgt.watcher/src/main/java/io/entgra/task/mgt/watcher/internal/TaskWatcherServiceComponent.java +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/src/main/java/io/entgra/device/mgt/core/task/mgt/watcher/internal/TaskWatcherServiceComponent.java @@ -15,13 +15,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.task.mgt.watcher.internal; +package io.entgra.device.mgt.core.task.mgt.watcher.internal; +import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService; +import io.entgra.device.mgt.core.task.mgt.core.config.TaskConfigurationManager; +import io.entgra.device.mgt.core.task.mgt.core.config.TaskManagementConfig; +import io.entgra.device.mgt.core.task.mgt.watcher.IoTSStartupHandler; import io.entgra.server.bootup.heartbeat.beacon.service.HeartBeatManagementService; -import io.entgra.task.mgt.common.spi.TaskManagementService; -import io.entgra.task.mgt.core.config.TaskConfigurationManager; -import io.entgra.task.mgt.core.config.TaskManagementConfig; -import io.entgra.task.mgt.watcher.IoTSStartupHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.framework.BundleContext; @@ -32,7 +32,7 @@ import org.wso2.carbon.user.core.service.RealmService; /** * @scr.component - * name="io.entgra.task.mgt.watcher" immediate="true" + * name="io.entgra.device.mgt.core.task.mgt.watcher" immediate="true" * @scr.reference name="app.mgt.ntask.component" * interface="org.wso2.carbon.ntask.core.service.TaskService" * cardinality="1..1" @@ -40,7 +40,7 @@ import org.wso2.carbon.user.core.service.RealmService; * bind="setTaskService" * unbind="unsetTaskService" * @scr.reference name="io.entgra.task.mgt.service" - * interface="io.entgra.task.mgt.common.spi.TaskManagementService" + * interface="io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService" * cardinality="1..1" * policy="dynamic" * bind="setTaskMgtService" diff --git a/components/task-mgt/task-watcher/pom.xml b/components/task-mgt/task-watcher/pom.xml index 8d5cf3eba15..36accd91df7 100755 --- a/components/task-mgt/task-watcher/pom.xml +++ b/components/task-mgt/task-watcher/pom.xml @@ -32,7 +32,7 @@ http://entgra.io - io.entgra.task.mgt.watcher + io.entgra.device.mgt.core.task.mgt.watcher \ No newline at end of file diff --git a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml index 1325658984b..7b1dff689f0 100755 --- a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml +++ b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml @@ -34,11 +34,11 @@ io.entgra.device.mgt.core - io.entgra.task.mgt.core + io.entgra.device.mgt.core.task.mgt.core io.entgra.device.mgt.core - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.common @@ -91,13 +91,13 @@ - io.entgra.device.mgt.core:io.entgra.task.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.core:${carbon.device.mgt.version} - io.entgra.device.mgt.core:io.entgra.task.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.common:${carbon.device.mgt.version} - io.entgra.device.mgt.core:io.entgra.task.mgt.watcher:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.watcher:${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index b63361b2337..dfbf7a77988 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ - + components/task-mgt components/subtype-mgt components/tenant-mgt components/operation-template-mgt @@ -64,7 +64,7 @@ - + features/task-mgt features/subtype-mgt features/tenant-mgt features/operation-template-mgt-plugin-feature @@ -367,17 +367,17 @@ io.entgra.device.mgt.core - io.entgra.task.mgt.common + io.entgra.device.mgt.core.task.mgt.common ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.task.mgt.core + io.entgra.device.mgt.core.task.mgt.core ${carbon.device.mgt.version} io.entgra.device.mgt.core - io.entgra.task.mgt.watcher + io.entgra.device.mgt.core.task.mgt.watcher ${carbon.device.mgt.version}