updated bundles for apim420

synced-apim420
Amalka Subasinghe 2 years ago
parent d5f7bbfeaa
commit 9ae4766432

@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.iot.geo.dashboard</artifactId> <artifactId>org.wso2.carbon.iot.geo.dashboard</artifactId>
<name>WSO2 Carbon - IoT Geo Dashboard C-APP</name> <name>WSO2 Carbon - IoT Geo Dashboard C-APP</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the IoT geo dashboard gadget</description> <description>This feature contains the IoT geo dashboard gadget</description>
<packaging>pom</packaging> <packaging>pom</packaging>

@ -30,7 +30,7 @@
<artifactId>iot-analytics</artifactId> <artifactId>iot-analytics</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Analytics Scripts</name> <name>WSO2 Carbon - IoT Analytics Scripts</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<!-- <module>org.wso2.carbon.iot.geo.dashboard</module>--> <!-- <module>org.wso2.carbon.iot.geo.dashboard</module>-->

@ -30,28 +30,10 @@
<artifactId>analytics</artifactId> <artifactId>analytics</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Mobile Plugins Extensions</name> <name>WSO2 Carbon - Mobile Plugins Extensions</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>iot-analytics</module> <module>iot-analytics</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -30,30 +30,10 @@
<artifactId>device-types</artifactId> <artifactId>device-types</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Plugins</name> <name>WSO2 Carbon - IoT Plugins</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>virtual-fire-alarm-plugin</module> <module>virtual-fire-alarm-plugin</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -30,7 +30,7 @@
<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</artifactId> <artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</artifactId>
<name>WSO2 Carbon - IoT Server VirtualFireAlarm Agent</name> <name>WSO2 Carbon - IoT Server VirtualFireAlarm Agent</name>
<description>WSO2 Carbon - VirtualFireAlarm Device Agent Implementation</description> <description>WSO2 Carbon - VirtualFireAlarm Device Agent Implementation</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<build> <build>
<plugins> <plugins>
@ -38,11 +38,9 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<encoding>UTF-8</encoding>
<source>${wso2.maven.compiler.source}</source>
<target>${wso2.maven.compiler.target}</target>
<compilerArgs> <compilerArgs>
<arg>--add-exports</arg><arg>java.base/sun.security.x509=ALL-UNNAMED</arg> <arg>--add-exports</arg>
<arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
</compilerArgs> </compilerArgs>
</configuration> </configuration>
@ -171,56 +169,4 @@
</dependencies> </dependencies>
<!-- <repositories>-->
<!-- <repository>-->
<!-- <id>wso2-nexus</id>-->
<!-- <name>WSO2 internal Repository</name>-->
<!-- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>-->
<!-- <releases>-->
<!-- <enabled>true</enabled>-->
<!-- <updatePolicy>daily</updatePolicy>-->
<!-- <checksumPolicy>ignore</checksumPolicy>-->
<!-- </releases>-->
<!-- </repository>-->
<!-- <repository>-->
<!-- <id>wso2-maven2-repository</id>-->
<!-- <url>http://dist.wso2.org/maven2</url>-->
<!-- </repository>-->
<!-- </repositories>-->
<!-- <properties>-->
<!-- &lt;!&ndash; Java Version Compatibility &ndash;&gt;-->
<!-- <wso2.maven.compiler.source>17</wso2.maven.compiler.source>-->
<!-- <wso2.maven.compiler.target>17</wso2.maven.compiler.target>-->
<!-- &lt;!&ndash; Jetty Server Version &ndash;&gt;-->
<!-- <jetty.version>8.1.3.v20120416</jetty.version>-->
<!-- &lt;!&ndash; MQTT Paho Version &ndash;&gt;-->
<!-- <paho.mqtt.version>1.0.2</paho.mqtt.version>-->
<!-- &lt;!&ndash; Jivesoftware XMPP Version &ndash;&gt;-->
<!-- <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>-->
<!-- <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>-->
<!-- &lt;!&ndash; BouncyCastle Version &ndash;&gt;-->
<!-- <bcprov.wso2.version>1.49.wso2v1</bcprov.wso2.version>-->
<!-- <bcpkix.wso2.version>1.49.wso2v1</bcpkix.wso2.version>-->
<!-- &lt;!&ndash; WSO2 JSCEP Orbit Version &ndash;&gt;-->
<!-- <jscep.version>2.0.2.wso2v2</jscep.version>-->
<!-- &lt;!&ndash; Commons Libraries &ndash;&gt;-->
<!-- <log4j.version>1.2.17</log4j.version>-->
<!-- <common-logging.version>1.2</common-logging.version>-->
<!-- <commons.io>2.4</commons.io>-->
<!-- <commons-codec.version>1.7</commons-codec.version>-->
<!-- <commons-lang.version>2.6</commons-lang.version>-->
<!-- &lt;!&ndash; SLF4J Version &ndash;&gt;-->
<!-- <slf4j.version>1.7.13</slf4j.version>-->
<!-- </properties>-->
</project> </project>

@ -30,7 +30,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<name>WSO2 Carbon - IoT Server VirtualFireAlarm API</name> <name>WSO2 Carbon - IoT Server VirtualFireAlarm API</name>
<description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description> <description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
@ -209,11 +209,6 @@
<artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId> <artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.analytics</groupId>-->
<!-- <artifactId>org.wso2.carbon.analytics.api</artifactId>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
@ -299,14 +294,11 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>${wso2.maven.compiler.source}</source>
<target>${wso2.maven.compiler.target}</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<warName>virtual_firealarm</warName> <warName>virtual_firealarm</warName>

@ -30,30 +30,11 @@
<artifactId>virtual-fire-alarm-plugin</artifactId> <artifactId>virtual-fire-alarm-plugin</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Virtual Fire Alarm Plugin</name> <name>WSO2 Carbon - Virtual Fire Alarm Plugin</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</module> <module>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</module>
<module>io.entgra.device.mgt.plugins.virtualfirealarm.api</module> <module>io.entgra.device.mgt.plugins.virtualfirealarm.api</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -29,26 +29,22 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Mgt Input Adaptor Extensions Module</name> <name>WSO2 Carbon - Device Mgt Input Adaptor Extensions Module</name>
<description>Provides the back-end functionality of Input adaptor</description> <description>Provides the back-end functionality of Input adaptor</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-descriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -66,12 +62,16 @@
!io.entgra.device.mgt.plugins.input.adapter.extension.internal, !io.entgra.device.mgt.plugins.input.adapter.extension.internal,
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", com.jayway.jsonpath;version="[0.9,1)",
org.osgi.service.*;version="${imp.package.version.osgi.service}", io.entgra.device.mgt.plugins.input.adapter.extension,
com.jayway.jsonpath, io.entgra.device.mgt.plugins.input.adapter.extension.internal,
org.apache.commons.logging, 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,
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}"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>
@ -106,6 +106,11 @@
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId> <artifactId>pax-logging-api</artifactId>
@ -118,13 +123,5 @@
<groupId>com.jayway.jsonpath</groupId> <groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId> <artifactId>json-path</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

