From 7bc32f05445c9dfca5f02254e814c26ecc8b27c2 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Mon, 7 Jun 2021 16:00:57 +0530 Subject: [PATCH] iot-core and iot-community product artifacts --- modules/distribution/iot-community/pom.xml | 171 ++++++++ .../iot-community/src/assembly/bin.xml | 63 +++ .../src/assembly/filter.properties} | 0 .../distribution/iot-community/src/temp.txt | 0 modules/distribution/iot-core/pom.xml | 71 ++++ .../{ => iot-core}/src/assembly/bin.xml | 2 +- .../iot-core/src/assembly/filter.propeties | 0 .../src/core/bin/iot-server.bat | 0 .../{ => iot-core}/src/core/bin/iot-server.sh | 0 .../src/core/conf/deployment.toml | 0 .../src/core/conf/tomcat/context.xml | 0 .../extensions/cookie-policy-content.jsp | 0 .../extensions/customAssets/logo.svg | 0 .../src/core/resources/extensions/header.jsp | 0 .../extensions/privacy-policy-content.jsp | 0 .../resources/extensions/product-title.jsp | 0 .../src/core/resources/extensions/title.jsp | 0 .../default/api/_TokenAPI_.xml | 0 modules/distribution/pom.xml | 52 +-- modules/p2-profile/iot-core-profile/pom.xml | 378 ++++++++++++++++++ modules/p2-profile/pom.xml | 8 +- pom.xml | 19 +- 22 files changed, 712 insertions(+), 52 deletions(-) create mode 100644 modules/distribution/iot-community/pom.xml create mode 100644 modules/distribution/iot-community/src/assembly/bin.xml rename modules/distribution/{src/assembly/filter.propeties => iot-community/src/assembly/filter.properties} (100%) create mode 100644 modules/distribution/iot-community/src/temp.txt create mode 100644 modules/distribution/iot-core/pom.xml rename modules/distribution/{ => iot-core}/src/assembly/bin.xml (97%) create mode 100644 modules/distribution/iot-core/src/assembly/filter.propeties rename modules/distribution/{ => iot-core}/src/core/bin/iot-server.bat (100%) rename modules/distribution/{ => iot-core}/src/core/bin/iot-server.sh (100%) rename modules/distribution/{ => iot-core}/src/core/conf/deployment.toml (100%) rename modules/distribution/{ => iot-core}/src/core/conf/tomcat/context.xml (100%) rename modules/distribution/{ => iot-core}/src/core/resources/extensions/cookie-policy-content.jsp (100%) rename modules/distribution/{ => iot-core}/src/core/resources/extensions/customAssets/logo.svg (100%) rename modules/distribution/{ => iot-core}/src/core/resources/extensions/header.jsp (100%) rename modules/distribution/{ => iot-core}/src/core/resources/extensions/privacy-policy-content.jsp (100%) rename modules/distribution/{ => iot-core}/src/core/resources/extensions/product-title.jsp (100%) rename modules/distribution/{ => iot-core}/src/core/resources/extensions/title.jsp (100%) rename modules/distribution/{ => iot-core}/src/core/synapse-configs/default/api/_TokenAPI_.xml (100%) create mode 100644 modules/p2-profile/iot-core-profile/pom.xml diff --git a/modules/distribution/iot-community/pom.xml b/modules/distribution/iot-community/pom.xml new file mode 100644 index 0000000..83905df --- /dev/null +++ b/modules/distribution/iot-community/pom.xml @@ -0,0 +1,171 @@ + + + + + + + io.entgra.community + entgra-iot-distribution + 5.0.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + entgra-iot-community + pom + Entgra IoT - Community Distribution + Entgra IoT Community Distribution + + + + + org.apache.maven.plugins + maven-dependency-plugin + false + + + 1-unpack-entgra-iots + test + + unpack + + + + + io.entgra.community + entgra-iot + zip + true + target + + + + + + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + 2-p2-repo-generation + package + + p2-repo-gen + + + file:${basedir}/target/p2-repo + file:${basedir}/target/p2-repo + true + true + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version} + + + + + + feature-install + package + + p2-profile-gen + + + default + file:${basedir}/target/p2-repo + file:${basedir}/target/p2-repo + ${basedir}/target/${entgra-iot}/repository/components + true + + + org.wso2.carbon.device.mgt.adapter.feature.group + ${carbon.device.mgt.plugin.version} + + + org.wso2.carbon.device.mgt.notification.listener.feature.group + ${carbon.device.mgt.plugin.version} + + + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + package + + replace + + + + + + ${basedir}/target/${entgra-iot}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info + + + + false + true + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + 2-dist + package + + single + + + false + UTF-8 + + ${basedir}/src/assembly/filter.properties + + \ + + ${basedir}/src/assembly/bin.xml + + + 0775 + 0775 + 0644 + 0644 + + + + + + + + + diff --git a/modules/distribution/iot-community/src/assembly/bin.xml b/modules/distribution/iot-community/src/assembly/bin.xml new file mode 100644 index 0000000..73cf925 --- /dev/null +++ b/modules/distribution/iot-community/src/assembly/bin.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + ]> + + bin + + zip + + false + + + + ${basedir}/target/${entgra-iot} + ${entgra-iot-community} + + + + + + src/temp.txt + ${entgra-iot-community}/ + + + + diff --git a/modules/distribution/src/assembly/filter.propeties b/modules/distribution/iot-community/src/assembly/filter.properties similarity index 100% rename from modules/distribution/src/assembly/filter.propeties rename to modules/distribution/iot-community/src/assembly/filter.properties diff --git a/modules/distribution/iot-community/src/temp.txt b/modules/distribution/iot-community/src/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/modules/distribution/iot-core/pom.xml b/modules/distribution/iot-core/pom.xml new file mode 100644 index 0000000..1a5fce8 --- /dev/null +++ b/modules/distribution/iot-core/pom.xml @@ -0,0 +1,71 @@ + + + + + + + io.entgra.community + entgra-iot-distribution + 5.0.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + entgra-iot + pom + Entgra IoT Core Distribution + Entgra IoT Core Distribution + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + 2-dist + package + + single + + + false + UTF-8 + + ${basedir}/src/assembly/filter.properties + + \ + + ${basedir}/src/assembly/bin.xml + + + 0775 + 0775 + 0644 + 0644 + + + + + + + + + diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/iot-core/src/assembly/bin.xml similarity index 97% rename from modules/distribution/src/assembly/bin.xml rename to modules/distribution/iot-core/src/assembly/bin.xml index 44c436c..3b509d0 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/iot-core/src/assembly/bin.xml @@ -48,7 +48,7 @@ - ../p2-profile/iot-core-profile/target/${wso2am} + ../../p2-profile/iot-core-profile/target/${wso2am} ${entgra-iot} **/repository/conf/tomcat/context.xml diff --git a/modules/distribution/iot-core/src/assembly/filter.propeties b/modules/distribution/iot-core/src/assembly/filter.propeties new file mode 100644 index 0000000..e69de29 diff --git a/modules/distribution/src/core/bin/iot-server.bat b/modules/distribution/iot-core/src/core/bin/iot-server.bat similarity index 100% rename from modules/distribution/src/core/bin/iot-server.bat rename to modules/distribution/iot-core/src/core/bin/iot-server.bat diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/iot-core/src/core/bin/iot-server.sh similarity index 100% rename from modules/distribution/src/core/bin/iot-server.sh rename to modules/distribution/iot-core/src/core/bin/iot-server.sh diff --git a/modules/distribution/src/core/conf/deployment.toml b/modules/distribution/iot-core/src/core/conf/deployment.toml similarity index 100% rename from modules/distribution/src/core/conf/deployment.toml rename to modules/distribution/iot-core/src/core/conf/deployment.toml diff --git a/modules/distribution/src/core/conf/tomcat/context.xml b/modules/distribution/iot-core/src/core/conf/tomcat/context.xml similarity index 100% rename from modules/distribution/src/core/conf/tomcat/context.xml rename to modules/distribution/iot-core/src/core/conf/tomcat/context.xml diff --git a/modules/distribution/src/core/resources/extensions/cookie-policy-content.jsp b/modules/distribution/iot-core/src/core/resources/extensions/cookie-policy-content.jsp similarity index 100% rename from modules/distribution/src/core/resources/extensions/cookie-policy-content.jsp rename to modules/distribution/iot-core/src/core/resources/extensions/cookie-policy-content.jsp diff --git a/modules/distribution/src/core/resources/extensions/customAssets/logo.svg b/modules/distribution/iot-core/src/core/resources/extensions/customAssets/logo.svg similarity index 100% rename from modules/distribution/src/core/resources/extensions/customAssets/logo.svg rename to modules/distribution/iot-core/src/core/resources/extensions/customAssets/logo.svg diff --git a/modules/distribution/src/core/resources/extensions/header.jsp b/modules/distribution/iot-core/src/core/resources/extensions/header.jsp similarity index 100% rename from modules/distribution/src/core/resources/extensions/header.jsp rename to modules/distribution/iot-core/src/core/resources/extensions/header.jsp diff --git a/modules/distribution/src/core/resources/extensions/privacy-policy-content.jsp b/modules/distribution/iot-core/src/core/resources/extensions/privacy-policy-content.jsp similarity index 100% rename from modules/distribution/src/core/resources/extensions/privacy-policy-content.jsp rename to modules/distribution/iot-core/src/core/resources/extensions/privacy-policy-content.jsp diff --git a/modules/distribution/src/core/resources/extensions/product-title.jsp b/modules/distribution/iot-core/src/core/resources/extensions/product-title.jsp similarity index 100% rename from modules/distribution/src/core/resources/extensions/product-title.jsp rename to modules/distribution/iot-core/src/core/resources/extensions/product-title.jsp diff --git a/modules/distribution/src/core/resources/extensions/title.jsp b/modules/distribution/iot-core/src/core/resources/extensions/title.jsp similarity index 100% rename from modules/distribution/src/core/resources/extensions/title.jsp rename to modules/distribution/iot-core/src/core/resources/extensions/title.jsp diff --git a/modules/distribution/src/core/synapse-configs/default/api/_TokenAPI_.xml b/modules/distribution/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml similarity index 100% rename from modules/distribution/src/core/synapse-configs/default/api/_TokenAPI_.xml rename to modules/distribution/iot-core/src/core/synapse-configs/default/api/_TokenAPI_.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 21be5b7..ef959e9 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -20,52 +20,20 @@ - io.entgra.iot - entgra-iot-server-parent - 4.1.1-SNAPSHOT + io.entgra.community + community-parent + 5.0.0-SNAPSHOT ../../pom.xml 4.0.0 - entgra-iot + entgra-iot-distribution pom - Entgra IoT - Distribution - Entgra IoT Distribution - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - 2-dist - package - - single - - - false - UTF-8 - - ${basedir}/src/assembly/filter.properties - - \ - - ${basedir}/src/assembly/bin.xml - - - 0775 - 0775 - 0644 - 0644 - - - - - - - + Entgra IoT - Distribution Module + Entgra IoT Distribution Module + + iot-core + iot-community + diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml new file mode 100644 index 0000000..ec89b2d --- /dev/null +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -0,0 +1,378 @@ + + + + + + + io.entgra.community + p2-profile + 5.0.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + iot-core-p2-profile + Entgra IoT - Core P2 Profile Gen + pom + + + + com.h2database.wso2 + h2-database-engine + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-solution + process-resources + + run + + + + + + + + + + create-device-mgt-schema + install + + run + + + + + + + + + + + + + + + + + + + + + + + create-certificate-mgt-schema + install + + run + + + + + + + + + + + + + + + + + + + + + + + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + 2-p2-repo-generation + package + + p2-repo-gen + + + file:${basedir}/target/p2-repo + file:${basedir}/target/p2-repo + true + true + + + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} + + + io.entgra.devicemgt:io.entgra.ui.request.interceptor.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:io.entgra.server.heart.beat.feature:${carbon.device.mgt.version} + + + + + + org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.server.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.api.feature:${carbon.device.mgt.version} + + + + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version} + + + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} + + + + + + + feature-install + package + + p2-profile-gen + + + default + file:${basedir}/target/p2-repo + file:${basedir}/target/p2-repo + ${basedir}/target/${wso2am}/repository/components + true + + + + org.wso2.carbon.device.mgt.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.device.mgt.extensions.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.device.application.mgt.api.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.device.application.mgt.server.feature.group + ${carbon.device.mgt.version} + + + + + + io.entgra.transport.mgt.sms.handler.server.feature.group + ${carbon.device.mgt.version} + + + io.entgra.transport.mgt.sms.handler.api.feature.group + ${carbon.device.mgt.version} + + + + + + org.wso2.carbon.email.sender.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.apimgt.application.extension.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.apimgt.webapp.publisher.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.certificate.mgt.server.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.certificate.mgt.api.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group + ${carbon.device.mgt.version} + + + org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group + ${carbon.device.mgt.version} + + + + + io.entgra.server.heart.beat.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.identity.jwt.client.extension.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.policy.mgt.server.feature.group + ${carbon.device.mgt.version} + + + + + io.entgra.ui.request.interceptor.feature.group + ${carbon.device.mgt.version} + + + + + org.wso2.carbon.webapp.authenticator.framework.server.feature.group + ${carbon.device.mgt.version} + + + + + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + package + + replace + + + + + + ${basedir}/target/${wso2am}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info + + + + false + true + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml index 9ddcb1b..8376f59 100644 --- a/modules/p2-profile/pom.xml +++ b/modules/p2-profile/pom.xml @@ -20,14 +20,14 @@ - io.entgra.iot - entgra-iot-server-parent - 4.1.1-SNAPSHOT + io.entgra.community + community-parent + 5.0.0-SNAPSHOT ../../pom.xml 4.0.0 - entgra-iot-p2-profile + p2-profile pom Entgra IoT - P2 Profile Module http://entgra.io diff --git a/pom.xml b/pom.xml index d764b74..d115ee6 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,13 @@ 4.0.0 - io.entgra.iot - entgra-iot-server-parent + io.entgra.community + community-parent pom - 4.1.1-SNAPSHOT - Entgra IoT - Parent + 5.0.0-SNAPSHOT + Entgra Community Product - Parent http://entgra.io - Entgra IoT Server + Entgra Community Product org.wso2 @@ -90,6 +90,11 @@ ${orbit.h2.engine.version} + + io.entgra.community + entgra-iot + ${project.version} + @@ -97,6 +102,7 @@ wso2am-4.0.0 entgra-iot-${project.version} + entgra-iot-community-${project.version} 4.1.16-SNAPSHOT @@ -106,6 +112,9 @@ 1.2.140.wso2v3 + 5.0.16-SNAPSHOT + +