mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
refactored transport mgt component
This commit is contained in:
parent
8e26f3b4dd
commit
f0380076c1
@ -279,7 +279,7 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>org.wso2.carbon.email.sender.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.email.sender.core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@ -275,7 +275,7 @@
|
||||
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>org.wso2.carbon.email.sender.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.email.sender.core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@ -38,7 +38,6 @@ import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManag
|
||||
import org.wso2.carbon.device.mgt.core.dto.DeviceType;
|
||||
import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier;
|
||||
import org.wso2.carbon.device.mgt.core.geo.task.GeoFenceEventOperationManager;
|
||||
import org.wso2.carbon.device.mgt.core.metadata.mgt.MetadataManagementServiceImpl;
|
||||
import org.wso2.carbon.device.mgt.core.operation.timeout.task.OperationTimeoutTaskManagerService;
|
||||
import org.wso2.carbon.device.mgt.core.privacy.PrivacyComplianceProvider;
|
||||
import org.wso2.carbon.device.mgt.core.push.notification.mgt.PushNotificationProviderRepository;
|
||||
@ -47,7 +46,7 @@ import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
|
||||
import org.wso2.carbon.device.mgt.core.status.task.DeviceStatusTaskManagerService;
|
||||
import org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerService;
|
||||
import org.wso2.carbon.device.mgt.core.traccar.api.service.DeviceAPIClientService;
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService;
|
||||
import org.wso2.carbon.ntask.core.service.TaskService;
|
||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||
import org.wso2.carbon.user.core.service.RealmService;
|
||||
|
||||
@ -86,7 +86,7 @@ import org.wso2.carbon.device.mgt.core.traccar.api.service.DeviceAPIClientServic
|
||||
import org.wso2.carbon.device.mgt.core.traccar.api.service.impl.DeviceAPIClientServiceImpl;
|
||||
import org.wso2.carbon.device.mgt.core.util.DeviceManagementSchemaInitializer;
|
||||
import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService;
|
||||
import org.wso2.carbon.ndatasource.core.DataSourceService;
|
||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||
import org.wso2.carbon.user.core.service.RealmService;
|
||||
@ -133,7 +133,7 @@ import java.util.concurrent.TimeUnit;
|
||||
* bind="setConfigurationContextService"
|
||||
* unbind="unsetConfigurationContextService"
|
||||
* @scr.reference name="email.sender.service"
|
||||
* interface="org.wso2.carbon.email.sender.core.service.EmailSenderService"
|
||||
* interface="io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService"
|
||||
* cardinality="0..1"
|
||||
* policy="dynamic"
|
||||
* bind="setEmailSenderService"
|
||||
|
||||
@ -152,12 +152,12 @@ import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
|
||||
import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
|
||||
import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
|
||||
import org.wso2.carbon.device.mgt.core.util.HttpReportingUtil;
|
||||
import org.wso2.carbon.email.sender.core.ContentProviderInfo;
|
||||
import org.wso2.carbon.email.sender.core.EmailContext;
|
||||
import org.wso2.carbon.email.sender.core.EmailSendingFailedException;
|
||||
import org.wso2.carbon.email.sender.core.EmailTransportNotConfiguredException;
|
||||
import org.wso2.carbon.email.sender.core.TypedValue;
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.ContentProviderInfo;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailContext;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSendingFailedException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailTransportNotConfiguredException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.TypedValue;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService;
|
||||
import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
|
||||
import org.wso2.carbon.tenant.mgt.services.TenantMgtAdminService;
|
||||
import org.wso2.carbon.user.api.UserStoreException;
|
||||
|
||||
@ -18,10 +18,10 @@
|
||||
*/
|
||||
package org.wso2.carbon.device.mgt.core.common;
|
||||
|
||||
import org.wso2.carbon.email.sender.core.EmailContext;
|
||||
import org.wso2.carbon.email.sender.core.EmailSendingFailedException;
|
||||
import org.wso2.carbon.email.sender.core.EmailTransportNotConfiguredException;
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailContext;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSendingFailedException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailTransportNotConfiguredException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService;
|
||||
|
||||
public class TestEmailSenderService implements EmailSenderService {
|
||||
@Override
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
</device.extensions.xmpp>
|
||||
|
||||
<!-- Email Sender component related properties -->
|
||||
<email.sender.core>${basedir}/../email-sender/org.wso2.carbon.email.sender.core</email.sender.core>
|
||||
<email.sender.core>${basedir}/../email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core</email.sender.core>
|
||||
|
||||
<!-- identity extensions component related properties -->
|
||||
<identity.extensions>identity-extensions</identity.extensions>
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>org.wso2.carbon.email.sender.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.email.sender.core</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
<name>WSO2 Carbon - Email Sender Core</name>
|
||||
<description>WSO2 Carbon - Email Sender Core</description>
|
||||
@ -49,7 +49,7 @@
|
||||
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
||||
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
|
||||
<Bundle-Description>Email Management Core Bundle</Bundle-Description>
|
||||
<Private-Package>org.wso2.carbon.email.sender.core.internal</Private-Package>
|
||||
<Private-Package>io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal</Private-Package>
|
||||
<Import-Package>
|
||||
org.apache.axis2.*;version="${axis2.osgi.version.range}",
|
||||
org.apache.axiom.*; version="${axiom.osgi.version.range}",
|
||||
@ -74,8 +74,8 @@
|
||||
org.apache.commons.collections
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!org.wso2.carbon.email.sender.core.internal,
|
||||
org.wso2.carbon.email.sender.core.*
|
||||
!io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal,
|
||||
io.entgra.device.mgt.core.transport.mgt.email.sender.core.*
|
||||
</Export-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class ContentProcessingInterruptedException extends Exception {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class EmailContentProviderFactory {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
import org.wso2.carbon.utils.CarbonUtils;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class EmailSenderConfigurationFailedException extends Exception {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import org.w3c.dom.Document;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class EmailSendingFailedException extends Exception {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class EmailTransportNotConfiguredException extends Exception {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class InvalidConfigurationStateException extends RuntimeException {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import org.apache.commons.collections.ExtendedProperties;
|
||||
import org.apache.velocity.exception.ResourceNotFoundException;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
public class TypedValue<T, V> {
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@ -47,7 +47,7 @@ public class VelocityBasedEmailContentProvider implements EmailContentProvider {
|
||||
engine.setProperty("resource.loader", "registry");
|
||||
engine.setProperty("velocimacro.library", "");
|
||||
engine.setProperty("registry.resource.loader.class",
|
||||
"org.wso2.carbon.email.sender.core.RegistryBasedResourceLoader");
|
||||
"io.entgra.device.mgt.core.transport.mgt.email.sender.core.RegistryBasedResourceLoader");
|
||||
engine.init();
|
||||
}
|
||||
|
||||
@ -16,12 +16,12 @@
|
||||
* under the License.
|
||||
*
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core.internal;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal;
|
||||
|
||||
import org.apache.axis2.context.ConfigurationContext;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.email.sender.core.EmailSenderConfigurationFailedException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSenderConfigurationFailedException;
|
||||
import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
|
||||
|
||||
class EmailSenderAxis2ConfigContextObserver implements Axis2ConfigurationContextObserver {
|
||||
@ -16,9 +16,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.wso2.carbon.email.sender.core.internal;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal;
|
||||
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService;
|
||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||
import org.wso2.carbon.utils.ConfigurationContextService;
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core.internal;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.osgi.service.component.ComponentContext;
|
||||
import org.wso2.carbon.email.sender.core.EmailSenderConfig;
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderService;
|
||||
import org.wso2.carbon.email.sender.core.service.EmailSenderServiceImpl;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSenderConfig;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.service.EmailSenderServiceImpl;
|
||||
import org.wso2.carbon.registry.core.service.RegistryService;
|
||||
import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
|
||||
import org.wso2.carbon.utils.ConfigurationContextService;
|
||||
@ -15,13 +15,13 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core.internal;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal;
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
import org.wso2.carbon.email.sender.core.EmailSenderConfigurationFailedException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSenderConfigurationFailedException;
|
||||
import org.wso2.carbon.registry.api.Collection;
|
||||
import org.wso2.carbon.registry.api.Registry;
|
||||
import org.wso2.carbon.registry.api.RegistryException;
|
||||
@ -15,11 +15,11 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.wso2.carbon.email.sender.core.service;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core.service;
|
||||
|
||||
import org.wso2.carbon.email.sender.core.EmailContext;
|
||||
import org.wso2.carbon.email.sender.core.EmailSendingFailedException;
|
||||
import org.wso2.carbon.email.sender.core.EmailTransportNotConfiguredException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailContext;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailSendingFailedException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.EmailTransportNotConfiguredException;
|
||||
|
||||
public interface EmailSenderService {
|
||||
|
||||
@ -16,8 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.wso2.carbon.email.sender.core.service;
|
||||
package io.entgra.device.mgt.core.transport.mgt.email.sender.core.service;
|
||||
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.*;
|
||||
import io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal.EmailSenderDataHolder;
|
||||
import org.apache.axiom.om.OMElement;
|
||||
import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
|
||||
import org.apache.axis2.AxisFault;
|
||||
@ -30,8 +32,6 @@ import org.apache.axis2.context.MessageContext;
|
||||
import org.apache.axis2.transport.mail.MailConstants;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.email.sender.core.*;
|
||||
import org.wso2.carbon.email.sender.core.internal.EmailSenderDataHolder;
|
||||
import org.wso2.carbon.utils.ConfigurationContextService;
|
||||
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
@ -33,7 +33,7 @@
|
||||
<url>http://wso2.org</url>
|
||||
|
||||
<modules>
|
||||
<module>org.wso2.carbon.email.sender.core</module>
|
||||
<module>io.entgra.device.mgt.core.transport.mgt.email.sender.core</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.api</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.api</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<name>Entgra - SMS Handler API</name>
|
||||
<description>Entgra - SMS Handler API</description>
|
||||
@ -145,12 +145,12 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.core</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@ -16,9 +16,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.api.service;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.api;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.common.SMSHandlerConstants;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.SMSHandlerConstants;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiResponse;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.api.service.addons;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons;
|
||||
|
||||
import javax.servlet.Filter;
|
||||
import javax.servlet.FilterChain;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.api.service.addons;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.api.service.impl;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.api.impl;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.api.service.ConfigurationManagementService;
|
||||
import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.api.ConfigurationManagementService;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
|
||||
@ -49,7 +49,7 @@
|
||||
<property name="scan" value="true"/>
|
||||
</bean>
|
||||
|
||||
<bean id="configurationManagementService" class="io.entgra.transport.mgt.sms.handler.api.service.impl.ConfigurationManagementServiceImpl"/>
|
||||
<bean id="jsonProvider" class="io.entgra.transport.mgt.sms.handler.api.service.addons.GsonMessageBodyHandler"/>
|
||||
<bean id="configurationManagementService" class="io.entgra.device.mgt.core.transport.mgt.sms.handler.api.impl.ConfigurationManagementServiceImpl"/>
|
||||
<bean id="jsonProvider" class="io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons.GsonMessageBodyHandler"/>
|
||||
|
||||
</beans>
|
||||
@ -77,7 +77,7 @@
|
||||
|
||||
<filter>
|
||||
<filter-name>ApiOriginFilter</filter-name>
|
||||
<filter-class>io.entgra.transport.mgt.sms.handler.api.service.addons.ApiOriginFilter</filter-class>
|
||||
<filter-class>io.entgra.device.mgt.core.transport.mgt.sms.handler.api.addons.ApiOriginFilter</filter-class>
|
||||
</filter>
|
||||
|
||||
<filter-mapping>
|
||||
@ -27,7 +27,7 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
<name>Entgra - SMS Handler Common</name>
|
||||
<description>Entgra - SMS Handler Common</description>
|
||||
@ -46,7 +46,7 @@
|
||||
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
|
||||
<Bundle-Description>SMS Management Common Bundle</Bundle-Description>
|
||||
<Export-Package>
|
||||
io.entgra.transport.mgt.sms.handler.common.*
|
||||
io.entgra.device.mgt.core.transport.mgt.sms.handler.common.*
|
||||
</Export-Package>
|
||||
<Import-Package>
|
||||
io.swagger.annotations; version="${swagger.annotations.version}"; resolution:=optional,
|
||||
@ -1,4 +1,4 @@
|
||||
package io.entgra.transport.mgt.sms.handler.common;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common;
|
||||
|
||||
/**
|
||||
* This class holds SMS Management Constants
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.common.bean;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.bean;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.common.config;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAttribute;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.common.config;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config;
|
||||
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
import javax.xml.bind.annotation.XmlElementWrapper;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.common.config;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config;
|
||||
|
||||
import javax.xml.bind.annotation.XmlAttribute;
|
||||
import javax.xml.bind.annotation.XmlElement;
|
||||
@ -16,7 +16,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.common.exception;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.exception;
|
||||
|
||||
/**
|
||||
* Exception that will be thrown during SMS Sender Management
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.common.spi;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.common.spi;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.common.bean.SMSMessage;
|
||||
import io.entgra.transport.mgt.sms.handler.common.exception.SMSSenderException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.bean.SMSMessage;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.exception.SMSSenderException;
|
||||
|
||||
/**
|
||||
* Manages the sending of SMS.
|
||||
@ -27,7 +27,7 @@
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.core</artifactId>
|
||||
<packaging>bundle</packaging>
|
||||
<name>Entgra - SMS Handler Core</name>
|
||||
<description>Entgra - SMS Handler Core</description>
|
||||
@ -75,9 +75,9 @@
|
||||
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
||||
<Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
|
||||
<Bundle-Description>SMS Management Core Bundle</Bundle-Description>
|
||||
<Private-Package>io.entgra.transport.mgt.sms.handler.core.internal</Private-Package>
|
||||
<Private-Package>io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal</Private-Package>
|
||||
<Import-Package>
|
||||
io.entgra.transport.mgt.sms.handler.common.*,
|
||||
io.entgra.device.mgt.core.transport.mgt.sms.handler.common.*,
|
||||
javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
|
||||
javax.xml.bind.annotation,
|
||||
javax.xml.bind,
|
||||
@ -87,8 +87,8 @@
|
||||
org.wso2.carbon.device.mgt.core.*
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!io.entgra.transport.mgt.sms.handler.core.internal,
|
||||
io.entgra.transport.mgt.sms.handler.core.*
|
||||
!io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal,
|
||||
io.entgra.device.mgt.core.transport.mgt.sms.handler.core.*
|
||||
</Export-Package>
|
||||
<DynamicImport-Package>*</DynamicImport-Package>
|
||||
</instructions>
|
||||
@ -110,7 +110,7 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -16,11 +16,11 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.core;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.core;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.common.config.SMSGateway;
|
||||
import io.entgra.transport.mgt.sms.handler.common.spi.SMSSender;
|
||||
import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config.SMSGateway;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.spi.SMSSender;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@ -16,10 +16,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.core.config;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.common.SMSHandlerConstants;
|
||||
import io.entgra.transport.mgt.sms.handler.common.config.SMSConfiguration;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.SMSHandlerConstants;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config.SMSConfiguration;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.w3c.dom.Document;
|
||||
@ -16,13 +16,13 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.core.impl;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.core.impl;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.common.bean.SMSMessage;
|
||||
import io.entgra.transport.mgt.sms.handler.common.config.SMSGateway;
|
||||
import io.entgra.transport.mgt.sms.handler.common.exception.SMSSenderException;
|
||||
import io.entgra.transport.mgt.sms.handler.common.spi.SMSSender;
|
||||
import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.bean.SMSMessage;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.config.SMSGateway;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.exception.SMSSenderException;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.common.spi.SMSSender;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
@ -16,16 +16,16 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.transport.mgt.sms.handler.core.internal;
|
||||
package io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal;
|
||||
|
||||
import io.entgra.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import io.entgra.device.mgt.core.transport.mgt.sms.handler.core.config.SMSConfigurationManager;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.osgi.service.component.ComponentContext;
|
||||
|
||||
/**
|
||||
* @scr.component
|
||||
* name="io.entgra.transport.mgt.sms.handler.core.internal.SMSHandlerServiceComponent" immediate="true"
|
||||
* name="io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal.SMSHandlerServiceComponent" immediate="true"
|
||||
*/
|
||||
public class SMSHandlerServiceComponent {
|
||||
|
||||
@ -34,9 +34,9 @@
|
||||
|
||||
|
||||
<modules>
|
||||
<module>io.entgra.transport.mgt.sms.handler.core</module>
|
||||
<module>io.entgra.transport.mgt.sms.handler.common</module>
|
||||
<module>io.entgra.transport.mgt.sms.handler.api</module>
|
||||
<module>io.entgra.device.mgt.core.transport.mgt.sms.handler.core</module>
|
||||
<module>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</module>
|
||||
<module>io.entgra.device.mgt.core.transport.mgt.sms.handler.api</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>org.wso2.carbon.email.sender.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.email.sender.core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.orbit.org.apache.velocity</groupId>
|
||||
@ -95,7 +95,7 @@
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:org.wso2.carbon.email.sender.core:${carbon.device.mgt.version}
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.email.sender.core:${carbon.device.mgt.version}
|
||||
</bundleDef>
|
||||
<bundleDef>
|
||||
org.wso2.orbit.org.apache.velocity:velocity:${velocity.version}
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.api</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.api</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
<overWrite>true</overWrite>
|
||||
|
||||
@ -37,11 +37,11 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@ -94,10 +94,10 @@
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.transport.mgt.sms.handler.core:${carbon.device.mgt.version}
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.core:${carbon.device.mgt.version}
|
||||
</bundleDef>
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.transport.mgt.sms.handler.common:${carbon.device.mgt.version}
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.common:${carbon.device.mgt.version}
|
||||
</bundleDef>
|
||||
</bundles>
|
||||
<importBundles>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<Gateways>
|
||||
<!-- multiple gateways can be listed and the gateway having the isDefault=true is picked up or gateway
|
||||
extensionClass can be passed and relevant impl can be used-->
|
||||
<Gateway name="sample" extensionClass="io.entgra.transport.mgt.sms.handler.core.impl.SampleSenderImpl" isDefault="true">
|
||||
<Gateway name="sample" extensionClass="io.entgra.device.mgt.core.transport.mgt.sms.handler.core.impl.SampleSenderImpl" isDefault="true">
|
||||
<!-- properties can be listed and can be picked up in the relevant implementation class as required-->
|
||||
<Properties>
|
||||
<Property name="sample-property">sample</Property>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<Gateways>
|
||||
<!-- multiple gateways can be listed and the gateway having the isDefault=true is picked up or gateway
|
||||
extensionClass can be passed and relevant impl can be used-->
|
||||
<Gateway name="sample" extensionClass="io.entgra.transport.mgt.sms.handler.core.impl.SampleSenderImpl" {% if sms_conf.gateway.sample is defined %} isDefault="{{sms_conf.gateway.sample.is_default}}" {% else%} isDefault="true" {% endif %}>
|
||||
<Gateway name="sample" extensionClass="io.entgra.device.mgt.core.transport.mgt.sms.handler.core.impl.SampleSenderImpl" {% if sms_conf.gateway.sample is defined %} isDefault="{{sms_conf.gateway.sample.is_default}}" {% else%} isDefault="true" {% endif %}>
|
||||
<!-- properties can be listed and can be picked up in the relevant implementation class as required-->
|
||||
<Properties>
|
||||
<Property name="sample-property">sample</Property>
|
||||
|
||||
10
pom.xml
10
pom.xml
@ -43,7 +43,7 @@
|
||||
<!-- <module>components/policy-mgt</module>-->
|
||||
<!-- <module>components/certificate-mgt</module>-->
|
||||
<!-- <module>components/ui-request-interceptor</module>-->
|
||||
<!-- <module>components/transport-mgt</module>-->
|
||||
<module>components/transport-mgt</module>
|
||||
<module>components/analytics-mgt</module>
|
||||
<module>components/webapp-authenticator-framework</module>
|
||||
<!-- <module>components/logger</module>-->
|
||||
@ -60,7 +60,7 @@
|
||||
<!-- <module>features/ui-request-interceptor</module>-->
|
||||
<!-- <module>features/jwt-client</module>-->
|
||||
<!-- <module>features/device-mgt-extensions</module>-->
|
||||
<!-- <module>features/transport-mgt</module>-->
|
||||
<module>features/transport-mgt</module>
|
||||
<module>features/analytics-mgt</module>
|
||||
<module>features/webapp-authenticator-framework</module>
|
||||
<!-- <module>features/logger</module>-->
|
||||
@ -264,7 +264,7 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>org.wso2.carbon.email.sender.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.email.sender.core</artifactId>
|
||||
<version>${carbon.device.mgt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -312,12 +312,12 @@
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.core</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.core</artifactId>
|
||||
<version>${carbon.device.mgt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.transport.mgt.sms.handler.common</artifactId>
|
||||
<artifactId>io.entgra.device.mgt.core.transport.mgt.sms.handler.common</artifactId>
|
||||
<version>${carbon.device.mgt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user