@ -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.DefaultContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.validator.HTTPContentValidator; import io.entgra.device.mgt.plugins.input.adapter.extension.validator.HTTPContentValidator;
import io.entgra.device.mgt.plugins.input.adapter.extension.validator.MQTTContentValidator; import io.entgra.device.mgt.plugins.input.adapter.extension.validator.MQTTContentValidator;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component name="input.adapter.extension.adapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.input.adapter.extension.internal.InputAdapterServiceComponent",
* @scr.reference name="InputAdapterServiceComponent.content.validator.service" immediate = true)
* 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"
*/
public class InputAdapterServiceComponent { public class InputAdapterServiceComponent {
private static final Log log = LogFactory.getLog( private static final Log log = LogFactory.getLog(
InputAdapterServiceComponent.class); InputAdapterServiceComponent.class);
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
if (log.isDebugEnabled()) { 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) { protected void setContentValidator(ContentValidator contentValidator) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Setting ContentValidator Service"); 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) { protected void setContentTransformer(ContentTransformer contentTransformer) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Setting contentTransformer Service"); log.debug("Setting contentTransformer Service");

@ -29,9 +29,14 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Mgt Input Adaptor Module - Http</name> <name>WSO2 Carbon - Device Mgt Input Adaptor Module - Http</name>
<description>Provides the back-end functionality of Input adaptor</description> <description>Provides the back-end functionality of Input adaptor</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
@ -101,16 +106,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -134,40 +135,48 @@
io.entgra.device.mgt.plugins.input.adapter.http.* io.entgra.device.mgt.plugins.input.adapter.http.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.input.adapter.core, com.nimbusds.jose;version="[7.9,8)",
org.wso2.carbon.event.input.adapter.core.*, com.nimbusds.jose.crypto;version="[7.9,8)",
javax.xml.namespace; version=0.0.0, com.nimbusds.jwt;version="[7.9,8)",
com.nimbusds.jose, feign;version="[11.0,12)",
com.nimbusds.jose.crypto, feign.auth;version="[11.0,12)",
com.nimbusds.jwt, 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.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
javax.servlet, org.osgi.service.http;version="[1.2,2)",
javax.servlet.http, org.wso2.carbon.base;version="[1.0,2)",
org.osgi.service.http, org.wso2.carbon.context;version="[4.8,5)",
org.wso2.carbon.user.api, org.wso2.carbon.core.util;version="[4.8,5)",
org.wso2.carbon.user.core.service, org.wso2.carbon.event.input.adapter.core;version="[5.3,6)",
org.wso2.carbon.user.core.tenant, org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)",
org.apache.commons.pool, org.wso2.carbon.identity.oauth2.stub;version="[6.9,7)",
org.apache.commons.pool.impl, org.wso2.carbon.identity.oauth2.stub.dto;version="[6.9,7)",
feign, org.wso2.carbon.user.api;version="[1.0,2)",
feign.auth, org.wso2.carbon.user.core.service;version="[4.8,5)",
feign.codec, org.wso2.carbon.user.core.tenant;version="[4.8,5)",
feign.gson, org.wso2.carbon.utils;version="[4.8,5)",
io.entgra.device.mgt.plugins.input.adapter.extension.*, org.wso2.carbon.utils.multitenancy;version="[4.8,5)"
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
</Import-Package> </Import-Package>
<Embed-Dependency> <Embed-Dependency>
jsr311-api, jsr311-api,

@ -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.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.http.HttpService; import org.osgi.service.http.HttpService;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.service.RealmService;
import io.entgra.device.mgt.plugins.input.adapter.extension.*; import io.entgra.device.mgt.plugins.input.adapter.extension.*;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component name="input.iot.http.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.input.adapter.http.internal.InputAdapterServiceComponent",
* @scr.reference name="user.realmservice.default" immediate = true)
* 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"
*/
public class InputAdapterServiceComponent { public class InputAdapterServiceComponent {
private static final Log log = LogFactory.getLog( private static final Log log = LogFactory.getLog(
InputAdapterServiceComponent.class); InputAdapterServiceComponent.class);
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
InputEventAdapterFactory httpEventEventAdapterFactory = new HTTPEventAdapterFactory(); 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) { protected void setRealmService(RealmService realmService) {
InputAdapterServiceDataHolder.registerRealmService(realmService); InputAdapterServiceDataHolder.registerRealmService(realmService);
} }
@ -70,6 +65,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.registerRealmService(null); 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) { protected void setHttpService(HttpService httpService) {
InputAdapterServiceDataHolder.registerHTTPService(httpService); InputAdapterServiceDataHolder.registerHTTPService(httpService);
} }
@ -78,6 +79,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.registerHTTPService(null); 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) { protected void setInputAdapterExtensionService(InputAdapterExtensionService inputAdapterExtensionService) {
InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService); InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService);
} }

