From 9ae4766432c987155de85ca6b96278ce7dda5c99 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Wed, 7 Jun 2023 21:36:27 +0530 Subject: [PATCH] updated bundles for apim420 --- .../org.wso2.carbon.iot.geo.dashboard/pom.xml | 2 +- components/analytics/iot-analytics/pom.xml | 2 +- components/analytics/pom.xml | 20 +- components/device-types/pom.xml | 22 +- .../pom.xml | 60 +-- .../pom.xml | 14 +- .../virtual-fire-alarm-plugin/pom.xml | 21 +- .../pom.xml | 49 ++- .../InputAdapterServiceComponent.java | 33 +- .../pom.xml | 95 ++--- .../InputAdapterServiceComponent.java | 43 ++- .../pom.xml | 80 ++-- .../InputAdapterServiceComponent.java | 61 ++-- .../InputAdapterServiceDataHolder.java | 2 +- .../mqtt/util/MQTTAdapterListener.java | 2 +- .../pom.xml | 46 ++- .../ThriftEventAdapterServiceComponent.java | 30 +- .../pom.xml | 47 +-- .../InputAdapterServiceComponent.java | 35 +- .../pom.xml | 71 ++-- .../HTTPEventAdapterServiceComponent.java | 20 +- .../pom.xml | 70 ++-- .../MQTTEventAdapterServiceComponent.java | 19 +- .../pom.xml | 7 +- .../pom.xml | 97 ++--- ...cketLocalEventAdapterServiceComponent.java | 29 +- .../pom.xml | 36 +- .../XMPPEventAdapterServiceComponent.java | 9 +- .../cdmf-transport-adapters/pom.xml | 21 +- .../pom.xml | 27 +- .../internal/EmqxExhookServiceComponent.java | 10 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/mb-extensions/pom.xml | 21 +- components/extensions/pom.xml | 22 +- .../pom.xml | 51 +-- ...lNotificationListenerServiceComponent.java | 33 +- .../pull-notification-listeners/pom.xml | 22 +- .../pom.xml | 101 +++-- .../pom.xml | 21 +- .../extensions/siddhi-extensions/pom.xml | 21 +- .../pom.xml | 2 +- .../mobile-plugins/android-plugin/pom.xml | 2 +- components/mobile-plugins/pom.xml | 21 +- .../pom.xml | 54 +-- .../pom.xml | 2 +- features/analytics-feature/pom.xml | 2 +- features/device-types-feature/pom.xml | 2 +- .../pom.xml | 6 +- .../virtual-fire-alarm-plugin-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/extensions-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../android-plugin-feature/pom.xml | 2 +- features/mobile-plugins-feature/pom.xml | 2 +- pom.xml | 344 +----------------- 61 files changed, 660 insertions(+), 1173 deletions(-) rename components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/{ => internal}/InputAdapterServiceComponent.java (69%) rename components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/{ => internal}/InputAdapterServiceDataHolder.java (97%) diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml index 6c347c9e4..3fd9a31e9 100644 --- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml +++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.iot.geo.dashboard WSO2 Carbon - IoT Geo Dashboard C-APP - http://wso2.org + http://entgra.io This feature contains the IoT geo dashboard gadget pom diff --git a/components/analytics/iot-analytics/pom.xml b/components/analytics/iot-analytics/pom.xml index b155fe690..624030b09 100644 --- a/components/analytics/iot-analytics/pom.xml +++ b/components/analytics/iot-analytics/pom.xml @@ -30,7 +30,7 @@ iot-analytics pom WSO2 Carbon - IoT Analytics Scripts - http://wso2.org + http://entgra.io diff --git a/components/analytics/pom.xml b/components/analytics/pom.xml index 99132b5a1..7b6fecbe6 100644 --- a/components/analytics/pom.xml +++ b/components/analytics/pom.xml @@ -30,28 +30,10 @@ analytics pom WSO2 Carbon - Mobile Plugins Extensions - http://wso2.org + http://entgra.io iot-analytics - - - - - - - - - - - - - - - - - - diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index 42795c59c..285a76392 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -30,30 +30,10 @@ device-types pom WSO2 Carbon - IoT Plugins - http://wso2.org + http://entgra.io virtual-fire-alarm-plugin - - - - - - - - - - - - - - - - - - - - diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index d58d0f832..aeadacc33 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -30,7 +30,7 @@ io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl WSO2 Carbon - IoT Server VirtualFireAlarm Agent WSO2 Carbon - VirtualFireAlarm Device Agent Implementation - http://wso2.org + http://entgra.io @@ -38,11 +38,9 @@ org.apache.maven.plugins maven-compiler-plugin - UTF-8 - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} - --add-exportsjava.base/sun.security.x509=ALL-UNNAMED + --add-exports + java.base/sun.security.x509=ALL-UNNAMED @@ -171,56 +169,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index 69b57648e..6e66242dc 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -30,7 +30,7 @@ war WSO2 Carbon - IoT Server VirtualFireAlarm API WSO2 Carbon - Virtual FireAlarm Service Management API Implementation - http://wso2.org + http://entgra.io @@ -209,11 +209,6 @@ io.entgra.device.mgt.core.apimgt.application.extension provided - - - - - io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions @@ -299,14 +294,11 @@ + org.apache.maven.plugins maven-compiler-plugin - - UTF-8 - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} - + org.apache.maven.plugins maven-war-plugin virtual_firealarm diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index a028b52a5..02db1bcfd 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -30,30 +30,11 @@ virtual-fire-alarm-plugin pom WSO2 Carbon - Virtual Fire Alarm Plugin - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl io.entgra.device.mgt.plugins.virtualfirealarm.api - - - - - - - - - - - - - - - - - - - diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index 4bfd6f832..31dcbee00 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -29,26 +29,22 @@ bundle WSO2 Carbon - Device Mgt Input Adaptor Extensions Module Provides the back-end functionality of Input adaptor - http://wso2.org + http://entgra.io - - org.apache.felix - maven-scr-plugin - - - - - - - - - org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + org.apache.felix maven-bundle-plugin @@ -66,12 +62,16 @@ !io.entgra.device.mgt.plugins.input.adapter.extension.internal, - org.osgi.framework.*;version="${imp.package.version.osgi.framework}", - org.osgi.service.*;version="${imp.package.version.osgi.service}", - com.jayway.jsonpath, - org.apache.commons.logging, + com.jayway.jsonpath;version="[0.9,1)", + io.entgra.device.mgt.plugins.input.adapter.extension, + io.entgra.device.mgt.plugins.input.adapter.extension.internal, + io.entgra.device.mgt.plugins.input.adapter.extension.transformer, + io.entgra.device.mgt.plugins.input.adapter.extension.validator, + org.apache.commons.logging;version="[1.2,2)", org.json.simple, - org.json.simple.parser + org.json.simple.parser, + org.osgi.framework.*;version="${imp.package.version.osgi.framework}", + org.osgi.service.*;version="${imp.package.version.osgi.service}" @@ -106,6 +106,11 @@ + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.ops4j.pax.logging pax-logging-api @@ -118,13 +123,5 @@ com.jayway.jsonpath json-path - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/src/main/java/io/entgra/device/mgt/plugins/input/adapter/extension/internal/InputAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/src/main/java/io/entgra/device/mgt/plugins/input/adapter/extension/internal/InputAdapterServiceComponent.java index c63117ed7..db0cd7dac 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/src/main/java/io/entgra/device/mgt/plugins/input/adapter/extension/internal/InputAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/src/main/java/io/entgra/device/mgt/plugins/input/adapter/extension/internal/InputAdapterServiceComponent.java @@ -29,27 +29,18 @@ import io.entgra.device.mgt.plugins.input.adapter.extension.transformer.MQTTCont import io.entgra.device.mgt.plugins.input.adapter.extension.validator.DefaultContentValidator; import io.entgra.device.mgt.plugins.input.adapter.extension.validator.HTTPContentValidator; import io.entgra.device.mgt.plugins.input.adapter.extension.validator.MQTTContentValidator; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.*; -/** - * @scr.component name="input.adapter.extension.adapterService.component" immediate="true" - * @scr.reference name="InputAdapterServiceComponent.content.validator.service" - * interface="io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator" - * cardinality="0..n" - * policy="dynamic" - * bind="setContentValidator" - * unbind="unsetContentValidator" - * @scr.reference name="InputAdapterServiceComponent.transformer.service" - * interface="io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer" - * cardinality="0..n" - * policy="dynamic" - * bind="setContentTransformer" - * unbind="unsetContentTransformer" - */ +@Component( + name = "io.entgra.device.mgt.plugins.input.adapter.extension.internal.InputAdapterServiceComponent", + immediate = true) public class InputAdapterServiceComponent { private static final Log log = LogFactory.getLog( InputAdapterServiceComponent.class); + @Activate protected void activate(ComponentContext context) { try { if (log.isDebugEnabled()) { @@ -69,6 +60,12 @@ public class InputAdapterServiceComponent { } } + @Reference( + name = "content.validator.extension", + service = io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator.class, + cardinality = ReferenceCardinality.MULTIPLE, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetContentValidator") protected void setContentValidator(ContentValidator contentValidator) { if (log.isDebugEnabled()) { log.debug("Setting ContentValidator Service"); @@ -82,6 +79,12 @@ public class InputAdapterServiceComponent { } } + @Reference( + name = "content.transformer.extension", + service = io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer.class, + cardinality = ReferenceCardinality.MULTIPLE, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetContentTransformer") protected void setContentTransformer(ContentTransformer contentTransformer) { if (log.isDebugEnabled()) { log.debug("Setting contentTransformer Service"); diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index 97974fdcd..40352402b 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -29,9 +29,14 @@ bundle WSO2 Carbon - Device Mgt Input Adaptor Module - Http Provides the back-end functionality of Input adaptor - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.carbon.analytics-common org.wso2.carbon.event.input.adapter.core @@ -101,16 +106,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + org.apache.maven.plugins @@ -134,40 +135,48 @@ io.entgra.device.mgt.plugins.input.adapter.http.* - org.wso2.carbon.event.input.adapter.core, - org.wso2.carbon.event.input.adapter.core.*, - javax.xml.namespace; version=0.0.0, - com.nimbusds.jose, - com.nimbusds.jose.crypto, - com.nimbusds.jwt, + com.nimbusds.jose;version="[7.9,8)", + com.nimbusds.jose.crypto;version="[7.9,8)", + com.nimbusds.jwt;version="[7.9,8)", + feign;version="[11.0,12)", + feign.auth;version="[11.0,12)", + feign.codec;version="[11.0,12)", + feign.gson;version="[11.0,12)", + feign.slf4j;version="[11.0,12)", + io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception, + io.entgra.device.mgt.plugins.input.adapter.http.util, + javax.net.ssl, + javax.servlet;version="[2.6,3)", + javax.servlet.http;version="[2.6,3)", + org.apache.axiom.util.base64;version="[1.2,2)", + org.apache.axis2;version="[1.6,2)", + org.apache.axis2.client;version="[1.6,2)", + org.apache.axis2.context;version="[1.6,2)", + org.apache.axis2.transport.http;version="[1.6,2)", + org.apache.commons.httpclient;version="[3.1,4)", + org.apache.commons.httpclient.contrib.ssl;version="[3.1,4)", + org.apache.commons.httpclient.params;version="[3.1,4)", + org.apache.commons.httpclient.protocol;version="[3.1,4)", + org.apache.commons.logging;version="[1.2,2)", + org.apache.commons.pool;version="[1.5,2)", + org.apache.commons.pool.impl;version="[1.5,2)", + org.apache.log4j;version="[1.2,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - javax.servlet, - javax.servlet.http, - org.osgi.service.http, - org.wso2.carbon.user.api, - org.wso2.carbon.user.core.service, - org.wso2.carbon.user.core.tenant, - org.apache.commons.pool, - org.apache.commons.pool.impl, - feign, - feign.auth, - feign.codec, - feign.gson, - io.entgra.device.mgt.plugins.input.adapter.extension.*, - org.apache.axiom.util.base64, - org.apache.axis2.*, - org.apache.commons.httpclient.*, - org.apache.commons.logging, - org.apache.log4j, - org.wso2.carbon.context, - org.wso2.carbon.core.util, - org.wso2.carbon.identity.oauth2.*, - org.wso2.carbon.utils, - org.wso2.carbon.utils.multitenancy, - org.wso2.carbon.base, - javax.net.ssl, - feign.slf4j + org.osgi.service.http;version="[1.2,2)", + org.wso2.carbon.base;version="[1.0,2)", + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.core.util;version="[4.8,5)", + org.wso2.carbon.event.input.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.identity.oauth2.stub;version="[6.9,7)", + org.wso2.carbon.identity.oauth2.stub.dto;version="[6.9,7)", + org.wso2.carbon.user.api;version="[1.0,2)", + org.wso2.carbon.user.core.service;version="[4.8,5)", + org.wso2.carbon.user.core.tenant;version="[4.8,5)", + org.wso2.carbon.utils;version="[4.8,5)", + org.wso2.carbon.utils.multitenancy;version="[4.8,5)" jsr311-api, diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/internal/InputAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/internal/InputAdapterServiceComponent.java index 08242707b..f929c64b7 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/internal/InputAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/internal/InputAdapterServiceComponent.java @@ -21,34 +21,23 @@ import io.entgra.device.mgt.plugins.input.adapter.http.HTTPEventAdapterFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; +import org.osgi.service.component.annotations.Component; import org.osgi.service.http.HttpService; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory; import org.wso2.carbon.user.core.service.RealmService; import io.entgra.device.mgt.plugins.input.adapter.extension.*; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.*; -/** - * @scr.component name="input.iot.http.AdapterService.component" immediate="true" - * @scr.reference name="user.realmservice.default" - * interface="org.wso2.carbon.user.core.service.RealmService" cardinality="1..1" - * policy="dynamic" - * bind="setRealmService" - * unbind="unsetRealmService" - * @scr.reference name="http.service" interface="org.osgi.service.http.HttpService" - * cardinality="1..1" - * policy="dynamic" - * bind="setHttpService" - * unbind="unsetHttpService" - * @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService" - * cardinality="1..1" - * policy="dynamic" - * bind="setInputAdapterExtensionService" - * unbind="unsetInputAdapterExtensionService" - */ +@Component( + name = "io.entgra.device.mgt.plugins.input.adapter.http.internal.InputAdapterServiceComponent", + immediate = true) public class InputAdapterServiceComponent { private static final Log log = LogFactory.getLog( InputAdapterServiceComponent.class); + @Activate protected void activate(ComponentContext context) { try { InputEventAdapterFactory httpEventEventAdapterFactory = new HTTPEventAdapterFactory(); @@ -62,6 +51,12 @@ public class InputAdapterServiceComponent { } } + @Reference( + name = "realm.service", + service = org.wso2.carbon.user.core.service.RealmService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetRealmService") protected void setRealmService(RealmService realmService) { InputAdapterServiceDataHolder.registerRealmService(realmService); } @@ -70,6 +65,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.registerRealmService(null); } + @Reference( + name = "http.service", + service = org.osgi.service.http.HttpService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetHttpService") protected void setHttpService(HttpService httpService) { InputAdapterServiceDataHolder.registerHTTPService(httpService); } @@ -78,6 +79,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.registerHTTPService(null); } + @Reference( + name = "input.adaptor.extension.service", + service = io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetInputAdapterExtensionService") protected void setInputAdapterExtensionService(InputAdapterExtensionService inputAdapterExtensionService) { InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService); } diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index e282106f7..b43b99911 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -29,9 +29,14 @@ bundle WSO2 Carbon - Device Mgt Input Adaptor Module - MQTT Provides the back-end functionality of Input adaptor - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + commons-codec.wso2 commons-codec @@ -93,16 +98,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + org.apache.maven.plugins @@ -126,39 +127,36 @@ io.entgra.device.mgt.plugins.input.adapter.mqtt.* - org.wso2.carbon.event.input.adapter.core, - org.wso2.carbon.event.input.adapter.core.*, - javax.xml.namespace; version=0.0.0, - org.eclipse.paho.client.mqttv3.*, - org.apache.http;version="${httpclient.version.range}", - org.apache.http.message;version="${httpclient.version.range}", - org.apache.http.client;version="${httpclient.version.range}", - org.apache.http.impl;version="${httpclient.version.range}", - org.apache.http.conn.*;version="${httpclient.version.range}", - org.apache.http.util;version="${httpclient.version.range}", - org.apache.http.client.entity;version="${httpclient.version.range}", - org.apache.http.client.methods;version="${httpclient.version.range}", - org.apache.http.impl.client;version="${httpclient.version.range}", - org.json.simple.*, - com.jayway.jsonpath.*, - io.entgra.device.mgt.core.identity.jwt.client.extension.*, + io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", + io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", + io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + io.entgra.device.mgt.plugins.input.adapter.mqtt, + io.entgra.device.mgt.plugins.input.adapter.mqtt.util, javax.net.ssl, - org.apache.commons.codec.binary, - org.apache.commons.logging, - org.apache.http.entity, + org.apache.axis2.context;version="[1.6,2)", + org.apache.commons.codec.binary;version="[1.4,2)", + org.apache.commons.logging;version="[1.2,2)", + org.apache.http;version="[4.4,5)", + org.apache.http.client;version="[4.3,5)", + org.apache.http.conn.socket;version="[4.3,5)",o + rg.apache.http.conn.ssl;version="[4.3,5)", + org.apache.http.impl.client;version="[4.3,5)", + org.apache.http.util;version="[4.4,5)", + org.eclipse.paho.client.mqttv3;version="[1.0,2)", + org.eclipse.paho.client.mqttv3.persist;version="[1.0,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context, - org.wso2.carbon.core, - io.entgra.device.mgt.plugins.input.adapter.extension, - org.wso2.carbon.user.api, - org.wso2.carbon.utils.multitenancy, - org.apache.axis2.context, - org.wso2.carbon.core.multitenancy.utils, - org.wso2.carbon.utils, - io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)" + org.osgi.service.http;version="[1.2,2)", + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.core;version="[4.8,5)", + org.wso2.carbon.core.multitenancy.utils;version="[4.8,5)", + org.wso2.carbon.event.input.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.user.api;version="[1.0,2)", + org.wso2.carbon.utils;version="[4.8,5)" diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/internal/InputAdapterServiceComponent.java similarity index 69% rename from components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceComponent.java rename to components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/internal/InputAdapterServiceComponent.java index c83c04284..e111f202a 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/internal/InputAdapterServiceComponent.java @@ -15,8 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.entgra.device.mgt.plugins.input.adapter.mqtt; +package io.entgra.device.mgt.plugins.input.adapter.mqtt.internal; +import io.entgra.device.mgt.plugins.input.adapter.mqtt.MQTTEventAdapterFactory; import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,33 +28,16 @@ import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.utils.ConfigurationContextService; +import org.osgi.service.component.annotations.*; -/** - * @scr.component name="input.iot.mqtt.AdapterService.component" immediate="true" - * @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService" - * cardinality="1..1" - * policy="dynamic" - * bind="setInputAdapterExtensionService" - * unbind="unsetInputAdapterExtensionService" - * @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService" - * cardinality="1..1" - * policy="dynamic" - * bind="setJWTClientManagerService" - * unbind="unsetJWTClientManagerService" - * @scr.reference name="input.adapter.service" interface="org.wso2.carbon.event.input.adapter.core.InputEventAdapterService" - * cardinality="1..1" - * policy="dynamic" - * bind="setInputEventAdapterService" - * unbind="unsetInputEventAdapterService" - * @scr.reference name="config.context.service" - * interface="org.wso2.carbon.utils.ConfigurationContextService" - * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" - * unbind="unsetConfigurationContextService" - */ +@Component( + name = "io.entgra.device.mgt.plugins.input.adapter.mqtt.internal.InputAdapterServiceComponent", + immediate = true) public class InputAdapterServiceComponent { private static final Log log = LogFactory.getLog(InputAdapterServiceComponent.class); + @Activate protected void activate(ComponentContext context) { try { InputEventAdapterFactory mqttEventAdapterFactory = new MQTTEventAdapterFactory(); @@ -67,6 +51,12 @@ public class InputAdapterServiceComponent { } } + @Reference( + name = "http.service", + service = org.osgi.service.http.HttpService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetHttpService") protected void setHttpService(HttpService httpService) { InputAdapterServiceDataHolder.registerHTTPService(httpService); } @@ -75,6 +65,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.registerHTTPService(null); } + @Reference( + name = "input.adaptor.extension.service", + service = io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetInputAdapterExtensionService") protected void setInputAdapterExtensionService(InputAdapterExtensionService inputAdapterExtensionService) { InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService); } @@ -83,6 +79,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.setInputAdapterExtensionService(null); } + @Reference( + name = "jwt.client.manager.service", + service = io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetJWTClientManagerService") protected void setJWTClientManagerService(JWTClientManagerService jwtClientManagerService) { InputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService); } @@ -90,7 +92,12 @@ public class InputAdapterServiceComponent { protected void unsetJWTClientManagerService(JWTClientManagerService jwtClientManagerService) { InputAdapterServiceDataHolder.setJwtClientManagerService(null); } - + @Reference( + name = "input.event.adaptor.service", + service = org.wso2.carbon.event.input.adapter.core.InputEventAdapterService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetInputEventAdapterService") protected void setInputEventAdapterService(InputEventAdapterService inputEventAdapterService) { InputAdapterServiceDataHolder.setInputEventAdapterService(inputEventAdapterService); } @@ -99,6 +106,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.setInputEventAdapterService(null); } + @Reference( + name = "configuration.context.service", + service = org.wso2.carbon.utils.ConfigurationContextService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetConfigurationContextService") protected void setConfigurationContextService(ConfigurationContextService contextService) { ConfigurationContext serverConfigContext = contextService.getServerConfigContext(); InputAdapterServiceDataHolder.setMainServerConfigContext(serverConfigContext); diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceDataHolder.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/internal/InputAdapterServiceDataHolder.java similarity index 97% rename from components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceDataHolder.java rename to components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/internal/InputAdapterServiceDataHolder.java index 601e2235a..d95d30647 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/InputAdapterServiceDataHolder.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/internal/InputAdapterServiceDataHolder.java @@ -12,7 +12,7 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package io.entgra.device.mgt.plugins.input.adapter.mqtt; +package io.entgra.device.mgt.plugins.input.adapter.mqtt.internal; import org.apache.axis2.context.ConfigurationContext; import org.osgi.service.http.HttpService; diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java index 10293bc8c..f1e4425a7 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java @@ -35,7 +35,7 @@ import org.wso2.carbon.core.multitenancy.utils.TenantAxisUtils; import io.entgra.device.mgt.plugins.input.adapter.extension.ContentInfo; import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer; import io.entgra.device.mgt.plugins.input.adapter.extension.ContentValidator; -import io.entgra.device.mgt.plugins.input.adapter.mqtt.InputAdapterServiceDataHolder; +import io.entgra.device.mgt.plugins.input.adapter.mqtt.internal.InputAdapterServiceDataHolder; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterConfiguration; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener; import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterRuntimeException; diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index dfc39049e..c4fca603f 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -32,9 +32,14 @@ org.wso2.carbon.event.input.adapter.thrift provides the back-end functionality of input wso2event adapter - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.carbon.analytics-common org.wso2.carbon.event.input.adapter.core @@ -73,16 +78,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + org.apache.maven.plugins @@ -106,21 +107,18 @@ io.entgra.device.mgt.plugins.input.adapter.thrift.*, - org.wso2.carbon.event.input.adapter.core, - org.wso2.carbon.event.input.adapter.core.*, - !javax.xml.namespace, - javax.xml.namespace; version=0.0.0, - org.apache.commons.logging, + org.apache.axis2.context;version="[1.6,2)", + org.apache.commons.logging;version="[1.2,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context, - org.wso2.carbon.databridge.commons, - org.wso2.carbon.databridge.core, - org.wso2.carbon.event.input.adapter.wso2event, - org.apache.axis2.context, - org.wso2.carbon.core.multitenancy.utils, - org.wso2.carbon.utils, - org.wso2.carbon.utils.multitenancy + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.core.multitenancy.utils;version="[4.8,5)", + org.wso2.carbon.databridge.commons;version="[5.3,6)", + org.wso2.carbon.databridge.core;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.wso2event;version="[5.3,6)", + org.wso2.carbon.utils;version="[4.8,5)" diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/src/main/java/io/entgra/device/mgt/plugins/input/adapter/thrift/internal/ThriftEventAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/src/main/java/io/entgra/device/mgt/plugins/input/adapter/thrift/internal/ThriftEventAdapterServiceComponent.java index 7e96db646..29ecbd5d4 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/src/main/java/io/entgra/device/mgt/plugins/input/adapter/thrift/internal/ThriftEventAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/src/main/java/io/entgra/device/mgt/plugins/input/adapter/thrift/internal/ThriftEventAdapterServiceComponent.java @@ -34,19 +34,11 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants; import java.util.List; import java.util.concurrent.ConcurrentHashMap; +import org.osgi.service.component.annotations.*; -/** - * @scr.component name="input.iot.thrift.AdapterService.component" immediate="true" - * @scr.reference name="agentserverservice.service" - * interface="org.wso2.carbon.databridge.core.DataBridgeSubscriberService" cardinality="1..1" - * policy="dynamic" bind="setDataBridgeSubscriberService" unbind="unSetDataBridgeSubscriberService" - * @scr.reference name="config.context.service" - * interface="org.wso2.carbon.utils.ConfigurationContextService" - * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" - * unbind="unsetConfigurationContextService" - */ - - +@Component( + name = "io.entgra.device.mgt.plugins.input.adapter.thrift.internal.ThriftEventAdapterServiceComponent", + immediate = true) public class ThriftEventAdapterServiceComponent { private static final Log log = LogFactory.getLog(ThriftEventAdapterServiceComponent.class); @@ -58,6 +50,7 @@ public class ThriftEventAdapterServiceComponent { */ + @Activate protected void activate(ComponentContext context) { try { @@ -71,6 +64,12 @@ public class ThriftEventAdapterServiceComponent { } } + @Reference( + name = "data.bridge.subscriber..service", + service = org.wso2.carbon.databridge.core.DataBridgeSubscriberService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unSetDataBridgeSubscriberService") protected void setDataBridgeSubscriberService( DataBridgeSubscriberService dataBridgeSubscriberService) { if (ThriftEventAdapterServiceHolder.getDataBridgeSubscriberService() == null) { @@ -122,7 +121,12 @@ public class ThriftEventAdapterServiceComponent { DataBridgeSubscriberService dataBridgeSubscriberService) { } - + @Reference( + name = "configuration.context.service", + service = org.wso2.carbon.utils.ConfigurationContextService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetConfigurationContextService") protected void setConfigurationContextService(ConfigurationContextService contextService) { ConfigurationContext serverConfigContext = contextService.getServerConfigContext(); ThriftEventAdapterServiceHolder.setConfigurationContext(serverConfigContext); diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index 5c360ff73..ca697ede2 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -29,9 +29,14 @@ bundle WSO2 Carbon - Device Mgt Input Adaptor Module - XMPP Provides the back-end functionality of Input adaptor - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.carbon.analytics-common org.wso2.carbon.event.input.adapter.core @@ -77,16 +82,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + org.apache.maven.plugins @@ -110,20 +111,20 @@ io.entgra.device.mgt.plugins.input.adapter.xmpp.* - org.wso2.carbon.event.input.adapter.core, - org.wso2.carbon.event.input.adapter.core.*, - javax.xml.namespace; version=0.0.0, - org.jivesoftware.smack.*, - org.apache.log4j, - org.wso2.carbon.base, - org.wso2.carbon.core.util, - org.apache.commons.logging, + io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + io.entgra.device.mgt.plugins.input.adapter.xmpp, + org.apache.commons.logging;version="[1.2,2)", + org.jivesoftware.smack, + org.jivesoftware.smack.filter, + org.jivesoftware.smack.packet, org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context, - org.wso2.carbon.core, - io.entgra.device.mgt.plugins.input.adapter.extension, - org.wso2.carbon.user.core.service + org.osgi.service.http;version="[1.2,2)", + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.core;version="[4.8,5)", + org.wso2.carbon.event.input.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.user.core.service;version="[4.8,5)" diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/internal/InputAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/internal/InputAdapterServiceComponent.java index 1488001d4..05c3b0646 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/internal/InputAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/input/adapter/xmpp/internal/InputAdapterServiceComponent.java @@ -25,22 +25,15 @@ import io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensio import io.entgra.device.mgt.plugins.input.adapter.xmpp.XMPPEventAdapterFactory; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory; import org.wso2.carbon.user.core.service.RealmService; +import org.osgi.service.component.annotations.*; -/** - * @scr.component name="input.iot.xmpp.AdapterService.component" immediate="true" - * @scr.reference name="user.realmservice.default" - * interface="org.wso2.carbon.user.core.service.RealmService" cardinality="1..1" - * policy="dynamic" bind="setRealmService" unbind="unsetRealmService" - * @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService" - * cardinality="1..1" - * policy="dynamic" - * bind="setInputAdapterExtensionService" - * unbind="unsetInputAdapterExtensionService" - */ +@Component( + name = "io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.InputAdapterServiceComponent", + immediate = true) public class InputAdapterServiceComponent { private static final Log log = LogFactory.getLog(InputAdapterServiceComponent.class); - + @Activate protected void activate(ComponentContext context) { try { InputEventAdapterFactory xmppEventEventAdapterFactory = new XMPPEventAdapterFactory(); @@ -54,6 +47,12 @@ public class InputAdapterServiceComponent { } } + @Reference( + name = "realm.service", + service = org.wso2.carbon.user.core.service.RealmService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetRealmService") protected void setRealmService(RealmService realmService) { InputAdapterServiceDataHolder.registerRealmService(realmService); } @@ -62,6 +61,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.registerRealmService(null); } + @Reference( + name = "http.service", + service = org.osgi.service.http.HttpService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetHttpService") protected void setHttpService(HttpService httpService) { InputAdapterServiceDataHolder.registerHTTPService(httpService); } @@ -70,6 +75,12 @@ public class InputAdapterServiceComponent { InputAdapterServiceDataHolder.registerHTTPService(null); } + @Reference( + name = "input.adaptor.extension.service", + service = io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetInputAdapterExtensionService") protected void setInputAdapterExtensionService(InputAdapterExtensionService inputAdapterExtensionService) { InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService); } diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index 212c6df7a..6de684ee6 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -31,9 +31,14 @@ io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.core @@ -67,16 +72,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + @@ -102,32 +103,34 @@ io.entgra.device.mgt.plugins.output.adapter.http.* - org.wso2.carbon.event.output.adapter.core, - org.wso2.carbon.event.output.adapter.core.*, + io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.plugins.output.adapter.http.util, javax.net.ssl, - org.apache.commons.logging, - org.apache.http, - org.apache.http.client, - org.apache.http.client.methods, - org.apache.http.conn.socket, - org.apache.http.conn.ssl, - org.apache.http.entity, - org.apache.http.impl.client, - org.apache.http.util, - org.eclipse.paho.client.mqttv3, - org.eclipse.paho.client.mqttv3.persist, - org.json.simple, - org.json.simple.parser, + org.apache.commons.httpclient;version="[3.1,4)", + org.apache.commons.httpclient.methods;version="[3.1,4)", + org.apache.commons.httpclient.params;version="[3.1,4)", + org.apache.commons.logging;version="[1.2,2)", + org.apache.commons.ssl;version="[3.1,4)", + org.apache.http;version="[4.4,5)", + org.apache.http.client;version="[4.3,5)", + org.apache.http.client.methods;version="[4.3,5)", + org.apache.http.conn.socket;version="[4.3,5)", + org.apache.http.conn.ssl;version="[4.3,5)", + org.apache.http.entity;version="[4.4,5)", + org.apache.http.impl.client;version="[4.3,5)", + org.apache.http.message;version="[4.4,5)", + org.apache.http.util;version="[4.4,5)", + org.json.simple;version="[1.1,2)", + org.json.simple.parser;version="[1.1,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context, - org.apache.commons.codec.binary, - org.apache.http.client.entity, - org.apache.http.message, - org.apache.commons.ssl, - io.entgra.device.mgt.core.identity.jwt.client.extension.*, - org.wso2.carbon.user.api, - javax.xml.namespace; version=0.0.0 + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.event.output.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.user.api;version="[1.0,2)" * diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/HTTPEventAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/HTTPEventAdapterServiceComponent.java index d0196c7f6..261b65d72 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/HTTPEventAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/src/main/java/io/entgra/device/mgt/plugins/output/adapter/http/internal/HTTPEventAdapterServiceComponent.java @@ -23,19 +23,15 @@ import org.osgi.service.component.ComponentContext; import io.entgra.device.mgt.plugins.output.adapter.http.HTTPEventAdapterFactory; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; +import org.osgi.service.component.annotations.*; -/** - * @scr.component component.name="output.Http.AdapterService.component" immediate="true" - * @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService" - * cardinality="1..1" - * policy="dynamic" - * bind="setJWTClientManagerService" - * unbind="unsetJWTClientManagerService" - */ +@Component( + name = "io.entgra.device.mgt.plugins.output.adapter.http.internal.HTTPEventAdapterServiceComponent", + immediate = true) public class HTTPEventAdapterServiceComponent { private static final Log log = LogFactory.getLog(HTTPEventAdapterServiceComponent.class); - + @Activate protected void activate(ComponentContext context) { try { HTTPEventAdapterFactory httpEventAdaptorFactory = new HTTPEventAdapterFactory(); @@ -49,6 +45,12 @@ public class HTTPEventAdapterServiceComponent { } } + @Reference( + name = "jwt.client.manager.service", + service = io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetJWTClientManagerService") protected void setJWTClientManagerService(JWTClientManagerService jwtClientManagerService) { OutputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService); } diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 2001fb6eb..64cde54b7 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -30,9 +30,14 @@ WSO2 Carbon - Device Mgt Output MQTT Adaptor Module io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + commons-codec.wso2 commons-codec @@ -81,16 +86,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + @@ -115,34 +116,31 @@ io.entgra.device.mgt.plugins.output.adapter.mqtt.*, - org.wso2.carbon.event.output.adapter.core, - org.wso2.carbon.event.output.adapter.core.*, + io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", + io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", + io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.plugins.output.adapter.mqtt, + io.entgra.device.mgt.plugins.output.adapter.mqtt.util, javax.net.ssl, - org.apache.commons.logging, - org.apache.http, - org.apache.http.client, - org.apache.http.client.methods, - org.apache.http.conn.socket, - org.apache.http.conn.ssl, - org.apache.http.entity, - org.apache.http.impl.client, - org.apache.http.util, - org.eclipse.paho.client.mqttv3, - org.eclipse.paho.client.mqttv3.persist, - org.json.simple, - org.json.simple.parser, + org.apache.commons.logging;version="[1.2,2)", + org.apache.commons.ssl;version="[3.1,4)", + org.apache.http;version="[4.4,5)", + org.apache.http.client;version="[4.3,5)", + org.apache.http.conn.socket;version="[4.3,5)", + org.apache.http.conn.ssl;version="[4.3,5)", + org.apache.http.impl.client;version="[4.3,5)", + org.apache.http.util;version="[4.4,5)", + org.eclipse.paho.client.mqttv3;version="[1.0,2)", + org.eclipse.paho.client.mqttv3.persist;version="[1.0,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context, - org.apache.commons.codec.binary, - org.apache.http.client.entity, - org.apache.http.message, - org.apache.commons.ssl, - io.entgra.device.mgt.core.identity.jwt.client.extension.*, - org.wso2.carbon.user.api, - io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", - io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)" + + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.event.output.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.user.api;version="[1.0,2)" diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/MQTTEventAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/MQTTEventAdapterServiceComponent.java index ec38c4050..a0372a64a 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/MQTTEventAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/internal/MQTTEventAdapterServiceComponent.java @@ -23,15 +23,11 @@ import org.osgi.service.component.ComponentContext; import io.entgra.device.mgt.plugins.output.adapter.mqtt.MQTTEventAdapterFactory; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; +import org.osgi.service.component.annotations.*; -/** - * @scr.component component.name="output.Mqtt.AdapterService.component" immediate="true" - * @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService" - * cardinality="1..1" - * policy="dynamic" - * bind="setJWTClientManagerService" - * unbind="unsetJWTClientManagerService" - */ +@Component( + name = "io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.MQTTEventAdapterServiceComponent", + immediate = true) public class MQTTEventAdapterServiceComponent { private static final Log log = LogFactory.getLog(MQTTEventAdapterServiceComponent.class); @@ -40,6 +36,7 @@ public class MQTTEventAdapterServiceComponent { * Deployment of the MQTT event adapter service will be done. * @param context bundle context where service is registered */ + @Activate protected void activate(ComponentContext context) { try { OutputEventAdapterFactory mqttEventAdapterFactory = new MQTTEventAdapterFactory(); @@ -53,6 +50,12 @@ public class MQTTEventAdapterServiceComponent { } } + @Reference( + name = "jwt.client.manager.service", + service = io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetJWTClientManagerService") protected void setJWTClientManagerService(JWTClientManagerService jwtClientManagerService) { OutputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService); } diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index 90f98aa1d..0c844fca0 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -30,9 +30,14 @@ io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint war WSO2 - Webapp for UI Output Event Adapter - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + junit junit diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index 2e6894448..aa3658e4e 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -32,9 +32,14 @@ org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of ui event adapter - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.core @@ -104,16 +109,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + org.apache.maven.plugins @@ -137,45 +138,45 @@ io.entgra.device.mgt.plugins.output.adapter.websocket.* - org.wso2.carbon.event.output.adapter.core.*, - javax.xml, - javax.xml.namespace; version=0.0.0, - org.apache.axis2, - org.apache.axis2.client, - org.apache.axis2.context, - org.apache.axis2.transport.http, - org.apache.commons.httpclient, - org.apache.commons.httpclient.contrib.ssl, - org.apache.commons.httpclient.params, - org.apache.commons.httpclient.protocol, - org.apache.commons.pool, - org.apache.commons.pool.impl, - org.apache.log4j, - com.google.gson, - javax.websocket, - org.apache.commons.logging, + feign;version="[11.0,12)", + feign.auth;version="[11.0,12)", + feign.codec;version="[11.0,12)", + feign.gson;version="[11.0,12)", + feign.slf4j;version="[11.0,12)", + io.entgra.device.mgt.plugins.output.adapter.websocket.authentication, + io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth, + io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth.exception, + io.entgra.device.mgt.plugins.output.adapter.websocket.service, + io.entgra.device.mgt.plugins.output.adapter.websocket.util, + javax.net.ssl, + javax.websocket;version="[1.1,2)", + org.apache.axis2;version="[1.6,2)", + org.apache.axis2.client;version="[1.6,2)", + org.apache.axis2.context;version="[1.6,2)", + org.apache.axis2.transport.http;version="[1.6,2)", + org.apache.commons.httpclient;version="[3.1,4)", + org.apache.commons.httpclient.contrib.ssl;version="[3.1,4)", + org.apache.commons.httpclient.params;version="[3.1,4)", + org.apache.commons.httpclient.protocol;version="[3.1,4)", + org.apache.commons.lang;version="[2.6,3)", + org.apache.commons.logging;version="[1.2,2)", + org.apache.commons.pool;version="[1.5,2)", + org.apache.commons.pool.impl;version="[1.5,2)", + org.json;version="[3.0,4)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context, - org.wso2.carbon.databridge.commons, - org.wso2.carbon.event.stream.core, - org.wso2.carbon.event.stream.core.exception, - org.wso2.carbon.utils, - javax.xml.bind, - javax.xml.bind.annotation, - javax.xml.parsers; version=0.0.0, - org.w3c.dom, - org.wso2.carbon.identity.oauth2.stub, - org.wso2.carbon.identity.oauth2.stub.dto, - org.wso2.carbon.user.api, - org.wso2.carbon.utils.multitenancy, - feign, - feign.auth, - feign.codec, - feign.gson, - javax.cache, - javax.net.ssl, - feign.slf4j + org.wso2.carbon.base;version="[1.0,2)", + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.databridge.commons;version="[5.3,6)", + org.wso2.carbon.event.output.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.event.stream.core;version="[5.3,6)", + org.wso2.carbon.event.stream.core.exception;version="[5.3,6)", + org.wso2.carbon.identity.oauth2.stub;version="[6.9,7)", + org.wso2.carbon.identity.oauth2.stub.dto;version="[6.9,7)", + org.wso2.carbon.registry.core.service;version="[1.0,2)", + org.wso2.carbon.user.api;version="[1.0,2)", + org.wso2.carbon.utils.multitenancy;version="[4.8,5)" * diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/internal/WebsocketLocalEventAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/internal/WebsocketLocalEventAdapterServiceComponent.java index 39f89012d..d83d5814d 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/internal/WebsocketLocalEventAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/internal/WebsocketLocalEventAdapterServiceComponent.java @@ -27,19 +27,11 @@ import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerService; import org.wso2.carbon.event.stream.core.EventStreamService; import org.wso2.carbon.registry.core.service.RegistryService; +import org.osgi.service.component.annotations.*; -/** - * @scr.component component.name="output.extensions.secured.websocket.AdapterService.component" immediate="true" - * @scr.reference name="eventStreamService.service" - * interface="org.wso2.carbon.event.stream.core.EventStreamService" cardinality="1..1" - * policy="dynamic" bind="setEventStreamService" unbind="unsetEventStreamService" - * @scr.reference name="registry.service" - * interface="org.wso2.carbon.registry.core.service.RegistryService" - * cardinality="1..1" - * policy="dynamic" - * bind="setRegistryService" - * unbind="unsetRegistryService" - */ +@Component( + name = "io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.MQTTEventAdapterServiceComponent", + immediate = true) public class WebsocketLocalEventAdapterServiceComponent { private static final Log log = LogFactory.getLog(WebsocketLocalEventAdapterServiceComponent.class); @@ -49,6 +41,7 @@ public class WebsocketLocalEventAdapterServiceComponent { * * @param context */ + @Activate protected void activate(ComponentContext context) { try { @@ -74,6 +67,12 @@ public class WebsocketLocalEventAdapterServiceComponent { } } + @Reference( + name = "event.stream.service", + service = org.wso2.carbon.event.stream.core.EventStreamService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetEventStreamService") protected void setEventStreamService(EventStreamService eventStreamService) { if (log.isDebugEnabled()) { log.debug("Setting the EventStreamService reference for the UILocalEventAdaptor Service"); @@ -93,6 +92,12 @@ public class WebsocketLocalEventAdapterServiceComponent { * * @param registryService An instance of RegistryService */ + @Reference( + name = "registry.service", + service = org.wso2.carbon.registry.core.service.RegistryService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetRegistryService") protected void setRegistryService(RegistryService registryService) { if (log.isDebugEnabled()) { log.debug("Setting Registry Service"); diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index 96afa1e13..ac9ae2467 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -31,9 +31,14 @@ WSO2 Carbon - Device Mgt Output XMPP Adaptor Module io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.core @@ -58,16 +63,12 @@ - org.apache.felix - maven-scr-plugin - - - - - - - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + @@ -92,13 +93,16 @@ io.entgra.device.mgt.plugins.output.adapter.xmpp.*, - org.wso2.carbon.event.output.adapter.core, - org.wso2.carbon.event.output.adapter.core.*, - org.jivesoftware.smack.*, - org.apache.commons.logging, + io.entgra.device.mgt.plugins.output.adapter.xmpp, + io.entgra.device.mgt.plugins.output.adapter.xmpp.util, + org.apache.commons.logging;version="[1.2,2)", + org.jivesoftware.smack, + org.jivesoftware.smack.packet, org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.event.output.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)" diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/internal/XMPPEventAdapterServiceComponent.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/internal/XMPPEventAdapterServiceComponent.java index dc2576f18..47c099923 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/internal/XMPPEventAdapterServiceComponent.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/src/main/java/io/entgra/device/mgt/plugins/output/adapter/xmpp/internal/XMPPEventAdapterServiceComponent.java @@ -22,11 +22,11 @@ import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; import io.entgra.device.mgt.plugins.output.adapter.xmpp.XMPPEventAdapterFactory; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; +import org.osgi.service.component.annotations.*; - -/** - * @scr.component component.name="output.XMPP.AdapterService.component" immediate="true" - */ +@Component( + name = "io.entgra.device.mgt.plugins.output.adapter.xmpp.internal.XMPPEventAdapterServiceComponent", + immediate = true) public class XMPPEventAdapterServiceComponent { private static final Log log = LogFactory.getLog(XMPPEventAdapterServiceComponent.class); @@ -35,6 +35,7 @@ public class XMPPEventAdapterServiceComponent { * Deployment of the XMPP event adapter service will be done. * @param context bundle context where service is registered */ + @Activate protected void activate(ComponentContext context) { try { OutputEventAdapterFactory xmppEventAdapterFactory = new XMPPEventAdapterFactory(); diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index 8161c0810..65c7dc34c 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -30,7 +30,7 @@ cdmf-transport-adapters pom WSO2 Carbon - IoT Base Plugin - http://wso2.org + http://entgra.io input/io.entgra.device.mgt.plugins.input.adapter.extension @@ -45,23 +45,4 @@ output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint - - - - - - - - - - - - - - - - - - - diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 03a842417..b31eed277 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -31,6 +31,11 @@ EMQX Extensions - Extension Hook Initializer + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.emqx.exhook @@ -59,22 +64,10 @@ org.apache.maven.plugins maven-compiler-plugin - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} + 1.8 + 1.8 - - org.apache.felix - maven-scr-plugin - - - - - - - - - org.apache.felix maven-bundle-plugin @@ -88,11 +81,11 @@ io.entgra.device.mgt.plugins.emqx.initializer.internal io.entgra.device.mgt.plugins.emqx.exhook, - io.entgra.device.mgt.plugins.emqx.initializer;resolution:=optional, - org.apache.commons.logging, - org.wso2.carbon.core, + io.entgra.device.mgt.plugins.emqx.initializer, + org.apache.commons.logging;version="[1.2 ,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", + org.wso2.carbon.core;version="[4.8,5)" !io.entgra.device.mgt.plugins.emqx.initializer.internal, diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/src/main/java/io/entgra/device/mgt/plugins/emqx/initializer/internal/EmqxExhookServiceComponent.java b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/src/main/java/io/entgra/device/mgt/plugins/emqx/initializer/internal/EmqxExhookServiceComponent.java index 71c896ea7..398239112 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/src/main/java/io/entgra/device/mgt/plugins/emqx/initializer/internal/EmqxExhookServiceComponent.java +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/src/main/java/io/entgra/device/mgt/plugins/emqx/initializer/internal/EmqxExhookServiceComponent.java @@ -24,14 +24,15 @@ import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; import org.wso2.carbon.core.ServerShutdownHandler; import org.wso2.carbon.core.ServerStartupObserver; +import org.osgi.service.component.annotations.*; -/** - * @scr.component name="io.entgra.device.mgt.plugins.emqx.initializer.internal.EmqxExhookServiceComponent" - * immediate="true" - */ +@Component( + name = "io.entgra.device.mgt.plugins.emqx.initializer.internal.EmqxExhookServiceComponent", + immediate = true) public class EmqxExhookServiceComponent { private static final Log log = LogFactory.getLog(EmqxExhookServiceComponent.class); + @Activate protected void activate(ComponentContext ctx) { try { @@ -50,6 +51,7 @@ public class EmqxExhookServiceComponent { } + @Deactivate protected void deactivate(ComponentContext ctx) { try { if (log.isDebugEnabled()) { diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml index d1352ae65..5cd13dc43 100644 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml @@ -31,7 +31,7 @@ war WSO2 Carbon - MQTT Topics Management API WSO2 Carbon - MQTT Topics Management API - http://wso2.org + http://entgra.io diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml index 99a2f57c4..b88eedf94 100644 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml @@ -31,7 +31,7 @@ bundle WSO2 Carbon - Component - MQTT - Authorization Manager MQTT authorization manager based on Carbon device manager - http://wso2.org + http://entgra.io diff --git a/components/extensions/mb-extensions/pom.xml b/components/extensions/mb-extensions/pom.xml index e61f93a05..8f84c1df0 100644 --- a/components/extensions/mb-extensions/pom.xml +++ b/components/extensions/mb-extensions/pom.xml @@ -30,30 +30,11 @@ mb-extensions pom WSO2 Carbon - MB Extension - http://wso2.org + http://entgra.io org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization org.wso2.carbon.andes.extensions.device.mgt.api - - - - - - - - - - - - - - - - - - - diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 812ad1fbb..79c7bd1bb 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -30,33 +30,13 @@ extensions pom WSO2 Carbon - Mobile Plugins Extensions - http://wso2.org + http://entgra.io cdmf-transport-adapters - pull-notification-listeners emqx-extensions siddhi-extensions - - - - - - - - - - - - - - - - - - - diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index ad7831ea0..9e29c381f 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -32,9 +32,14 @@ bundle WSO2 Carbon - MQTT Pull Notification Listener Implementation WSO2 Carbon - MQTT Pull Notification Lister Implementation - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common @@ -47,14 +52,6 @@ org.wso2.carbon.analytics-common org.wso2.carbon.event.input.adapter.core - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.input.adapter.extension @@ -68,8 +65,12 @@ - org.apache.felix - maven-scr-plugin + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + org.apache.felix @@ -86,21 +87,23 @@ io.entgra.device.mgt.plugins.mqtt.notification.listener.* + com.google.gson;version="[2.9,3)", + io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)", + io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", + org.apache.commons.logging;version="[1.2,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.apache.commons.logging, - io.entgra.device.mgt.core.device.mgt.common.*, - io.entgra.device.mgt.core.device.mgt.core.service, - com.google.gson, - org.wso2.carbon.context, - io.entgra.device.mgt.plugins.input.adapter.extension, - org.wso2.carbon.event.input.adapter.core, - org.wso2.carbon.event.input.adapter.core.exception, - org.wso2.carbon.user.api, - org.wso2.carbon.core, - io.entgra.device.mgt.core.device.mgt.core.config, - io.entgra.device.mgt.core.device.mgt.core.config.pull.notification, - org.wso2.carbon.utils.multitenancy + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.core;version="[4.8,5)", + org.wso2.carbon.event.input.adapter.core;version="[5.3,6)", + org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)", + org.wso2.carbon.user.api;version="[1.0,2)" diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/internal/PullNotificationListenerServiceComponent.java b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/internal/PullNotificationListenerServiceComponent.java index fc7ef0c0e..5e1b34f64 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/internal/PullNotificationListenerServiceComponent.java +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/src/main/java/io/entgra/device/mgt/plugins/mqtt/notification/listener/internal/PullNotificationListenerServiceComponent.java @@ -29,25 +29,16 @@ import io.entgra.device.mgt.plugins.mqtt.notification.listener.PullNotificationM import io.entgra.device.mgt.plugins.mqtt.notification.listener.PullNotificationStartupListener; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService; -/** - * @scr.component name="io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.PullNotificationListenerServiceComponent" immediate="true" - * @scr.reference name="carbon.device.mgt.provider" - * interface="io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService" - * cardinality="1..1" - * policy="dynamic" - * bind="setDeviceManagementProviderService" - * unbind="unsetDeviceManagementProviderService" - * @scr.reference name="event.input.adapter.service" - * interface="org.wso2.carbon.event.input.adapter.core.InputEventAdapterService" - * cardinality="1..1" - * policy="dynamic" - * bind="setInputEventAdapterService" - * unbind="unsetInputEventAdapterService" - */ +import org.osgi.service.component.annotations.*; + +@Component( + name = "io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.PullNotificationListenerServiceComponent", + immediate = true) public class PullNotificationListenerServiceComponent { private static final Log log = LogFactory.getLog(PullNotificationListenerServiceComponent.class); + @Activate @SuppressWarnings("unused") protected void activate(ComponentContext componentContext) { try { @@ -69,6 +60,12 @@ public class PullNotificationListenerServiceComponent { //Do nothing } + @Reference( + name = "device.mgt.provider.service", + service = io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetDeviceManagementProviderService") protected void setDeviceManagementProviderService(DeviceManagementProviderService deviceManagementProviderService) { MqttNotificationDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService); } @@ -77,6 +74,12 @@ public class PullNotificationListenerServiceComponent { MqttNotificationDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService); } + @Reference( + name = "input.event.adaptor.service", + service = org.wso2.carbon.event.input.adapter.core.InputEventAdapterService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetInputEventAdapterService") protected void setInputEventAdapterService(InputEventAdapterService inputEventAdapterService) { MqttNotificationDataHolder.getInstance().setInputEventAdapterService(inputEventAdapterService); } diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index 5a2187fc2..487dbf818 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -30,29 +30,9 @@ pull-notification-listeners pom WSO2 Carbon - Pull Notification Extension - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.mqtt.notification.listener - - - - - - - - - - - - - - - - - - - - diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index 7308f28a1..b0528f1da 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -28,13 +28,18 @@ io.entgra.device.mgt.plugins.extension.siddhi.device bundle WSO2 Siddhi Execution Extension - Device management Core functionality as Siddhi extension - http://wso2.org + http://entgra.io true + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core @@ -148,8 +153,8 @@ org.apache.maven.plugins maven-compiler-plugin - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} + 1.8 + 1.8 @@ -165,35 +170,71 @@ io.entgra.device.mgt.plugins.extension.siddhi.device.* - feign, - feign.codec, - feign.auth, - feign.gson, - feign.slf4j, + + + + + + feign;version="[11.0,12)", + feign.auth;version="[11.0,12)", + feign.codec;version="[11.0,12)", + feign.gson;version="[11.0,12)", + feign.slf4j;version="[11.0,12)", + io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", + io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", + io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs, + io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto, + io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception, + javax.annotation;version="[1.0,2)", + javax.crypto,javax.crypto.spec, + javax.net, javax.net.ssl, - javax.xml, - javax.xml.bind, - javax.xml.bind.annotation, - javax.xml.parsers;resolution:=optional, - org.apache.commons.lang, + javax.security.auth.x500,javax.xml.bind;version="[0.0,1)", + javax.xml.bind.annotation;version="[0.0,1)", + javax.xml.parsers, + + + + + + + + + + + + + + + + org.apache.commons.lang;version="[2.6,3)", + org.apache.commons.logging;version="[1.2,2)", + + + + org.json;version="[3.0,4)", + + org.w3c.dom, - org.wso2.carbon.base, - org.wso2.carbon.utils, - org.wso2.carbon.user.api, - org.json;version="${orbit.version.json.range}", - org.wso2.siddhi.core.*, - org.wso2.siddhi.query.api.*, - io.entgra.device.mgt.core.device.mgt.core.*, - io.entgra.device.mgt.core.device.mgt.common.*, - io.entgra.device.mgt.core.identity.jwt.client.*, - org.apache.commons.logging, - org.wso2.carbon.context, - android.util;resolution:=optional, - javax.annotation;resolution:=optional, - javax.net;resolution:=optional, - javax.security.auth.x500;resolution:=optional, - javax.crypto;resolution:=optional, - javax.crypto.spec;resolution:=optional + org.wso2.carbon.base;version="[1.0,2)", + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.user.api;version="[1.0,2)", + org.wso2.carbon.utils;version="[4.8,5)", + org.wso2.siddhi.core.config;version="[3.2,4)", + org.wso2.siddhi.core.exception;version="[3.2,4)", + org.wso2.siddhi.core.executor;version="[3.2,4)", + org.wso2.siddhi.core.executor.function;version="[3.2,4)", + org.wso2.siddhi.core.query.processor.stream.function;version="[3.2,4)", + org.wso2.siddhi.query.api.definition;version="[3.2,4)", + org.wso2.siddhi.query.api.exception;version="[3.2,4)" jsr311-api, diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index aeaa74256..8bbabb851 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -28,9 +28,14 @@ io.entgra.device.mgt.plugins.extension.siddhi.execution.json bundle WSO2 Siddhi Execution Extension - Json - http://wso2.org + http://entgra.io + + org.apache.felix + org.apache.felix.scr.ds-annotations + provided + org.wso2.siddhi siddhi-core @@ -60,8 +65,8 @@ org.apache.maven.plugins maven-compiler-plugin - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} + 1.8 + 1.8 @@ -77,9 +82,13 @@ io.entgra.device.mgt.plugins.extension.siddhi.execution.json.* - org.json;version="${orbit.version.json.range}", - org.wso2.siddhi.core.*, - org.wso2.siddhi.query.api.*, + org.json;version="[3.0,4)", + org.wso2.siddhi.core.config;version="[3.2,4)", + org.wso2.siddhi.core.exception;version="[3.2,4)", + org.wso2.siddhi.core.executor;version="[3.2,4)", + org.wso2.siddhi.core.executor.function;version="[3.2,4)", + org.wso2.siddhi.query.api.definition;version="[3.2,4)", + org.wso2.siddhi.query.api.exception;version="[3.2,4)" diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 9193ab39a..6c470f73d 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -30,30 +30,11 @@ siddhi-extensions pom WSO2 Carbon - Siddhi Extension - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.extension.siddhi.device io.entgra.device.mgt.plugins.extension.siddhi.execution.json - - - - - - - - - - - - - - - - - - - diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index 6a527fe58..3e9238585 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -31,7 +31,7 @@ bundle WSO2 Carbon - Mobile Device Management Android Impl WSO2 Carbon - Mobile Device Management Android Implementation - http://wso2.org + http://entgra.io diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index d5693f079..77b667cf2 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -30,7 +30,7 @@ android-plugin pom WSO2 Carbon - Mobile Plugins - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.mobile.android diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 2f3c1d014..0cd4706b0 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -30,29 +30,10 @@ mobile-plugins pom WSO2 Carbon - Mobile Plugins - http://wso2.org + http://entgra.io android-plugin - - - - - - - - - - - - - - - - - - - diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index a72332e47..8ce746860 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -31,63 +31,11 @@ io.entgra.device.mgt.plugins.analytics.feature pom WSO2 Carbon - IoT Server Analytics Feature - http://wso2.org + http://entgra.io This feature contains the Analytics Script for the IoT Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.wso2.maven carbon-p2-plugin diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml index ce30dde2d..a94ffcc8d 100644 --- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml +++ b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml @@ -31,7 +31,7 @@ org.wso2.carbon.iot.geo.dashboard.feature pom WSO2 Carbon - IoT Geo Dashboard Feature - http://wso2.org + http://entgra.io This feature contains the IoT geo dashboard gadget diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index 2111e1966..f98b1511f 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -30,7 +30,7 @@ analytics-feature pom WSO2 Carbon - IoT Server IoT Analytics Feature - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.analytics.feature diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index 6d7b503a2..376dfd263 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -30,7 +30,7 @@ device-types-feature pom WSO2 Carbon - Device Management IoT Plugins Feature - http://wso2.org + http://entgra.io virtual-fire-alarm-plugin-feature diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index d458d3afb..d603fff2b 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -31,14 +31,10 @@ io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature pom WSO2 Carbon - IoT Server VirtualFireAlarm Backend Feature - http://wso2.org + http://entgra.io This feature contains the VirtualFireAlarm Device type specific backend implementations for the IoT Server - - - - io.entgra.device.mgt.plugins diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 106e099c5..ea0145643 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -30,7 +30,7 @@ virtual-fire-alarm-plugin-feature pom WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index a7eeada6d..779aaad3c 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -31,7 +31,7 @@ io.entgra.device.mgt.plugins.adapter.feature pom WSO2 Carbon - Device Management Adapters Feature - http://wso2.org + http://entgra.io This feature contains the adapter bundles required for IoT Server diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index ad53dbac8..4e64e69d4 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -27,7 +27,7 @@ io.entgra.device.mgt.plugins.extension.siddhi.device.feature pom WSO2 Siddhi Execution Extension - Device Group Feature - http://wso2.org + http://entgra.io This feature contains Siddhi extension feature for device groups diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index 00dc9ad54..fff467bce 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -27,7 +27,7 @@ io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature pom WSO2 Siddhi Execution Extension - Json Feature - http://wso2.org + http://entgra.io This feature contains Siddhi extension feature for changing a json string to individual properties. diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index f70db33f6..83f5d9cd7 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -11,7 +11,7 @@ io.entgra.device.mgt.plugins.notification.listener.feature pom WSO2 Carbon - Notification Listener - http://wso2.org + http://entgra.io This feature contains the core bundles required iot core listeners diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml index bda69b450..2d908b153 100644 --- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml +++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml @@ -31,7 +31,7 @@ org.wso2.carbon.andes.extensions.device.mgt.api.feature pom WSO2 Carbon - MQTT Topics Management API Feature - http://wso2.org + http://entgra.io This feature contains the API feature for the MQTT dashboard diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml index 6de41ed31..f69cc9d31 100644 --- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml +++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml @@ -31,7 +31,7 @@ org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature pom WSO2 Carbon - MQTT Authorization Feature - http://wso2.org + http://entgra.io This feature contains the bundles required for mqtt authorization diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index d6e0895f6..8640a4b1f 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -30,7 +30,7 @@ extensions-feature pom WSO2 Carbon - Device Management Extensions - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.adapter.feature diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 2141b9c0e..0fb503eb7 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -30,7 +30,7 @@ io.entgra.device.mgt.plugins.mobile.android.feature pom WSO2 Carbon - Android Device Management Feature - http://wso2.org + http://entgra.io This feature contains the core bundles required for Android Device Management functionality diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index e5b336a35..c3f31cb4d 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -30,7 +30,7 @@ android-plugin-feature pom WSO2 Carbon - Device Management Android Plugin Feature - http://wso2.org + http://entgra.io io.entgra.device.mgt.plugins.mobile.android.feature diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index 29ad442ed..15057c480 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -30,7 +30,7 @@ mobile-plugins-feature pom WSO2 Carbon - Device Management EMM Plugins Feature - http://wso2.org + http://entgra.io android-plugin-feature diff --git a/pom.xml b/pom.xml index 53076387d..76732d02c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ pom 6.0.17-SNAPSHOT WSO2 Carbon - Device Management Plugins Parent - http://wso2.org + http://entgra.io WSO2 Carbon - Device Management Plugins Parent @@ -305,17 +305,7 @@ org.wso2.carbon.databridge.commons ${carbon.commons.version} - - - - - - - - - - - + org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.core @@ -475,16 +465,6 @@ - - org.eclipse.osgi - org.eclipse.osgi - ${eclipse.osgi.version} - - - org.eclipse.equinox - org.eclipse.equinox.common - ${eclipse.equinox.common.version} - org.testng testng @@ -504,11 +484,6 @@ - - org.eclipse.osgi - org.eclipse.osgi.services - ${eclipse.equinox.services.version} - @@ -534,62 +509,6 @@ ${carbon.kernel.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.wso2.carbon org.wso2.carbon.registry.core @@ -663,11 +582,6 @@ gson ${google.gson.version} - - - - - org.json.wso2 json @@ -737,7 +651,6 @@ javax.ws.rs jsr311-api ${javax.ws.rs.version} - @@ -765,58 +678,6 @@ jackson-jaxrs ${jackson.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commons-io.wso2 commons-io @@ -832,36 +693,6 @@ spring-web ${spring-web.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.bouncycastle.wso2 bcprov-jdk15on @@ -892,64 +723,17 @@ slf4j-simple ${slf4j.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - com.googlecode.json-simple.wso2 json-simple ${json-simple.version} - - - - - org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth.stub ${identity.inbound.auth.oauth.version} provided - - - - - - - - - - - org.apache.httpcomponents.wso2 httpcore @@ -975,11 +759,6 @@ commons-configuration ${commons-configuration.version} - - - - - com.jayway.jsonpath json-path @@ -1017,22 +796,6 @@ hibernate-validator ${hibernate-validator.version} - - - - - - - - - - - - - - - - @@ -1076,11 +839,6 @@ feign-slf4j ${io.github.openfeign.version} - - - - - @@ -1150,11 +908,6 @@ apk ${android.agent.version} - - - - - @@ -1215,33 +968,18 @@ 4.8.1 - - 1.11.2 5.1.2 - 1.6.1-wso2v85 - - - - 4.13.1 - 7.4.0 - - 3.6.200.v20130402-1505 - 3.8.1.v20120830-144521 - 3.3.100.v20120522-1822 - 2.1.210.wso2v1 - - 7.0.34.wso2v2 @@ -1254,26 +992,8 @@ 4.9.2 - - - - 6.9.6 - - - - - - - - - - - - - - 3.0.4.wso2v1 @@ -1288,19 +1008,11 @@ 5.3.5 - - - - - 2.9.1 - 2.4.0.wso2v1 - - - + 2.4 @@ -1310,24 +1022,16 @@ 6.0 - 1.2.17 5.3.23 - - - + 1.49.0.wso2v2 1.49.0.wso2v2 2.0.2.wso2v2 1.2 1.7.13 - - - - 3.0.0.wso2v1 - [2.0.0,4.0.0) 0.9.1 1.1.wso2v1 @@ -1343,7 +1047,6 @@ 7.9.0.wso2v1 - 1.5.6.wso2v1 @@ -1352,26 +1055,14 @@ 1.1 2.0.1 - - - 2.5 5.0.2.Final - - - - - - - 11.0 - 1.7 3.2.9 - true @@ -1468,19 +1159,6 @@ - - - - - - - - - - - - - org.apache.felix maven-bundle-plugin @@ -1493,20 +1171,6 @@ --> - org.apache.maven.plugins maven-assembly-plugin