pramilaniroshan
/
product-iots-community
forked from community/product-iots-community
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated components with new artifacts and group ids

Browse Source
master
Amalka Subasinghe 2 years ago
parent eccafe471c
commit 14d881bf70
12 changed files with 167 additions and 180 deletions
Show Stats Download Patch File Download Diff File

2
.gitlab-ci.yml
Unescape View File

@ -21,6 +21,6 @@ deploy:
script: script:
- mvn $MAVEN_CLI_OPTS deploy - mvn $MAVEN_CLI_OPTS deploy
only: only:
- master@entgra/community-product - master@entgra/product-iots-community
tags: tags:
- OracleJDK1.8 - OracleJDK1.8

2
README.md
Unescape View File

@ -2,7 +2,7 @@
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/> <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
[![pipeline status](https://builder.entgra.net/buildStatus/icon?job=community-product)](https://repository.entgra.net/community/community-product/commits/master) [![pipeline status](https://builder.entgra.net/buildStatus/icon?job=product-iots-community)](https://repository.entgra.net/community/product-iots-community/commits/master)
Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.

2
distribution/iot-community/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>io.entgra.community.iots</groupId> <groupId>io.entgra.community.iots</groupId>
<artifactId>io.entgra.community.iots.distribution</artifactId> <artifactId>distribution</artifactId>
<version>5.2.2-SNAPSHOT</version> <version>5.2.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
distribution/pom.xml
Unescape View File

@ -27,7 +27,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.community.iots.distribution</artifactId> <artifactId>distribution</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Entgra IoT - Distribution Module</name> <name>Entgra IoT - Distribution Module</name>
<description>Entgra IoT Distribution Module</description> <description>Entgra IoT Distribution Module</description>

236
iot-core/pom.xml
Unescape View File

@ -35,8 +35,8 @@
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.oauth.extensions</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.am</groupId> <groupId>org.wso2.am</groupId>
@ -109,14 +109,40 @@
</goals> </goals>
<configuration> <configuration>
<target name="increase IDN_OAUTH2_ACCESS_TOKEN_SCOPE -&gt; TOKEN_SCOPE column size"> <target name="increase IDN_OAUTH2_ACCESS_TOKEN_SCOPE -&gt; TOKEN_SCOPE column size">
<replace file="target/${wso2am}/dbscripts/apimgt/db2.sql" token="TOKEN_SCOPE VARCHAR (60) NOT NULL," value="TOKEN_SCOPE VARCHAR (255) NOT NULL," /> <replace file="target/${wso2am}/dbscripts/apimgt/db2.sql" token="TOKEN_SCOPE VARCHAR (60) NOT NULL," value="TOKEN_SCOPE VARCHAR (1000) NOT NULL," />
<replace file="target/${wso2am}/dbscripts/apimgt/h2.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," /> <replace file="target/${wso2am}/dbscripts/apimgt/h2.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
<replace file="target/${wso2am}/dbscripts/apimgt/mssql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," /> <replace file="target/${wso2am}/dbscripts/apimgt/mssql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
<replace file="target/${wso2am}/dbscripts/apimgt/mysql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," /> <replace file="target/${wso2am}/dbscripts/apimgt/mysql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
<replace file="target/${wso2am}/dbscripts/apimgt/mysql_cluster.sql" token="TOKEN_SCOPE VARCHAR(60)," value="TOKEN_SCOPE VARCHAR(255)," /> <replace file="target/${wso2am}/dbscripts/apimgt/mysql_cluster.sql" token="TOKEN_SCOPE VARCHAR(60)," value="TOKEN_SCOPE VARCHAR(1000)," />
<replace file="target/${wso2am}/dbscripts/apimgt/oracle.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (255)," /> <replace file="target/${wso2am}/dbscripts/apimgt/oracle.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (1000)," />
<replace file="target/${wso2am}/dbscripts/apimgt/oracle_rac.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (60)," /> <replace file="target/${wso2am}/dbscripts/apimgt/oracle_rac.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (1000)," />
<replace file="target/${wso2am}/dbscripts/apimgt/postgresql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (60)," /> <replace file="target/${wso2am}/dbscripts/apimgt/postgresql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (1000)," />
</target>
</configuration>
</execution>
<execution>
<!--Alter Apimgt h2 db -->
<id>alter-apimgt-h2-db</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo message="########### Alter apimgt H2 Schema ###########" />
<property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/src/core/scripts/alter-apimgt-h2-db.sql" />
</sql>
<echo message="##################### END ####################" />
</target> </target>
</configuration> </configuration>
</execution> </execution>
@ -244,122 +270,122 @@
<featureArtifacts> <featureArtifacts>
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.mgt.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.api.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.webapp.publisher.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.identity.jwt.client.extension.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.email.sender.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
io.entgra.devicemgt:io.entgra.ui.request.interceptor.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.ui.request.interceptor.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.server.heart.beat.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.server.heart.beat.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<!-- Grafana Management Features --> <!-- Grafana Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.analytics.mgt.grafana.proxy.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.analytics.mgt.grafana.proxy.api.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Grafana Management Features --> <!-- End of Grafana Management Features -->
<!-- SMS Management Features --> <!-- SMS Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.api.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of SMS Management Features --> <!-- End of SMS Management Features -->
<!-- App Manager Features--> <!-- App Manager Features-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.application.mgt.api.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.application.mgt.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of New App Manager Features--> <!-- End of New App Manager Features-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.defaultrole.manager.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.logger.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.logger.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.stateengine.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Task Mgt Feature--> <!-- Task Mgt Feature-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.task.mgt.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Task Mgt Feature--> <!-- End of Task Mgt Feature-->
<!-- Notification Logger Feature--> <!-- Notification Logger Feature-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.notification.logger.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.notification.logger.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Notification Logger Feature--> <!-- End of Notification Logger Feature-->
<!-- APIM analytics extension feature--> <!-- APIM analytics extension feature-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of APIM analytics extension feature--> <!-- End of APIM analytics extension feature-->
<!-- Tenant Management Feature --> <!-- Tenant Management Feature -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.tenant.mgt.server.feature:${carbon.device.mgt.version} io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.server.feature:${io.entgra.device.mgt.core.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Tenant Management Feature --> <!-- End of Tenant Management Feature -->
</featureArtifacts> </featureArtifacts>
@ -380,170 +406,170 @@
<features> <features>
<!--Device Management Features--> <!--Device Management Features-->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Grafana Management Features--> <!--Grafana Management Features-->
<feature> <feature>
<id>io.entgra.analytics.mgt.grafana.proxy.server.feature.group</id> <id>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.analytics.mgt.grafana.proxy.api.feature.group</id> <id>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--End of Grafana Management Features--> <!--End of Grafana Management Features-->
<!--App Manager Features--> <!--App Manager Features-->
<feature> <feature>
<id>io.entgra.application.mgt.api.feature.group</id> <id>io.entgra.device.mgt.core.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.application.mgt.server.feature.group</id> <id>io.entgra.device.mgt.core.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--End of App Manager Features--> <!--End of App Manager Features-->
<!--SMS Management Features--> <!--SMS Management Features-->
<feature> <feature>
<id>io.entgra.transport.mgt.sms.handler.server.feature.group</id> <id>io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.transport.mgt.sms.handler.api.feature.group</id> <id>io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--End of SMS Management Features--> <!--End of SMS Management Features-->
<!--Email Sender Feature--> <!--Email Sender Feature-->
<feature> <feature>
<id>org.wso2.carbon.email.sender.feature.group</id> <id>io.entgra.device.mgt.core.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Apimgt Extension Features --> <!--Apimgt Extension Features -->
<feature> <feature>
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>io.entgra.device.mgt.core.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id> <id>io.entgra.device.mgt.core.apimgt.webapp.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.apimgt.keymgt.extension.feature.group</id> <id>io.entgra.device.mgt.core.apimgt.keymgt.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Certificate Mgt Features--> <!--Certificate Mgt Features-->
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>io.entgra.device.mgt.core.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.api.feature.group</id> <id>io.entgra.device.mgt.core.certificate.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id> <id>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Device Mgt Extension Features--> <!--Device Mgt Extension Features-->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Heartbeat Mgt--> <!--Heartbeat Mgt-->
<feature> <feature>
<id>io.entgra.server.heart.beat.feature.group</id> <id>io.entgra.device.mgt.core.server.heart.beat.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--jwt client--> <!--jwt client-->
<feature> <feature>
<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id> <id>io.entgra.device.mgt.core.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--policy mgt--> <!--policy mgt-->
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>io.entgra.device.mgt.core.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--UI request interceptor--> <!--UI request interceptor-->
<feature> <feature>
<id>io.entgra.ui.request.interceptor.feature.group</id> <id>io.entgra.device.mgt.core.ui.request.interceptor.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Webapp authentication framework--> <!--Webapp authentication framework-->
<feature> <feature>
<id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id> <id>io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.extensions.defaultrole.manager.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.extensions.logger.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.logger.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.extensions.stateengine.feature.group</id> <id>io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Task mgt--> <!--Task mgt-->
<feature> <feature>
<id>io.entgra.task.mgt.feature.group</id> <id>io.entgra.device.mgt.core.task.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--Notification Logger--> <!--Notification Logger-->
<feature> <feature>
<id>io.entgra.notification.logger.feature.group</id> <id>io.entgra.device.mgt.core.notification.logger.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!--APIM Analytics extension--> <!--APIM Analytics extension-->
<feature> <feature>
<id>io.entgra.device.mgt.core.apimgt.analytics.extension.feature.group</id> <id>io.entgra.device.mgt.core.apimgt.analytics.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
<!-- Tenant Management --> <!-- Tenant Management -->
<feature> <feature>
<id>io.entgra.tenant.mgt.server.feature.group</id> <id>io.entgra.device.mgt.core.tenant.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>

4
iot-core/src/assembly/bin.xml
Unescape View File

@ -114,8 +114,8 @@
<dependencySet> <dependencySet>
<outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/components/dropins</outputDirectory>
<includes> <includes>
<include>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions</include> <include>io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.oauth.extensions</include>
<include>org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension</include> <include>io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension</include>
</includes> </includes>
<!--<useProjectArtifact>false</useProjectArtifact>--> <!--<useProjectArtifact>false</useProjectArtifact>-->
<!--<useTransitiveDependencies>true</useTransitiveDependencies>--> <!--<useTransitiveDependencies>true</useTransitiveDependencies>-->

8
iot-core/src/core/conf/deployment.toml
Unescape View File

@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1"
auth_token = "" auth_token = ""
[web_app.listener] [web_app.listener]
class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "org.wso2.carbon.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"] class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"]
[apim.key_manager] [apim.key_manager]
#service_url = "https://localhost:${mgt.transport.https.port}/services/" #service_url = "https://localhost:${mgt.transport.https.port}/services/"
@ -271,12 +271,12 @@ maxHttpHeaderSize="16384"
maxHttpHeaderSize="16384" maxHttpHeaderSize="16384"
[oauth.grant_type.jwt_bearer] [oauth.grant_type.jwt_bearer]
grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler" grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler"
[[oauth.custom_grant_type]] [[oauth.custom_grant_type]]
name="access_token" name="access_token"
grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler" grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator" grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
[oauth.token_renewal] [oauth.token_renewal]
renew_refresh_token=false renew_refresh_token=false

2
iot-core/src/core/conf/tomcat/context.xml
Unescape View File

@ -71,5 +71,5 @@
</Permission> </Permission>
</PermissionConfiguration> </PermissionConfiguration>
--> -->
<Listener className="org.wso2.carbon.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"/> <Listener className="io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"/>
</Context> </Context>

6
iot-core/src/core/samples/device-plugins-deployer.xml
Unescape View File

@ -51,7 +51,7 @@
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<featureArtifactDef> <featureArtifactDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version} io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature:${io.entgra.device.mgt.plugins.version}
</featureArtifactDef> </featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
@ -71,7 +71,7 @@
<features> <features>
<feature> <feature>
<id>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature.group</id> <id>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
@ -191,6 +191,6 @@
<properties> <properties>
<!--This gets picked from the build properties, Do not change it--> <!--This gets picked from the build properties, Do not change it-->
<carbon.device.mgt.plugin.version>6.0.16-SNAPSHOT</carbon.device.mgt.plugin.version> <io.entgra.device.mgt.plugins.version>6.0.16-SNAPSHOT</io.entgra.device.mgt.plugins.version>
</properties> </properties>
</project> </project>

1
iot-core/src/core/scripts/alter-apimgt-h2-db.sql
Unescape View File

@ -0,0 +1 @@
ALTER TABLE IDN_OAUTH2_ACCESS_TOKEN_SCOPE ALTER COLUMN TOKEN_SCOPE VARCHAR(1000);

24
p2-profile/pom.xml
Unescape View File

@ -68,7 +68,7 @@
<artifactItem> <artifactItem>
<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>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
<type>jar</type> <type>jar</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<classifier>jar-with-dependencies</classifier> <classifier>jar-with-dependencies</classifier>
@ -90,7 +90,7 @@
<artifactItem> <artifactItem>
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId> <artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
<type>jar</type> <type>jar</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>${project.basedir}/target/${entgra-iot-core}/repository/components/dropins/</outputDirectory> <outputDirectory>${project.basedir}/target/${entgra-iot-core}/repository/components/dropins/</outputDirectory>
@ -120,19 +120,19 @@
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<featureArtifactDef> <featureArtifactDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.adapter.feature:${carbon.device.mgt.plugin.version} io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.adapter.feature:${io.entgra.device.mgt.plugins.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.notification.listener.feature:${carbon.device.mgt.plugin.version} io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.notification.listener.feature:${io.entgra.device.mgt.plugins.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device.feature:${carbon.device.mgt.plugin.version} io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device.feature:${io.entgra.device.mgt.plugins.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version} io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature:${io.entgra.device.mgt.plugins.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.analytics.feature:${carbon.device.mgt.plugin.version} io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.analytics.feature:${io.entgra.device.mgt.plugins.version}
</featureArtifactDef> </featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
@ -152,23 +152,23 @@
<features> <features>
<feature> <feature>
<id>io.entgra.device.mgt.plugins.adapter.feature.group</id> <id>io.entgra.device.mgt.plugins.adapter.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.plugins.notification.listener.feature.group</id> <id>io.entgra.device.mgt.plugins.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.plugins.extension.siddhi.device.feature.group</id> <id>io.entgra.device.mgt.plugins.extension.siddhi.device.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature.group</id> <id>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
</feature> </feature>
<feature> <feature>
<id>io.entgra.device.mgt.plugins.analytics.feature.group</id> <id>io.entgra.device.mgt.plugins.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${io.entgra.device.mgt.plugins.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>

58
pom.xml
Unescape View File

@ -45,49 +45,9 @@
<dependencies> <dependencies>
<!--CDM core dependencies--> <!--CDM core dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>io.entgra.device.mgt.core.device.mgt.oauth.extensions</artifactId>
<version>${carbon.device.mgt.version}</version> <version>${io.entgra.device.mgt.core.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.group.core</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.group.common</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<!--Orbit dependencies--> <!--Orbit dependencies-->
@ -360,17 +320,17 @@
<wso2am>wso2am-4.0.0</wso2am> <wso2am>wso2am-4.0.0</wso2am>
<entgra-iot-core>io.entgra.community.iots.core-${project.version}</entgra-iot-core> <entgra-iot-core>io.entgra.community.iots.core-${project.version}</entgra-iot-core>
<entgra-iot-community>product-iots-community-${project.version}</entgra-iot-community> <entgra-iot-community>entgra-iots-community-${project.version}</entgra-iot-community>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>5.0.25</carbon.device.mgt.version> <io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version> <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version> <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
<carbon.device.mgt.plugin.version>6.0.17-SNAPSHOT</carbon.device.mgt.plugin.version> <io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<!--Testing--> <!--Testing-->
<google.gson.version>2.8.5</google.gson.version> <google.gson.version>2.8.5</google.gson.version>
@ -381,9 +341,9 @@
</properties> </properties>
<scm> <scm>
<url>https://repository.entgra.net/community/community-product.git</url> <url>https://repository.entgra.net/community/product-iots-community.git</url>
<developerConnection>scm:git:https://repository.entgra.net/community/community-product.git</developerConnection> <developerConnection>scm:git:https://repository.entgra.net/community/product-iots-community.git</developerConnection>
<connection>scm:git:https://repository.entgra.net/community/community-product.git</connection> <connection>scm:git:https://repository.entgra.net/community/product-iots-community.git</connection>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>

Write Preview
Loading…
Cancel
Save