@ -29,9 +29,14 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Mgt Input Adaptor Module - MQTT</name> <name>WSO2 Carbon - Device Mgt Input Adaptor Module - MQTT</name>
<description>Provides the back-end functionality of Input adaptor</description> <description>Provides the back-end functionality of Input adaptor</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>commons-codec.wso2</groupId> <groupId>commons-codec.wso2</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
@ -93,16 +98,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -126,39 +127,36 @@
io.entgra.device.mgt.plugins.input.adapter.mqtt.* io.entgra.device.mgt.plugins.input.adapter.mqtt.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.input.adapter.core, io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
org.wso2.carbon.event.input.adapter.core.*, io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
javax.xml.namespace; version=0.0.0, io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)",
org.eclipse.paho.client.mqttv3.*, io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)",
org.apache.http;version="${httpclient.version.range}", io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
org.apache.http.message;version="${httpclient.version.range}", io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
org.apache.http.client;version="${httpclient.version.range}", io.entgra.device.mgt.plugins.input.adapter.mqtt,
org.apache.http.impl;version="${httpclient.version.range}", io.entgra.device.mgt.plugins.input.adapter.mqtt.util,
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.*,
javax.net.ssl, javax.net.ssl,
org.apache.commons.codec.binary, org.apache.axis2.context;version="[1.6,2)",
org.apache.commons.logging, org.apache.commons.codec.binary;version="[1.4,2)",
org.apache.http.entity, 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.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.osgi.service.http;version="[1.2,2)",
org.wso2.carbon.core, org.wso2.carbon.context;version="[4.8,5)",
io.entgra.device.mgt.plugins.input.adapter.extension, org.wso2.carbon.core;version="[4.8,5)",
org.wso2.carbon.user.api, org.wso2.carbon.core.multitenancy.utils;version="[4.8,5)",
org.wso2.carbon.utils.multitenancy, org.wso2.carbon.event.input.adapter.core;version="[5.3,6)",
org.apache.axis2.context, org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)",
org.wso2.carbon.core.multitenancy.utils, org.wso2.carbon.user.api;version="[1.0,2)",
org.wso2.carbon.utils, org.wso2.carbon.utils;version="[4.8,5)"
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)"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -15,8 +15,9 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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 org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
import org.wso2.carbon.utils.ConfigurationContextService; import org.wso2.carbon.utils.ConfigurationContextService;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component name="input.iot.mqtt.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.input.adapter.mqtt.internal.InputAdapterServiceComponent",
* @scr.reference name="input.extension.service" interface="io.entgra.device.mgt.plugins.input.adapter.extension.InputAdapterExtensionService" immediate = true)
* 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"
*/
public class InputAdapterServiceComponent { public class InputAdapterServiceComponent {
private static final Log log = LogFactory.getLog(InputAdapterServiceComponent.class); private static final Log log = LogFactory.getLog(InputAdapterServiceComponent.class);
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
InputEventAdapterFactory mqttEventAdapterFactory = new MQTTEventAdapterFactory(); 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) { protected void setHttpService(HttpService httpService) {
InputAdapterServiceDataHolder.registerHTTPService(httpService); InputAdapterServiceDataHolder.registerHTTPService(httpService);
} }
@ -75,6 +65,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.registerHTTPService(null); 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) { protected void setInputAdapterExtensionService(InputAdapterExtensionService inputAdapterExtensionService) {
InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService); InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService);
} }
@ -83,6 +79,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.setInputAdapterExtensionService(null); 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) { protected void setJWTClientManagerService(JWTClientManagerService jwtClientManagerService) {
InputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService); InputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService);
} }
@ -90,7 +92,12 @@ public class InputAdapterServiceComponent {
protected void unsetJWTClientManagerService(JWTClientManagerService jwtClientManagerService) { protected void unsetJWTClientManagerService(JWTClientManagerService jwtClientManagerService) {
InputAdapterServiceDataHolder.setJwtClientManagerService(null); 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) { protected void setInputEventAdapterService(InputEventAdapterService inputEventAdapterService) {
InputAdapterServiceDataHolder.setInputEventAdapterService(inputEventAdapterService); InputAdapterServiceDataHolder.setInputEventAdapterService(inputEventAdapterService);
} }
@ -99,6 +106,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.setInputEventAdapterService(null); 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) { protected void setConfigurationContextService(ConfigurationContextService contextService) {
ConfigurationContext serverConfigContext = contextService.getServerConfigContext(); ConfigurationContext serverConfigContext = contextService.getServerConfigContext();
InputAdapterServiceDataHolder.setMainServerConfigContext(serverConfigContext); InputAdapterServiceDataHolder.setMainServerConfigContext(serverConfigContext);

@ -12,7 +12,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for the * CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License. * 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.apache.axis2.context.ConfigurationContext;
import org.osgi.service.http.HttpService; import org.osgi.service.http.HttpService;

@ -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.ContentInfo;
import io.entgra.device.mgt.plugins.input.adapter.extension.ContentTransformer; 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.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.InputEventAdapterConfiguration;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterListener;
import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterRuntimeException; import org.wso2.carbon.event.input.adapter.core.exception.InputEventAdapterRuntimeException;

@ -32,9 +32,14 @@
<description>org.wso2.carbon.event.input.adapter.thrift provides the back-end <description>org.wso2.carbon.event.input.adapter.thrift provides the back-end
functionality of input wso2event adapter functionality of input wso2event adapter
</description> </description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
@ -73,16 +78,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -106,21 +107,18 @@
io.entgra.device.mgt.plugins.input.adapter.thrift.*, io.entgra.device.mgt.plugins.input.adapter.thrift.*,
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.input.adapter.core, org.apache.axis2.context;version="[1.6,2)",
org.wso2.carbon.event.input.adapter.core.*, org.apache.commons.logging;version="[1.2,2)",
!javax.xml.namespace,
javax.xml.namespace; version=0.0.0,
org.apache.commons.logging,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.context;version="[4.8,5)",
org.wso2.carbon.databridge.commons, org.wso2.carbon.core.multitenancy.utils;version="[4.8,5)",
org.wso2.carbon.databridge.core, org.wso2.carbon.databridge.commons;version="[5.3,6)",
org.wso2.carbon.event.input.adapter.wso2event, org.wso2.carbon.databridge.core;version="[5.3,6)",
org.apache.axis2.context, org.wso2.carbon.event.input.adapter.core;version="[5.3,6)",
org.wso2.carbon.core.multitenancy.utils, org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)",
org.wso2.carbon.utils, org.wso2.carbon.event.input.adapter.wso2event;version="[5.3,6)",
org.wso2.carbon.utils.multitenancy org.wso2.carbon.utils;version="[4.8,5)"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -34,19 +34,11 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component name="input.iot.thrift.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.input.adapter.thrift.internal.ThriftEventAdapterServiceComponent",
* @scr.reference name="agentserverservice.service" immediate = true)
* 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"
*/
public class ThriftEventAdapterServiceComponent { public class ThriftEventAdapterServiceComponent {
private static final Log log = LogFactory.getLog(ThriftEventAdapterServiceComponent.class); private static final Log log = LogFactory.getLog(ThriftEventAdapterServiceComponent.class);
@ -58,6 +50,7 @@ public class ThriftEventAdapterServiceComponent {
*/ */
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { 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( protected void setDataBridgeSubscriberService(
DataBridgeSubscriberService dataBridgeSubscriberService) { DataBridgeSubscriberService dataBridgeSubscriberService) {
if (ThriftEventAdapterServiceHolder.getDataBridgeSubscriberService() == null) { if (ThriftEventAdapterServiceHolder.getDataBridgeSubscriberService() == null) {
@ -122,7 +121,12 @@ public class ThriftEventAdapterServiceComponent {
DataBridgeSubscriberService dataBridgeSubscriberService) { 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) { protected void setConfigurationContextService(ConfigurationContextService contextService) {
ConfigurationContext serverConfigContext = contextService.getServerConfigContext(); ConfigurationContext serverConfigContext = contextService.getServerConfigContext();
ThriftEventAdapterServiceHolder.setConfigurationContext(serverConfigContext); ThriftEventAdapterServiceHolder.setConfigurationContext(serverConfigContext);

@ -29,9 +29,14 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Mgt Input Adaptor Module - XMPP</name> <name>WSO2 Carbon - Device Mgt Input Adaptor Module - XMPP</name>
<description>Provides the back-end functionality of Input adaptor</description> <description>Provides the back-end functionality of Input adaptor</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
@ -77,16 +82,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -110,20 +111,20 @@
io.entgra.device.mgt.plugins.input.adapter.xmpp.* io.entgra.device.mgt.plugins.input.adapter.xmpp.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.input.adapter.core, io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
org.wso2.carbon.event.input.adapter.core.*, io.entgra.device.mgt.plugins.input.adapter.xmpp,
javax.xml.namespace; version=0.0.0, org.apache.commons.logging;version="[1.2,2)",
org.jivesoftware.smack.*, org.jivesoftware.smack,
org.apache.log4j, org.jivesoftware.smack.filter,
org.wso2.carbon.base, org.jivesoftware.smack.packet,
org.wso2.carbon.core.util,
org.apache.commons.logging,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.osgi.service.http;version="[1.2,2)",
org.wso2.carbon.core, org.wso2.carbon.context;version="[4.8,5)",
io.entgra.device.mgt.plugins.input.adapter.extension, org.wso2.carbon.core;version="[4.8,5)",
org.wso2.carbon.user.core.service 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)"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -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 io.entgra.device.mgt.plugins.input.adapter.xmpp.XMPPEventAdapterFactory;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterFactory;
import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.service.RealmService;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component name="input.iot.xmpp.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.InputAdapterServiceComponent",
* @scr.reference name="user.realmservice.default" immediate = true)
* 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"
*/
public class InputAdapterServiceComponent { public class InputAdapterServiceComponent {
private static final Log log = LogFactory.getLog(InputAdapterServiceComponent.class); private static final Log log = LogFactory.getLog(InputAdapterServiceComponent.class);
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
InputEventAdapterFactory xmppEventEventAdapterFactory = new XMPPEventAdapterFactory(); 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) { protected void setRealmService(RealmService realmService) {
InputAdapterServiceDataHolder.registerRealmService(realmService); InputAdapterServiceDataHolder.registerRealmService(realmService);
} }
@ -62,6 +61,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.registerRealmService(null); 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) { protected void setHttpService(HttpService httpService) {
InputAdapterServiceDataHolder.registerHTTPService(httpService); InputAdapterServiceDataHolder.registerHTTPService(httpService);
} }
@ -70,6 +75,12 @@ public class InputAdapterServiceComponent {
InputAdapterServiceDataHolder.registerHTTPService(null); 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) { protected void setInputAdapterExtensionService(InputAdapterExtensionService inputAdapterExtensionService) {
InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService); InputAdapterServiceDataHolder.setInputAdapterExtensionService(inputAdapterExtensionService);
} }

@ -31,9 +31,14 @@
<description> <description>
io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter
</description> </description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
@ -67,16 +72,12 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
@ -102,32 +103,34 @@
io.entgra.device.mgt.plugins.output.adapter.http.* io.entgra.device.mgt.plugins.output.adapter.http.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.output.adapter.core, io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)",
org.wso2.carbon.event.output.adapter.core.*, 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, javax.net.ssl,
org.apache.commons.logging, org.apache.commons.httpclient;version="[3.1,4)",
org.apache.http, org.apache.commons.httpclient.methods;version="[3.1,4)",
org.apache.http.client, org.apache.commons.httpclient.params;version="[3.1,4)",
org.apache.http.client.methods, org.apache.commons.logging;version="[1.2,2)",
org.apache.http.conn.socket, org.apache.commons.ssl;version="[3.1,4)",
org.apache.http.conn.ssl, org.apache.http;version="[4.4,5)",
org.apache.http.entity, org.apache.http.client;version="[4.3,5)",
org.apache.http.impl.client, org.apache.http.client.methods;version="[4.3,5)",
org.apache.http.util, org.apache.http.conn.socket;version="[4.3,5)",
org.eclipse.paho.client.mqttv3, org.apache.http.conn.ssl;version="[4.3,5)",
org.eclipse.paho.client.mqttv3.persist, org.apache.http.entity;version="[4.4,5)",
org.json.simple, org.apache.http.impl.client;version="[4.3,5)",
org.json.simple.parser, 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.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.context;version="[4.8,5)",
org.apache.commons.codec.binary, org.wso2.carbon.event.output.adapter.core;version="[5.3,6)",
org.apache.http.client.entity, org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)",
org.apache.http.message, org.wso2.carbon.user.api;version="[1.0,2)"
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
</Import-Package> </Import-Package>
<DynamicImport-Package>*</DynamicImport-Package> <DynamicImport-Package>*</DynamicImport-Package>
</instructions> </instructions>

@ -23,19 +23,15 @@ import org.osgi.service.component.ComponentContext;
import io.entgra.device.mgt.plugins.output.adapter.http.HTTPEventAdapterFactory; import io.entgra.device.mgt.plugins.output.adapter.http.HTTPEventAdapterFactory;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component component.name="output.Http.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.output.adapter.http.internal.HTTPEventAdapterServiceComponent",
* @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService" immediate = true)
* cardinality="1..1"
* policy="dynamic"
* bind="setJWTClientManagerService"
* unbind="unsetJWTClientManagerService"
*/
public class HTTPEventAdapterServiceComponent { public class HTTPEventAdapterServiceComponent {
private static final Log log = LogFactory.getLog(HTTPEventAdapterServiceComponent.class); private static final Log log = LogFactory.getLog(HTTPEventAdapterServiceComponent.class);
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
HTTPEventAdapterFactory httpEventAdaptorFactory = new HTTPEventAdapterFactory(); 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) { protected void setJWTClientManagerService(JWTClientManagerService jwtClientManagerService) {
OutputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService); OutputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService);
} }

@ -30,9 +30,14 @@
<name>WSO2 Carbon - Device Mgt Output MQTT Adaptor Module</name> <name>WSO2 Carbon - Device Mgt Output MQTT Adaptor Module</name>
<description>io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor <description>io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor
</description> </description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>commons-codec.wso2</groupId> <groupId>commons-codec.wso2</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
@ -81,16 +86,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
@ -115,34 +116,31 @@
io.entgra.device.mgt.plugins.output.adapter.mqtt.*, io.entgra.device.mgt.plugins.output.adapter.mqtt.*,
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.output.adapter.core, io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
org.wso2.carbon.event.output.adapter.core.*, 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, javax.net.ssl,
org.apache.commons.logging, org.apache.commons.logging;version="[1.2,2)",
org.apache.http, org.apache.commons.ssl;version="[3.1,4)",
org.apache.http.client, org.apache.http;version="[4.4,5)",
org.apache.http.client.methods, org.apache.http.client;version="[4.3,5)",
org.apache.http.conn.socket, org.apache.http.conn.socket;version="[4.3,5)",
org.apache.http.conn.ssl, org.apache.http.conn.ssl;version="[4.3,5)",
org.apache.http.entity, org.apache.http.impl.client;version="[4.3,5)",
org.apache.http.impl.client, org.apache.http.util;version="[4.4,5)",
org.apache.http.util, org.eclipse.paho.client.mqttv3;version="[1.0,2)",
org.eclipse.paho.client.mqttv3, org.eclipse.paho.client.mqttv3.persist;version="[1.0,2)",
org.eclipse.paho.client.mqttv3.persist,
org.json.simple,
org.json.simple.parser,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.apache.commons.codec.binary, org.wso2.carbon.context;version="[4.8,5)",
org.apache.http.client.entity, org.wso2.carbon.event.output.adapter.core;version="[5.3,6)",
org.apache.http.message, org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)",
org.apache.commons.ssl, org.wso2.carbon.user.api;version="[1.0,2)"
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)"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -23,15 +23,11 @@ import org.osgi.service.component.ComponentContext;
import io.entgra.device.mgt.plugins.output.adapter.mqtt.MQTTEventAdapterFactory; import io.entgra.device.mgt.plugins.output.adapter.mqtt.MQTTEventAdapterFactory;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component component.name="output.Mqtt.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.MQTTEventAdapterServiceComponent",
* @scr.reference name="jwt.client.service" interface="io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService" immediate = true)
* cardinality="1..1"
* policy="dynamic"
* bind="setJWTClientManagerService"
* unbind="unsetJWTClientManagerService"
*/
public class MQTTEventAdapterServiceComponent { public class MQTTEventAdapterServiceComponent {
private static final Log log = LogFactory.getLog(MQTTEventAdapterServiceComponent.class); 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. * Deployment of the MQTT event adapter service will be done.
* @param context bundle context where service is registered * @param context bundle context where service is registered
*/ */
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
OutputEventAdapterFactory mqttEventAdapterFactory = new MQTTEventAdapterFactory(); 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) { protected void setJWTClientManagerService(JWTClientManagerService jwtClientManagerService) {
OutputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService); OutputAdapterServiceDataHolder.setJwtClientManagerService(jwtClientManagerService);
} }

@ -30,9 +30,14 @@
<artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</artifactId> <artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>WSO2 - Webapp for UI Output Event Adapter</name> <name>WSO2 - Webapp for UI Output Event Adapter</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

@ -32,9 +32,14 @@
<description>org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of <description>org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of
ui event adapter ui event adapter
</description> </description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
@ -104,16 +109,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -137,45 +138,45 @@
io.entgra.device.mgt.plugins.output.adapter.websocket.* io.entgra.device.mgt.plugins.output.adapter.websocket.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.output.adapter.core.*, feign;version="[11.0,12)",
javax.xml, feign.auth;version="[11.0,12)",
javax.xml.namespace; version=0.0.0, feign.codec;version="[11.0,12)",
org.apache.axis2, feign.gson;version="[11.0,12)",
org.apache.axis2.client, feign.slf4j;version="[11.0,12)",
org.apache.axis2.context, io.entgra.device.mgt.plugins.output.adapter.websocket.authentication,
org.apache.axis2.transport.http, io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth,
org.apache.commons.httpclient, io.entgra.device.mgt.plugins.output.adapter.websocket.authentication.oauth.exception,
org.apache.commons.httpclient.contrib.ssl, io.entgra.device.mgt.plugins.output.adapter.websocket.service,
org.apache.commons.httpclient.params, io.entgra.device.mgt.plugins.output.adapter.websocket.util,
org.apache.commons.httpclient.protocol, javax.net.ssl,
org.apache.commons.pool, javax.websocket;version="[1.1,2)",
org.apache.commons.pool.impl, org.apache.axis2;version="[1.6,2)",
org.apache.log4j, org.apache.axis2.client;version="[1.6,2)",
com.google.gson, org.apache.axis2.context;version="[1.6,2)",
javax.websocket, org.apache.axis2.transport.http;version="[1.6,2)",
org.apache.commons.logging, 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.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.base;version="[1.0,2)",
org.wso2.carbon.databridge.commons, org.wso2.carbon.context;version="[4.8,5)",
org.wso2.carbon.event.stream.core, org.wso2.carbon.databridge.commons;version="[5.3,6)",
org.wso2.carbon.event.stream.core.exception, org.wso2.carbon.event.output.adapter.core;version="[5.3,6)",
org.wso2.carbon.utils, org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)",
javax.xml.bind, org.wso2.carbon.event.stream.core;version="[5.3,6)",
javax.xml.bind.annotation, org.wso2.carbon.event.stream.core.exception;version="[5.3,6)",
javax.xml.parsers; version=0.0.0, org.wso2.carbon.identity.oauth2.stub;version="[6.9,7)",
org.w3c.dom, org.wso2.carbon.identity.oauth2.stub.dto;version="[6.9,7)",
org.wso2.carbon.identity.oauth2.stub, org.wso2.carbon.registry.core.service;version="[1.0,2)",
org.wso2.carbon.identity.oauth2.stub.dto, org.wso2.carbon.user.api;version="[1.0,2)",
org.wso2.carbon.user.api, org.wso2.carbon.utils.multitenancy;version="[4.8,5)"
org.wso2.carbon.utils.multitenancy,
feign,
feign.auth,
feign.codec,
feign.gson,
javax.cache,
javax.net.ssl,
feign.slf4j
</Import-Package> </Import-Package>
<DynamicImport-Package>*</DynamicImport-Package> <DynamicImport-Package>*</DynamicImport-Package>
<Embed-Dependency> <Embed-Dependency>

@ -27,19 +27,11 @@ import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerService; import io.entgra.device.mgt.plugins.output.adapter.websocket.WebsocketOutputCallbackControllerService;
import org.wso2.carbon.event.stream.core.EventStreamService; import org.wso2.carbon.event.stream.core.EventStreamService;
import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.RegistryService;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component component.name="output.extensions.secured.websocket.AdapterService.component" immediate="true" name = "io.entgra.device.mgt.plugins.output.adapter.mqtt.internal.MQTTEventAdapterServiceComponent",
* @scr.reference name="eventStreamService.service" immediate = true)
* 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"
*/
public class WebsocketLocalEventAdapterServiceComponent { public class WebsocketLocalEventAdapterServiceComponent {
private static final Log log = LogFactory.getLog(WebsocketLocalEventAdapterServiceComponent.class); private static final Log log = LogFactory.getLog(WebsocketLocalEventAdapterServiceComponent.class);
@ -49,6 +41,7 @@ public class WebsocketLocalEventAdapterServiceComponent {
* *
* @param context * @param context
*/ */
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { 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) { protected void setEventStreamService(EventStreamService eventStreamService) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Setting the EventStreamService reference for the UILocalEventAdaptor Service"); log.debug("Setting the EventStreamService reference for the UILocalEventAdaptor Service");
@ -93,6 +92,12 @@ public class WebsocketLocalEventAdapterServiceComponent {
* *
* @param registryService An instance of RegistryService * @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) { protected void setRegistryService(RegistryService registryService) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Setting Registry Service"); log.debug("Setting Registry Service");

@ -31,9 +31,14 @@
<name>WSO2 Carbon - Device Mgt Output XMPP Adaptor Module</name> <name>WSO2 Carbon - Device Mgt Output XMPP Adaptor Module</name>
<description>io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor <description>io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor
</description> </description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
@ -58,16 +63,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<!-- <executions>--> <configuration>
<!-- <execution>--> <source>1.8</source>
<!-- <id>generate-scr-descriptor</id>--> <target>1.8</target>
<!-- <goals>--> </configuration>
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
@ -92,13 +93,16 @@
io.entgra.device.mgt.plugins.output.adapter.xmpp.*, io.entgra.device.mgt.plugins.output.adapter.xmpp.*,
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.wso2.carbon.event.output.adapter.core, io.entgra.device.mgt.plugins.output.adapter.xmpp,
org.wso2.carbon.event.output.adapter.core.*, io.entgra.device.mgt.plugins.output.adapter.xmpp.util,
org.jivesoftware.smack.*, org.apache.commons.logging;version="[1.2,2)",
org.apache.commons.logging, org.jivesoftware.smack,
org.jivesoftware.smack.packet,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
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)"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -22,11 +22,11 @@ import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import io.entgra.device.mgt.plugins.output.adapter.xmpp.XMPPEventAdapterFactory; import io.entgra.device.mgt.plugins.output.adapter.xmpp.XMPPEventAdapterFactory;
import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterFactory;
import org.osgi.service.component.annotations.*;
@Component(
/** name = "io.entgra.device.mgt.plugins.output.adapter.xmpp.internal.XMPPEventAdapterServiceComponent",
* @scr.component component.name="output.XMPP.AdapterService.component" immediate="true" immediate = true)
*/
public class XMPPEventAdapterServiceComponent { public class XMPPEventAdapterServiceComponent {
private static final Log log = LogFactory.getLog(XMPPEventAdapterServiceComponent.class); 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. * Deployment of the XMPP event adapter service will be done.
* @param context bundle context where service is registered * @param context bundle context where service is registered
*/ */
@Activate
protected void activate(ComponentContext context) { protected void activate(ComponentContext context) {
try { try {
OutputEventAdapterFactory xmppEventAdapterFactory = new XMPPEventAdapterFactory(); OutputEventAdapterFactory xmppEventAdapterFactory = new XMPPEventAdapterFactory();

@ -30,7 +30,7 @@
<artifactId>cdmf-transport-adapters</artifactId> <artifactId>cdmf-transport-adapters</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Base Plugin</name> <name>WSO2 Carbon - IoT Base Plugin</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>input/io.entgra.device.mgt.plugins.input.adapter.extension</module> <module>input/io.entgra.device.mgt.plugins.input.adapter.extension</module>
@ -45,23 +45,4 @@
<module>output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</module> <module>output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -31,6 +31,11 @@
<name>EMQX Extensions - Extension Hook Initializer</name> <name>EMQX Extensions - Extension Hook Initializer</name>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId> <artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
@ -59,22 +64,10 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>${wso2.maven.compiler.source}</source> <source>1.8</source>
<target>${wso2.maven.compiler.target}</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
</plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -88,11 +81,11 @@
<Private-Package>io.entgra.device.mgt.plugins.emqx.initializer.internal</Private-Package> <Private-Package>io.entgra.device.mgt.plugins.emqx.initializer.internal</Private-Package>
<Import-Package> <Import-Package>
io.entgra.device.mgt.plugins.emqx.exhook, io.entgra.device.mgt.plugins.emqx.exhook,
io.entgra.device.mgt.plugins.emqx.initializer;resolution:=optional, io.entgra.device.mgt.plugins.emqx.initializer,
org.apache.commons.logging, org.apache.commons.logging;version="[1.2 ,2)",
org.wso2.carbon.core,
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.core;version="[4.8,5)"
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
!io.entgra.device.mgt.plugins.emqx.initializer.internal, !io.entgra.device.mgt.plugins.emqx.initializer.internal,

@ -24,14 +24,15 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.core.ServerShutdownHandler; import org.wso2.carbon.core.ServerShutdownHandler;
import org.wso2.carbon.core.ServerStartupObserver; import org.wso2.carbon.core.ServerStartupObserver;
import org.osgi.service.component.annotations.*;
/** @Component(
* @scr.component name="io.entgra.device.mgt.plugins.emqx.initializer.internal.EmqxExhookServiceComponent" name = "io.entgra.device.mgt.plugins.emqx.initializer.internal.EmqxExhookServiceComponent",
* immediate="true" immediate = true)
*/
public class EmqxExhookServiceComponent { public class EmqxExhookServiceComponent {
private static final Log log = LogFactory.getLog(EmqxExhookServiceComponent.class); private static final Log log = LogFactory.getLog(EmqxExhookServiceComponent.class);
@Activate
protected void activate(ComponentContext ctx) { protected void activate(ComponentContext ctx) {
try { try {
@ -50,6 +51,7 @@ public class EmqxExhookServiceComponent {
} }
@Deactivate
protected void deactivate(ComponentContext ctx) { protected void deactivate(ComponentContext ctx) {
try { try {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {

@ -31,7 +31,7 @@
<packaging>war</packaging> <packaging>war</packaging>
<name>WSO2 Carbon - MQTT Topics Management API</name> <name>WSO2 Carbon - MQTT Topics Management API</name>
<description>WSO2 Carbon - MQTT Topics Management API</description> <description>WSO2 Carbon - MQTT Topics Management API</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<build> <build>
<plugins> <plugins>

@ -31,7 +31,7 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Component - MQTT - Authorization Manager</name> <name>WSO2 Carbon - Component - MQTT - Authorization Manager</name>
<description>MQTT authorization manager based on Carbon device manager</description> <description>MQTT authorization manager based on Carbon device manager</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency> <dependency>

@ -30,30 +30,11 @@
<artifactId>mb-extensions</artifactId> <artifactId>mb-extensions</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - MB Extension</name> <name>WSO2 Carbon - MB Extension</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</module> <module>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</module>
<module>org.wso2.carbon.andes.extensions.device.mgt.api</module> <module>org.wso2.carbon.andes.extensions.device.mgt.api</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -30,33 +30,13 @@
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Mobile Plugins Extensions</name> <name>WSO2 Carbon - Mobile Plugins Extensions</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>cdmf-transport-adapters</module> <module>cdmf-transport-adapters</module>
<!--<module>mb-extensions</module>-->
<module>pull-notification-listeners</module> <module>pull-notification-listeners</module>
<module>emqx-extensions</module> <module>emqx-extensions</module>
<module>siddhi-extensions</module> <module>siddhi-extensions</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>${maven.scr.version}</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -32,9 +32,14 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - MQTT Pull Notification Listener Implementation</name> <name>WSO2 Carbon - MQTT Pull Notification Listener Implementation</name>
<description>WSO2 Carbon - MQTT Pull Notification Lister Implementation</description> <description>WSO2 Carbon - MQTT Pull Notification Lister Implementation</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
@ -47,14 +52,6 @@
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.input.adapter.extension</artifactId> <artifactId>io.entgra.device.mgt.plugins.input.adapter.extension</artifactId>
@ -68,8 +65,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
@ -86,21 +87,23 @@
io.entgra.device.mgt.plugins.mqtt.notification.listener.* io.entgra.device.mgt.plugins.mqtt.notification.listener.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
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.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.apache.commons.logging, org.wso2.carbon.context;version="[4.8,5)",
io.entgra.device.mgt.core.device.mgt.common.*, org.wso2.carbon.core;version="[4.8,5)",
io.entgra.device.mgt.core.device.mgt.core.service, org.wso2.carbon.event.input.adapter.core;version="[5.3,6)",
com.google.gson, org.wso2.carbon.event.input.adapter.core.exception;version="[5.3,6)",
org.wso2.carbon.context, org.wso2.carbon.user.api;version="[1.0,2)"
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
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -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 io.entgra.device.mgt.plugins.mqtt.notification.listener.PullNotificationStartupListener;
import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService; import org.wso2.carbon.event.input.adapter.core.InputEventAdapterService;
/** import org.osgi.service.component.annotations.*;
* @scr.component name="io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.PullNotificationListenerServiceComponent" immediate="true"
* @scr.reference name="carbon.device.mgt.provider" @Component(
* interface="io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService" name = "io.entgra.device.mgt.plugins.mqtt.notification.listener.internal.PullNotificationListenerServiceComponent",
* cardinality="1..1" immediate = true)
* 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"
*/
public class PullNotificationListenerServiceComponent { public class PullNotificationListenerServiceComponent {
private static final Log log = LogFactory.getLog(PullNotificationListenerServiceComponent.class); private static final Log log = LogFactory.getLog(PullNotificationListenerServiceComponent.class);
@Activate
@SuppressWarnings("unused") @SuppressWarnings("unused")
protected void activate(ComponentContext componentContext) { protected void activate(ComponentContext componentContext) {
try { try {
@ -69,6 +60,12 @@ public class PullNotificationListenerServiceComponent {
//Do nothing //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) { protected void setDeviceManagementProviderService(DeviceManagementProviderService deviceManagementProviderService) {
MqttNotificationDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService); MqttNotificationDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
} }
@ -77,6 +74,12 @@ public class PullNotificationListenerServiceComponent {
MqttNotificationDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService); 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) { protected void setInputEventAdapterService(InputEventAdapterService inputEventAdapterService) {
MqttNotificationDataHolder.getInstance().setInputEventAdapterService(inputEventAdapterService); MqttNotificationDataHolder.getInstance().setInputEventAdapterService(inputEventAdapterService);
} }

@ -30,29 +30,9 @@
<artifactId>pull-notification-listeners</artifactId> <artifactId>pull-notification-listeners</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Pull Notification Extension</name> <name>WSO2 Carbon - Pull Notification Extension</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.mqtt.notification.listener</module> <module>io.entgra.device.mgt.plugins.mqtt.notification.listener</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -28,13 +28,18 @@
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId> <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Siddhi Execution Extension - Device management Core functionality as Siddhi extension</name> <name>WSO2 Siddhi Execution Extension - Device management Core functionality as Siddhi extension</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<properties> <properties>
<skipTests>true</skipTests> <skipTests>true</skipTests>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
@ -148,8 +153,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>${wso2.maven.compiler.source}</source> <source>1.8</source>
<target>${wso2.maven.compiler.target}</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -165,35 +170,71 @@
io.entgra.device.mgt.plugins.extension.siddhi.device.* io.entgra.device.mgt.plugins.extension.siddhi.device.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
feign, <!-- android.net.http,-->
feign.codec, <!-- android.net.ssl,-->
feign.auth, <!-- android.os,-->
feign.gson, <!-- android.security,-->
feign.slf4j, <!-- android.util,-->
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.net.ssl,
javax.xml, javax.security.auth.x500,javax.xml.bind;version="[0.0,1)",
javax.xml.bind, javax.xml.bind.annotation;version="[0.0,1)",
javax.xml.bind.annotation, javax.xml.parsers,
javax.xml.parsers;resolution:=optional, <!-- kotlin;resolution:=optional,-->
org.apache.commons.lang, <!-- kotlin.*;resolution:=optional,-->
<!-- kotlin,-->
<!-- kotlin.annotation,-->
<!-- kotlin.collections,-->
<!-- kotlin.comparisons,-->
<!-- kotlin.io,-->
<!-- kotlin.jvm,-->
<!-- kotlin.jvm.functions,-->
<!-- kotlin.jvm.internal,-->
<!-- kotlin.jvm.internal.markers,-->
<!-- kotlin.ranges,-->
<!-- kotlin.reflect,-->
<!-- kotlin.sequences,-->
<!-- kotlin.text,-->
org.apache.commons.lang;version="[2.6,3)",
org.apache.commons.logging;version="[1.2,2)",
<!-- org.bouncycastle.jsse;version="[1.70,2)",-->
<!-- org.bouncycastle.jsse.provider;version="[1.70,2)",-->
<!-- org.conscrypt,-->
org.json;version="[3.0,4)",
<!-- org.openjsse.javax.net.ssl,-->
<!-- org.openjsse.net.ssl,-->
org.w3c.dom, org.w3c.dom,
org.wso2.carbon.base, org.wso2.carbon.base;version="[1.0,2)",
org.wso2.carbon.utils, org.wso2.carbon.context;version="[4.8,5)",
org.wso2.carbon.user.api, org.wso2.carbon.user.api;version="[1.0,2)",
org.json;version="${orbit.version.json.range}", org.wso2.carbon.utils;version="[4.8,5)",
org.wso2.siddhi.core.*, org.wso2.siddhi.core.config;version="[3.2,4)",
org.wso2.siddhi.query.api.*, org.wso2.siddhi.core.exception;version="[3.2,4)",
io.entgra.device.mgt.core.device.mgt.core.*, org.wso2.siddhi.core.executor;version="[3.2,4)",
io.entgra.device.mgt.core.device.mgt.common.*, org.wso2.siddhi.core.executor.function;version="[3.2,4)",
io.entgra.device.mgt.core.identity.jwt.client.*, org.wso2.siddhi.core.query.processor.stream.function;version="[3.2,4)",
org.apache.commons.logging, org.wso2.siddhi.query.api.definition;version="[3.2,4)",
org.wso2.carbon.context, org.wso2.siddhi.query.api.exception;version="[3.2,4)"
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
</Import-Package> </Import-Package>
<Embed-Dependency> <Embed-Dependency>
jsr311-api, jsr311-api,

@ -28,9 +28,14 @@
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</artifactId> <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Siddhi Execution Extension - Json</name> <name>WSO2 Siddhi Execution Extension - Json</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.siddhi</groupId> <groupId>org.wso2.siddhi</groupId>
<artifactId>siddhi-core</artifactId> <artifactId>siddhi-core</artifactId>
@ -60,8 +65,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>${wso2.maven.compiler.source}</source> <source>1.8</source>
<target>${wso2.maven.compiler.target}</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -77,9 +82,13 @@
io.entgra.device.mgt.plugins.extension.siddhi.execution.json.* io.entgra.device.mgt.plugins.extension.siddhi.execution.json.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.json;version="${orbit.version.json.range}", org.json;version="[3.0,4)",
org.wso2.siddhi.core.*, org.wso2.siddhi.core.config;version="[3.2,4)",
org.wso2.siddhi.query.api.*, 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)"
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

@ -30,30 +30,11 @@
<artifactId>siddhi-extensions</artifactId> <artifactId>siddhi-extensions</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Siddhi Extension</name> <name>WSO2 Carbon - Siddhi Extension</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.extension.siddhi.device</module> <module>io.entgra.device.mgt.plugins.extension.siddhi.device</module>
<module>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</module> <module>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -31,7 +31,7 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Mobile Device Management Android Impl</name> <name>WSO2 Carbon - Mobile Device Management Android Impl</name>
<description>WSO2 Carbon - Mobile Device Management Android Implementation</description> <description>WSO2 Carbon - Mobile Device Management Android Implementation</description>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<build> <build>
<plugins> <plugins>

@ -30,7 +30,7 @@
<artifactId>android-plugin</artifactId> <artifactId>android-plugin</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Mobile Plugins</name> <name>WSO2 Carbon - Mobile Plugins</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.mobile.android</module> <module>io.entgra.device.mgt.plugins.mobile.android</module>

@ -30,29 +30,10 @@
<artifactId>mobile-plugins</artifactId> <artifactId>mobile-plugins</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Mobile Plugins</name> <name>WSO2 Carbon - Mobile Plugins</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>android-plugin</module> <module>android-plugin</module>
</modules> </modules>
<!-- <build>-->
<!-- <pluginManagement>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </pluginManagement>-->
<!-- </build>-->
</project> </project>

@ -31,63 +31,11 @@
<artifactId>io.entgra.device.mgt.plugins.analytics.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.analytics.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Server Analytics Feature</name> <name>WSO2 Carbon - IoT Server Analytics Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the Analytics Script for the IoT Server</description> <description>This feature contains the Analytics Script for the IoT Server</description>
<build> <build>
<plugins> <plugins>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-dependency-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>unpack</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>unpack</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <artifactItems>-->
<!-- <artifactItem>-->
<!-- <groupId>io.entgra.device.mgt.plugins</groupId>-->
<!-- <artifactId>io.entgra.device.mgt.plugins.iot.analytics</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <type>zip</type>-->
<!-- <overWrite>true</overWrite>-->
<!-- <outputDirectory>-->
<!-- ${project.build.directory}/maven-shared-archive-resources/carbonapps-->
<!-- </outputDirectory>-->
<!-- <includes>**/*</includes>-->
<!-- </artifactItem>-->
<!-- </artifactItems>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <artifactId>maven-resources-plugin</artifactId>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>copy-resources</id>-->
<!-- <phase>generate-resources</phase>-->
<!-- <goals>-->
<!-- <goal>copy-resources</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <outputDirectory>src/main/resources</outputDirectory>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>resources</directory>-->
<!-- <includes>-->
<!-- <include>build.properties</include>-->
<!-- <include>p2.inf</include>-->
<!-- </includes>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin> <plugin>
<groupId>org.wso2.maven</groupId> <groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId> <artifactId>carbon-p2-plugin</artifactId>

@ -31,7 +31,7 @@
<artifactId>org.wso2.carbon.iot.geo.dashboard.feature</artifactId> <artifactId>org.wso2.carbon.iot.geo.dashboard.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Geo Dashboard Feature</name> <name>WSO2 Carbon - IoT Geo Dashboard Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the IoT geo dashboard gadget</description> <description>This feature contains the IoT geo dashboard gadget</description>
<dependencies> <dependencies>

@ -30,7 +30,7 @@
<artifactId>analytics-feature</artifactId> <artifactId>analytics-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Server IoT Analytics Feature</name> <name>WSO2 Carbon - IoT Server IoT Analytics Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.analytics.feature</module> <module>io.entgra.device.mgt.plugins.analytics.feature</module>

@ -30,7 +30,7 @@
<artifactId>device-types-feature</artifactId> <artifactId>device-types-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management IoT Plugins Feature</name> <name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>virtual-fire-alarm-plugin-feature</module> <module>virtual-fire-alarm-plugin-feature</module>

@ -31,14 +31,10 @@
<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Server VirtualFireAlarm Backend Feature</name> <name>WSO2 Carbon - IoT Server VirtualFireAlarm Backend Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the VirtualFireAlarm Device type specific backend implementations for the IoT Server <description>This feature contains the VirtualFireAlarm Device type specific backend implementations for the IoT Server
</description> </description>
<!-- <properties>-->
<!-- <orbit.h2.version>1.4.199.wso2v1</orbit.h2.version>-->
<!-- </properties>-->
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>

@ -30,7 +30,7 @@
<artifactId>virtual-fire-alarm-plugin-feature</artifactId> <artifactId>virtual-fire-alarm-plugin-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature</name> <name>WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature</module> <module>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature</module>

@ -31,7 +31,7 @@
<artifactId>io.entgra.device.mgt.plugins.adapter.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.adapter.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Adapters Feature</name> <name>WSO2 Carbon - Device Management Adapters Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the adapter bundles required for IoT Server</description> <description>This feature contains the adapter bundles required for IoT Server</description>
<dependencies> <dependencies>

@ -27,7 +27,7 @@
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Siddhi Execution Extension - Device Group Feature</name> <name>WSO2 Siddhi Execution Extension - Device Group Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains Siddhi extension feature for device groups</description> <description>This feature contains Siddhi extension feature for device groups</description>
<dependencies> <dependencies>

@ -27,7 +27,7 @@
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Siddhi Execution Extension - Json Feature</name> <name>WSO2 Siddhi Execution Extension - Json Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description> <description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description>
<dependencies> <dependencies>

@ -11,7 +11,7 @@
<artifactId>io.entgra.device.mgt.plugins.notification.listener.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.notification.listener.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Notification Listener</name> <name>WSO2 Carbon - Notification Listener</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the core bundles required iot core listeners</description> <description>This feature contains the core bundles required iot core listeners</description>
<dependencies> <dependencies>

@ -31,7 +31,7 @@
<artifactId>org.wso2.carbon.andes.extensions.device.mgt.api.feature</artifactId> <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - MQTT Topics Management API Feature</name> <name>WSO2 Carbon - MQTT Topics Management API Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the API feature for the MQTT dashboard</description> <description>This feature contains the API feature for the MQTT dashboard</description>
<build> <build>

@ -31,7 +31,7 @@
<artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature</artifactId> <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - MQTT Authorization Feature</name> <name>WSO2 Carbon - MQTT Authorization Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the bundles required for mqtt authorization</description> <description>This feature contains the bundles required for mqtt authorization</description>
<dependencies> <dependencies>

@ -30,7 +30,7 @@
<artifactId>extensions-feature</artifactId> <artifactId>extensions-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Extensions</name> <name>WSO2 Carbon - Device Management Extensions</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.adapter.feature</module> <module>io.entgra.device.mgt.plugins.adapter.feature</module>

@ -30,7 +30,7 @@
<artifactId>io.entgra.device.mgt.plugins.mobile.android.feature</artifactId> <artifactId>io.entgra.device.mgt.plugins.mobile.android.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Android Device Management Feature</name> <name>WSO2 Carbon - Android Device Management Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>This feature contains the core bundles required for Android Device Management <description>This feature contains the core bundles required for Android Device Management
functionality functionality
</description> </description>

@ -30,7 +30,7 @@
<artifactId>android-plugin-feature</artifactId> <artifactId>android-plugin-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Android Plugin Feature</name> <name>WSO2 Carbon - Device Management Android Plugin Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.device.mgt.plugins.mobile.android.feature</module> <module>io.entgra.device.mgt.plugins.mobile.android.feature</module>

@ -30,7 +30,7 @@
<artifactId>mobile-plugins-feature</artifactId> <artifactId>mobile-plugins-feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management EMM Plugins Feature</name> <name>WSO2 Carbon - Device Management EMM Plugins Feature</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>android-plugin-feature</module> <module>android-plugin-feature</module>

@ -25,7 +25,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<version>6.0.17-SNAPSHOT</version> <version>6.0.17-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Plugins Parent</name> <name>WSO2 Carbon - Device Management Plugins Parent</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<description>WSO2 Carbon - Device Management Plugins Parent</description> <description>WSO2 Carbon - Device Management Plugins Parent</description>
<parent> <parent>
@ -305,17 +305,7 @@
<artifactId>org.wso2.carbon.databridge.commons</artifactId> <artifactId>org.wso2.carbon.databridge.commons</artifactId>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.analytics-common</groupId>-->
<!-- <artifactId>org.wso2.carbon.databridge.agent</artifactId>-->
<!-- <version>${carbon.analytics.common.version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>commons-codec.wso2</groupId>-->
<!-- <artifactId>commons-codec</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
@ -475,16 +465,6 @@
</dependency> </dependency>
<!--Osgi dependencies--> <!--Osgi dependencies-->
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${eclipse.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>${eclipse.equinox.common.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
@ -504,11 +484,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${eclipse.equinox.services.version}</version>
</dependency>
<!--Orbit dependencies--> <!--Orbit dependencies-->
<dependency> <dependency>
@ -534,62 +509,6 @@
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.governance</groupId>-->
<!-- <artifactId>org.wso2.carbon.governance.api</artifactId>-->
<!-- <version>${carbon.governance.version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.apache.juddi.wso2</groupId>-->
<!-- <artifactId>juddi</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.wso2.carbon.registry</groupId>-->
<!-- <artifactId>org.wso2.carbon.registry.common</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.wso2.carbon</groupId>-->
<!-- <artifactId>org.wso2.carbon.registry.core</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.wso2.carbon.registry</groupId>-->
<!-- <artifactId>org.wso2.carbon.registry.admin.api</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.wso2.carbon.registry</groupId>-->
<!-- <artifactId>org.wso2.carbon.registry.indexing</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.ibm.icu</groupId>-->
<!-- <artifactId>icu4j</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.eclipse.equinox</groupId>-->
<!-- <artifactId>org.eclipse.equinox.registry</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>eclipse</groupId>-->
<!-- <artifactId>validateutility</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.apache.ws.commons.axiom</groupId>-->
<!-- <artifactId>axiom-api</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.apache.ws.commons.axiom</groupId>-->
<!-- <artifactId>axiom-impl</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.wso2.carbon.registry</groupId>-->
<!-- <artifactId>org.wso2.carbon.registry.extensions</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>javax.servlet</groupId>-->
<!-- <artifactId>servlet-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId> <artifactId>org.wso2.carbon.registry.core</artifactId>
@ -663,11 +582,6 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${google.gson.version}</version> <version>${google.gson.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>com.google.android.gcm</groupId>-->
<!-- <artifactId>gcm-server</artifactId>-->
<!-- <version>${gcm.server.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.json.wso2</groupId> <groupId>org.json.wso2</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
@ -737,7 +651,6 @@
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId> <artifactId>jsr311-api</artifactId>
<version>${javax.ws.rs.version}</version> <version>${javax.ws.rs.version}</version>
<!--<scope>provided</scope>-->
</dependency> </dependency>
<dependency> <dependency>
@ -765,58 +678,6 @@
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>-->
<!-- <artifactId>jackson-annotations</artifactId>-->
<!-- <version>${jackson-annotations.version}</version>-->
<!-- </dependency>-->
<!--Windows Jax-RS dependencies-->
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-rt-bindings-soap</artifactId>-->
<!-- <version>${cxf.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-rt-bindings-http</artifactId>-->
<!-- <version>${cxf.bindings.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.ws.security</groupId>-->
<!-- <artifactId>wss4j</artifactId>-->
<!-- <version>${wss4j.security.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-rt-rs-extension-providers</artifactId>-->
<!-- <version>${cxf.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.cxf</groupId>-->
<!-- <artifactId>cxf-rt-ws-security</artifactId>-->
<!-- <version>${cxf.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.wss4j</groupId>-->
<!-- <artifactId>wss4j-ws-security-common</artifactId>-->
<!-- <version>${wss4j.security.common.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.ws.commons.axiom.wso2</groupId>-->
<!-- <artifactId>axiom</artifactId>-->
<!-- <version>${axiom-api.version}</version>-->
<!-- </dependency>-->
<!--dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>${axiom-api.version}</version>
</dependency-->
<!-- <dependency>-->
<!-- <groupId>commons-io</groupId>-->
<!-- <artifactId>commons-io</artifactId>-->
<!-- <version>${commons-io.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>commons-io.wso2</groupId> <groupId>commons-io.wso2</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
@ -832,36 +693,6 @@
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${spring-web.version}</version> <version>${spring-web.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.ws</groupId>-->
<!-- <artifactId>spring-ws-security</artifactId>-->
<!-- <version>${spring-ws-security.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework</groupId>-->
<!-- <artifactId>spring-context</artifactId>-->
<!-- <version>${spring-web.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.sun.xml.ws</groupId>-->
<!-- <artifactId>jaxws-rt</artifactId>-->
<!-- <version>${jaxws-rt.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.sun.xml.messaging.saaj</groupId>-->
<!-- <artifactId>saaj-impl</artifactId>-->
<!-- <version>${saaj-impl.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.wso2.orbit.org.bouncycastle</groupId>-->
<!-- <artifactId>bcpkix-jdk15on</artifactId>-->
<!-- <version>${bcpkix-jdk15on.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.wso2.orbit.org.bouncycastle</groupId>-->
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
<!-- <version>${bcprov-jdk15on.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.bouncycastle.wso2</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
@ -892,64 +723,17 @@
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.codehaus.plexus</groupId>-->
<!-- <artifactId>plexus-utils</artifactId>-->
<!-- <version>${plexus-utils.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.madgag.spongycastle</groupId>-->
<!-- <artifactId>pkix</artifactId>-->
<!-- <version>${spongycastle.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.madgag.spongycastle</groupId>-->
<!-- <artifactId>prov</artifactId>-->
<!-- <version>${spongycastle.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.madgag.spongycastle</groupId>-->
<!-- <artifactId>core</artifactId>-->
<!-- <version>${spongycastle.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>joda-time</groupId>-->
<!-- <artifactId>joda-time</artifactId>-->
<!-- <version>${joda-time.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>org.apache.felix.scr</artifactId>-->
<!-- <version>${apache-felix.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.googlecode.json-simple.wso2</groupId> <groupId>com.googlecode.json-simple.wso2</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>
<version>${json-simple.version}</version> <version>${json-simple.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>com.googlecode.plist</groupId>-->
<!-- <artifactId>dd-plist</artifactId>-->
<!-- <version>${googlecode.plist.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
<version>${identity.inbound.auth.oauth.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>-->
<!-- <artifactId>org.wso2.carbon.identity.oauth</artifactId>-->
<!-- <version>${identity.inbound.auth.oauth.version}</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.identity.carbon.auth.jwt</groupId>-->
<!-- <artifactId>org.wso2.carbon.identity.authenticator.signedjwt</artifactId>-->
<!-- <version>${identity.carbon.auth.jwt.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.httpcomponents.wso2</groupId> <groupId>org.apache.httpcomponents.wso2</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
@ -975,11 +759,6 @@
<artifactId>commons-configuration</artifactId> <artifactId>commons-configuration</artifactId>
<version>${commons-configuration.version}</version> <version>${commons-configuration.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.commons</groupId>-->
<!-- <artifactId>org.wso2.carbon.user.mgt</artifactId>-->
<!-- <version>${carbon.commons.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.jayway.jsonpath</groupId> <groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId> <artifactId>json-path</artifactId>
@ -1017,22 +796,6 @@
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version> <version>${hibernate-validator.version}</version>
</dependency> </dependency>
<!--MB feature -->
<!-- <dependency>-->
<!-- <groupId>org.wso2.andes.wso2</groupId>-->
<!-- <artifactId>andes</artifactId>-->
<!-- <version>${andes.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.entgra.device.mgt.plugins</groupId>-->
<!-- <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>-->
<!-- <version>${io.entgra.device.mgt.plugins.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.entgra.device.mgt.plugins</groupId>-->
<!-- <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId>-->
<!-- <version>${io.entgra.device.mgt.plugins.version}</version>-->
<!-- </dependency>-->
<!--EMQX Extensions --> <!--EMQX Extensions -->
<dependency> <dependency>
@ -1076,11 +839,6 @@
<artifactId>feign-slf4j</artifactId> <artifactId>feign-slf4j</artifactId>
<version>${io.github.openfeign.version}</version> <version>${io.github.openfeign.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.wso2.carbon.messaging</groupId>-->
<!-- <artifactId>org.wso2.carbon.andes.mqtt.stub</artifactId>-->
<!-- <version>${carbon.andes.mqtt.version}</version>-->
<!-- </dependency>-->
<!-- dependencies for siddhi extension --> <!-- dependencies for siddhi extension -->
<dependency> <dependency>
@ -1150,11 +908,6 @@
<type>apk</type> <type>apk</type>
<version>${android.agent.version}</version> <version>${android.agent.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>com.google.apis</groupId>-->
<!-- <artifactId>google-api-services-androidenterprise</artifactId>-->
<!-- <version>v1-rev214-1.25.0</version>-->
<!-- </dependency>-->
<!--Dependencies for EMQX--> <!--Dependencies for EMQX-->
<dependency> <dependency>
@ -1215,33 +968,18 @@
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.8.1</carbon.kernel.version> <carbon.kernel.version>4.8.1</carbon.kernel.version>
<!-- <carbon.kernel.version.range>[4.5.0, 5.0.0)</carbon.kernel.version.range>-->
<!-- <carbon.logging.version>4.4.9</carbon.logging.version>-->
<pax.logging.api.version>1.11.2</pax.logging.api.version> <pax.logging.api.version>1.11.2</pax.logging.api.version>
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version> <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<!-- Axis2 --> <!-- Axis2 -->
<!-- <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>-->
<axis2.orbit.version>1.6.1-wso2v85</axis2.orbit.version> <axis2.orbit.version>1.6.1-wso2v85</axis2.orbit.version>
<!-- <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>-->
<!--Maven build number plugin-->
<!-- <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>-->
<!--Testing --> <!--Testing -->
<junit.version>4.13.1</junit.version> <junit.version>4.13.1</junit.version>
<!-- <test.framework.version>4.3.1</test.framework.version>-->
<testng.version>7.4.0</testng.version> <testng.version>7.4.0</testng.version>
<!--Eclipse Osgi-->
<eclipse.equinox.common.version>3.6.200.v20130402-1505</eclipse.equinox.common.version>
<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<eclipse.equinox.services.version>3.3.100.v20120522-1822</eclipse.equinox.services.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.version>2.1.210.wso2v1</orbit.h2.version> <orbit.h2.version>2.1.210.wso2v1</orbit.h2.version>
<!-- <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>-->
<!-- <orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version>-->
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<!-- CXF version --> <!-- CXF version -->
@ -1254,26 +992,8 @@
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.9.2</carbon.commons.version> <carbon.commons.version>4.9.2</carbon.commons.version>
<!-- Carbon Deployment -->
<!-- <carbon.deployment.version>4.7.15</carbon.deployment.version>-->
<!-- Carbon Identity --> <!-- Carbon Identity -->
<!-- <carbon.identity.framework.version>5.24.8</carbon.identity.framework.version>-->
<identity.inbound.auth.oauth.version>6.9.6</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>6.9.6</identity.inbound.auth.oauth.version>
<!-- <carbon.identity.version.range>[5.2.0, 7.0.0)</carbon.identity.version.range>-->
<!-- <identity.carbon.auth.jwt.version>5.1.5</identity.carbon.auth.jwt.version>-->
<!-- Carbon Multi-tenancy -->
<!-- <carbon.multitenancy.version>4.9.20</carbon.multitenancy.version>-->
<!-- Carbon Registry -->
<!-- <carbon.registry.version>4.8.13</carbon.registry.version>-->
<!-- Carbon Governance -->
<!-- <carbon.governance.version>4.8.30</carbon.governance.version>-->
<!-- Carbon API Management -->
<!-- <carbon.api.mgt.version>9.0.174</carbon.api.mgt.version>-->
<!-- XMPP/MQTT Version --> <!-- XMPP/MQTT Version -->
<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version> <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
@ -1288,19 +1008,11 @@
<!-- Carbon Analytics --> <!-- Carbon Analytics -->
<carbon.analytics.common.version>5.3.5</carbon.analytics.common.version> <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
<!-- <carbon.analytics.common.version.range>[5.3.0,6.0.0)</carbon.analytics.common.version.range>-->
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<!-- <spongycastle.version>1.51.0.0</spongycastle.version>-->
<!-- <bouncycastle.version>1.49</bouncycastle.version>-->
<!-- <apache.wss4j.version>2.0.0</apache.wss4j.version>-->
<!-- <codehaus.plexus.version>3.0.21</codehaus.plexus.version>-->
<google.gson.version>2.9.1</google.gson.version> <google.gson.version>2.9.1</google.gson.version>
<!-- <gcm.server.version>1.0.2</gcm.server.version>-->
<commons-io-wso2.version>2.4.0.wso2v1</commons-io-wso2.version> <commons-io-wso2.version>2.4.0.wso2v1</commons-io-wso2.version>
<!-- <commons-io.version>2.4.0.wso2v1</commons-io.version>-->
<!-- <apache-felix.version>1.0.8</apache-felix.version>-->
<!-- <googlecode.plist.version>1.8</googlecode.plist.version>-->
<commons.lang.version>2.4</commons.lang.version> <commons.lang.version>2.4</commons.lang.version>
@ -1310,24 +1022,16 @@
<javaee-web-api.version>6.0</javaee-web-api.version> <javaee-web-api.version>6.0</javaee-web-api.version>
<!-- <axiom-api.version>1.2.11.wso2v10</axiom-api.version>-->
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<spring-web.version>5.3.23</spring-web.version> <spring-web.version>5.3.23</spring-web.version>
<!-- <spring-ws-security.version>3.0.8.RELEASE</spring-ws-security.version>-->
<!-- <jaxws-rt.version>2.2.8</jaxws-rt.version>-->
<!-- <saaj-impl.version>1.3.18</saaj-impl.version>-->
<bcpkix-jdk15on.version>1.49.0.wso2v2</bcpkix-jdk15on.version> <bcpkix-jdk15on.version>1.49.0.wso2v2</bcpkix-jdk15on.version>
<bcprov-jdk15on.version>1.49.0.wso2v2</bcprov-jdk15on.version> <bcprov-jdk15on.version>1.49.0.wso2v2</bcprov-jdk15on.version>
<jscep.version>2.0.2.wso2v2</jscep.version> <jscep.version>2.0.2.wso2v2</jscep.version>
<common-logging.version>1.2</common-logging.version> <common-logging.version>1.2</common-logging.version>
<slf4j.version>1.7.13</slf4j.version> <slf4j.version>1.7.13</slf4j.version>
<!-- <plexus-utils.version>3.0.21</plexus-utils.version>-->
<!-- <joda-time.version>2.3</joda-time.version>-->
<!-- <wss4j.security.version>1.6.17</wss4j.security.version>-->
<!-- <wss4j.security.common.version>2.0.0</wss4j.security.common.version>-->
<commons-json.version>3.0.0.wso2v1</commons-json.version> <commons-json.version>3.0.0.wso2v1</commons-json.version>
<!-- <commons-json.version.range>(3.0.0, 4.0.0]</commons-json.version.range>-->
<orbit.version.json.range>[2.0.0,4.0.0)</orbit.version.json.range> <orbit.version.json.range>[2.0.0,4.0.0)</orbit.version.json.range>
<json.path.version>0.9.1</json.path.version> <json.path.version>0.9.1</json.path.version>
<json-simple.version>1.1.wso2v1</json-simple.version> <json-simple.version>1.1.wso2v1</json-simple.version>
@ -1343,7 +1047,6 @@
<!-- Nimbus Jose--> <!-- Nimbus Jose-->
<nimbus.orbit.version>7.9.0.wso2v1</nimbus.orbit.version> <nimbus.orbit.version>7.9.0.wso2v1</nimbus.orbit.version>
<!-- <nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range>-->
<commons.pool.wso2.version>1.5.6.wso2v1</commons.pool.wso2.version> <commons.pool.wso2.version>1.5.6.wso2v1</commons.pool.wso2.version>
@ -1352,26 +1055,14 @@
<javax.websocket.version>1.1</javax.websocket.version> <javax.websocket.version>1.1</javax.websocket.version>
<javax.version>2.0.1</javax.version> <javax.version>2.0.1</javax.version>
<!-- Release plugin ID for github-->
<!-- <project.scm.id>github-scm</project.scm.id>-->
<servlet-api.version>2.5</servlet-api.version> <servlet-api.version>2.5</servlet-api.version>
<hibernate-validator.version>5.0.2.Final</hibernate-validator.version> <hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
<!-- <javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version>-->
<!-- MB Features -->
<!-- <carbon.messaging.version>3.2.34</carbon.messaging.version>-->
<!-- <andes.version>3.2.50</andes.version>-->
<!-- <jackson-annotations.version>2.9.8.wso2v1</jackson-annotations.version>-->
<!-- <carbon.andes.mqtt.version>3.2.34</carbon.andes.mqtt.version>-->
<!--Feign Version--> <!--Feign Version-->
<io.github.openfeign.version>11.0</io.github.openfeign.version> <io.github.openfeign.version>11.0</io.github.openfeign.version>
<!-- <javax.ws.rs.jsr311-api.version>[1.1.0, 2.0.0)</javax.ws.rs.jsr311-api.version>-->
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<siddhi.version>3.2.9</siddhi.version> <siddhi.version>3.2.9</siddhi.version>
<!-- <maven.scr.version>1.7.2</maven.scr.version>-->
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<!-- jacoco plugin version --> <!-- jacoco plugin version -->
@ -1468,19 +1159,6 @@
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!-- <plugin>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>maven-scr-plugin</artifactId>-->
<!-- <version>1.7.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>generate-scr-scrdescriptor</id>-->
<!-- <goals>-->
<!-- <goal>scr</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
@ -1493,20 +1171,6 @@
</instructions>--> </instructions>-->
</configuration> </configuration>
</plugin> </plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>

Loading…
Cancel
Save