From 5f4ed2ff186ac16921e6a09f8698519e7ad04c15 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Sat, 15 Sep 2018 22:30:17 +0530 Subject: [PATCH 01/18] Adding the changes for the product --- modules/distribution/pom.xml | 116 +++--- modules/distribution/src/assembly/bin.xml | 36 +- modules/p2-profile/iot-core-profile/pom.xml | 391 ++++++++++++-------- pom.xml | 6 +- 4 files changed, 324 insertions(+), 225 deletions(-) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 9be6598e..0b8cde03 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -534,76 +534,76 @@ - + - + - - - create-JAGH2-schema - package - - run - - - - - - - - - - - - - - - - - - - - - - - - - - create-social-db-schema - package - - run - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + create-mobile-android-plugin-mgt-schema diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 80a6852c..e64a7a2e 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1433,10 +1433,10 @@ - target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2APPM_DB.h2.db + target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_APPM_DB.h2.db ${pom.artifactId}-${pom.version}/repository/database - WSO2APPM_DB.h2.db + WSO2DM_APPM_DB.h2.db 644 @@ -1701,14 +1701,14 @@ ${pom.artifactId}-${pom.version}/conf/ - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml - - - ${pom.artifactId}-${pom.version}/conf/ - - + + + + + + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/entitlement.properties @@ -1717,14 +1717,14 @@ ${pom.artifactId}-${pom.version}/conf/identity - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/lifecycles/MobileAppLifeCycle.xml - - - ${pom.artifactId}-${pom.version}/repository/resources/lifecycles - - + + + + + + + + src/core/samples/connectedcup-samples-deployer.xml ${pom.artifactId}-${pom.version}/samples/ diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 1478f926..7548018a 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -454,49 +454,70 @@ - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version} - - - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version} - - - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version} - - - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.feature:${carbon.device.mgt.version} - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version} - org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version} - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} - org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.store.ui.feature:${carbon.device.mgt.version} - - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.oauth.feature:${appmgt.feature.version} - - - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.store.feature:${appmgt.feature.version} - - - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.publisher.feature:${appmgt.feature.version} - - + + @@ -912,62 +933,91 @@ - - org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group - ${carbon.device.mgt.plugin.version} - - - org.wso2.carbon.appmgt.mdm.restconnector.feature.group - ${carbon.device.mgt.plugin.version} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - org.wso2.carbon.appmgt.core.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.wso2emm.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mobile.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.publisher.feature.group - ${appmgt.feature.version} + org.wso2.carbon.device.application.mgt.feature.group + ${carbon.device.mgt.version} + - org.wso2.carbon.appmgt.services.api.feature.group - ${appmgt.feature.version} + org.wso2.carbon.device.application.mgt.api.feature.group + ${carbon.device.mgt.version} + - org.wso2.carbon.store.feature.group - ${carbon.store.version} + org.wso2.carbon.device.application.mgt.publisher.ui.feature.group + ${carbon.device.mgt.version} + - org.wso2.carbon.appmgt.store.feature.group - ${appmgt.feature.version} + org.wso2.carbon.device.application.mgt.server.feature.group + ${carbon.device.mgt.version} + - org.wso2.carbon.social.feature.group - ${carbon.store.version} + org.wso2.carbon.device.application.mgt.store.ui.feature.group + ${carbon.device.mgt.version} - - org.wso2.carbon.appmgt.rest.api.store.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.rest.api.publisher.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.oauth.feature.group - ${appmgt.feature.version} - - + + @@ -1997,43 +2047,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - org.wso2.carbon.appmgt.core.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.wso2emm.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mobile.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.services.api.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group - ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.application.mgt.api.feature.group + ${carbon.device.mgt.version} + + + + + + - org.wso2.carbon.appmgt.mdm.restconnector.feature.group - ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.application.mgt.server.feature.group + ${carbon.device.mgt.version} - - org.wso2.carbon.appmgt.rest.api.store.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.rest.api.publisher.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.oauth.feature.group - ${appmgt.feature.version} - - + + + + + + + @@ -2271,10 +2350,10 @@ org.wso2.carbon.service.mgt.server.feature.group ${carbon.deployment.version} - - org.wso2.carbon.social.feature.group - ${carbon.store.version} - + + + + org.wso2.carbon.registry.core.feature.group ${carbon.registry.version} @@ -2654,49 +2733,69 @@ org.wso2.iot.core.styles.feature.group ${project.version} - - - - org.wso2.carbon.appmgt.core.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mdm.wso2emm.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.mobile.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.publisher.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.appmgt.services.api.feature.group - ${appmgt.feature.version} - - - org.wso2.carbon.store.feature.group - ${carbon.store.version} - - - org.wso2.carbon.appmgt.store.feature.group - ${appmgt.feature.version} - + + - org.wso2.carbon.social.feature.group - ${carbon.store.version} + org.wso2.carbon.device.application.mgt.feature.group + ${carbon.device.mgt.version} + - org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group - ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.application.mgt.api.feature.group + ${carbon.device.mgt.version} + - org.wso2.carbon.appmgt.mdm.restconnector.feature.group - ${carbon.device.mgt.plugin.version} + org.wso2.carbon.device.application.mgt.server.feature.group + ${carbon.device.mgt.version} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index fd22ede4..fa0283c1 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/cxf-filters modules/p2-profile modules/distribution - modules/integration + @@ -1528,14 +1528,14 @@ 4.7.23 - 3.1.37 + 3.1.40-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.1.8 + 4.1.9-SNAPSHOT 6.2.201 From 8e69e93a485eb14842c7f7e102c16143e2340086 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Sat, 15 Sep 2018 23:20:08 +0530 Subject: [PATCH 02/18] Removing old app manager files --- modules/distribution/src/assembly/bin.xml | 6 - .../src/core/conf/app-manager.xml | 494 ------------------ 2 files changed, 500 deletions(-) delete mode 100644 modules/distribution/src/core/conf/app-manager.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index e64a7a2e..0711a03c 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1387,12 +1387,6 @@ ${pom.artifactId}-${pom.version}/repository/database/ 644 - - src/core/conf/app-manager.xml - ${pom.artifactId}-${pom.version}/conf - true - 644 - src/core/resources/appm-tenant-conf.xml ${pom.artifactId}-${pom.version}/repository/resources diff --git a/modules/distribution/src/core/conf/app-manager.xml b/modules/distribution/src/core/conf/app-manager.xml deleted file mode 100644 index 246b410d..00000000 --- a/modules/distribution/src/core/conf/app-manager.xml +++ /dev/null @@ -1,494 +0,0 @@ - - - - - - jdbc/WSO2APPM_DB - - jdbc/ES_Storage - - - - - true - - - - - false - false - - - - - - - https://localhost:${mgt.transport.https.port}/services/ - - - admin - - - admin - - - - - - - - - - - - - - - - - - - 1800 - - - true - - - org.wso2.carbon.appmgt.impl.token.JWTGenerator - - - X-JWT-Assertion - - - org.wso2.carbon.appmgt.impl.token.DefaultClaimsRetriever - - - http://wso2.org/claims - - - SHA256withRSA - - - false - - - false - - - - - - - - - - - - Gateway Endpoint - - - https://${carbon.local.ip}:${mgt.transport.https.port}/services/ - - - admin - - - admin - - - http://${carbon.local.ip}:${http.nio.port},https://${carbon.local.ip}:${https.nio.port} - - - - - - - - - - - - - jdbc/WSO2APPM_DB - - - false - - - false - - - org.wso2.carbon.appmgt.usage.publisher.APIMgtUsageDataBridgeDataPublisher - - - org.wso2.carbon.appmgt.usage.client.impl.AppUsageStatisticsRdbmsClient - - - 7612 - - - tcp://localhost:7612 - - - admin - - - admin - - - - org.wso2.appmgt.statistics.request - 1.0.0 - - org.wso2.appmgt.statistics.response - 1.0.0 - - org.wso2.appmgt.statistics.fault - 1.0.0 - - org.wso2.appmgt.statistics.cache - 1.0.0 - - - org.wso2.appmgt.bam.uiactivitypublish - 1.1.0 - - - - - - - - - - - - false - - - UA-XXXXXXXX-X - - - - - - - - - - true - - - - - - - - true - - - https://localhost:9443,http://localhost:9763 - - - authorization,Access-Control-Allow-Origin,Content-Type - - - GET,POST,PUT,DELETE,OPTIONS - - - - - - - - false - - - https://localhost:${mgt.transport.https.port}/samlsso - - - appm/acs - - - true - - - true - - - true - - - 300 - - - wso2carbon - - - - wso2is - 5.0.0 - org.wso2.carbon.appmgt.impl.idp.sso.configurator.IS500SAMLSSOConfigurator - - https://${carbon.local.ip}:${mgt.transport.https.port} - admin - admin - - - - - - - - - - - https://${carbon.local.ip}:${mgt.transport.https.port} - admin - admin - - - - - - - - - - false - - - false - - - true - - - WSO2MDM_INTERNAL - - - false - - - true - - - false - - - %http% - - - publisher/api/mobileapp/getplist - - - true - - - Internal/store-admin - - - - - - - - /store/extensions/assets/mobileapp/resources/models/%s.png - https://localhost:9443 - https://localhost:9443/oauth2 - admin - admin - 100 - - - - - https://localhost:9443 - https://localhost:9443/emm/assets/wso2mobile/img/models/%s.png - admin - admin - - - - - /store/extensions/assets/mobileapp/resources/models/%s.png - - - - - - - - repository/resources/mobileapps/ - /api/mobileapp/getfile/ - - - - - - ${carbon.home}/repository/resources/mobileapps/ - - - - - admin - - - - - mobileapp - - - - - /api/appm/publisher/v1.1 - /api/appm/store/v1.1 - - - - - /api/appm/store/{version}/apps/mobile/binaries/one-time/{uuid} - GET,HEAD - - - /api/appm/store/{version}/apps/static-contents/{fileName} - GET,HEAD - - - /api/appm/store/{version}/apps/mobile/plist/{appId}/{uuid} - GET,HEAD - - - - - From a590872a2f8af229834d46d25143d9dba0ae7c4b Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Thu, 20 Sep 2018 07:09:02 +0000 Subject: [PATCH 03/18] Add CI --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..56b9fcc4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,21 @@ +image: maven:latest + +variables: + # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. + # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. + MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used + # when running from the command line. + # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. + MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version" + +# Cache downloaded dependencies and plugins between builds. +# To keep cache across branches add 'key: "$CI_JOB_NAME"' +cache: + paths: + - .m2/repository/ + +build: + stage: build + script: + - 'mvn $MAVEN_CLI_OPTS test-compile' From af2b0ef61529c3bbf43b7a51a5055eb71e825f99 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 1 Oct 2018 01:53:06 +0530 Subject: [PATCH 04/18] Bump dependency versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fa0283c1..1f06201b 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,14 +1528,14 @@ 4.7.23 - 3.1.40-SNAPSHOT + 3.2.1-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.1.9-SNAPSHOT + 4.2.1-SNAPSHOT 6.2.201 From e85e6a462dacf44bcab708df3493f1f69b5ee82f Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Thu, 3 Jan 2019 12:03:53 +0530 Subject: [PATCH 05/18] Modify feature deploying --- modules/p2-profile/iot-core-profile/pom.xml | 72 +-------------------- pom.xml | 8 +-- 2 files changed, 6 insertions(+), 74 deletions(-) diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 7548018a..ae06510c 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -501,14 +501,11 @@ - - org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.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.publisher.ui.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.application.mgt.publisher.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} @@ -992,18 +989,13 @@ - - org.wso2.carbon.device.application.mgt.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.publisher.ui.feature.group + org.wso2.carbon.application.mgt.publisher.feature.group ${carbon.device.mgt.version} @@ -2046,72 +2038,17 @@ ${project.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} - - - - - @@ -2736,11 +2673,6 @@ - - org.wso2.carbon.device.application.mgt.feature.group - ${carbon.device.mgt.version} - - org.wso2.carbon.device.application.mgt.api.feature.group ${carbon.device.mgt.version} diff --git a/pom.xml b/pom.xml index 1f06201b..923fd8c6 100644 --- a/pom.xml +++ b/pom.xml @@ -1269,7 +1269,7 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} @@ -1528,14 +1528,14 @@ 4.7.23 - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT 6.2.201 @@ -1556,7 +1556,7 @@ 7.0.85.wso2v1 7.0.34.wso2v2 7.0.85.wso2v1 - 2.4 + 4.0.1 1.6.1-wso2v12 From 715ca227ccc333f7de907db7e405e8695f5ff7e2 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Sun, 3 Mar 2019 08:44:51 +0530 Subject: [PATCH 06/18] Add new app manager componennts bundling --- modules/p2-profile/iot-core-profile/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index ae06510c..b4ac27d6 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -505,7 +505,7 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version} - org.wso2.carbon.devicemgt:org.wso2.carbon.application.mgt.publisher.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} @@ -995,7 +995,7 @@ - org.wso2.carbon.application.mgt.publisher.feature.group + org.wso2.carbon.device.application.mgt.publisher.ui.feature.group ${carbon.device.mgt.version} From a608cc5cc96ce5f3117449c46536e6362b6cecdc Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Wed, 13 Mar 2019 03:03:46 +0530 Subject: [PATCH 07/18] Remove publisher directory creating in jaggeryapps directory --- modules/distribution/src/assembly/bin.xml | 44 +++++++++++------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 0711a03c..b9b053d2 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -402,21 +402,21 @@ - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/publisher/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher - - - publisherLogo/** - publisherTheme/** - publisherSite/** - footer/** - localstyles.css - **/jaggery.conf - - + + + + + + + + + + + + + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/store/ @@ -1594,13 +1594,13 @@ 755 - - src/core/jaggeryapps/publisher/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher/ - - 755 - + + + + + + + src/core/jaggeryapps/privacy-policies/jaggery.conf From ae119a5121752d9ad2960266d9ac671c8a6981c7 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 1 Apr 2019 07:36:22 +0530 Subject: [PATCH 08/18] Remove store jagerry app deploying --- modules/distribution/src/assembly/bin.xml | 44 +++++++++++------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index b9b053d2..a3be24e6 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -417,21 +417,21 @@ - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/store/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store - - - storeLogo/** - storeSite/** - base-page/** - login/** - styles-layout.css - **/jaggery.conf - - + + + + + + + + + + + + + + + @@ -1617,13 +1617,13 @@ 755 - - src/core/jaggeryapps/store/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store/ - - 755 - + + + + + + + src/core/jaggeryapps/windows-web-agent/jaggery.conf From d31cf98615df361e68fb06eaa641db20364d0399 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Thu, 25 Apr 2019 00:00:22 +0530 Subject: [PATCH 09/18] Merge with master --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 923fd8c6..f21206f9 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,14 +1528,14 @@ 4.7.23 - 3.2.2-SNAPSHOT + 3.2.5-SNAPSHOT [3.1.0, 4.0.0) ${project.version} - 4.2.2-SNAPSHOT + 4.2.5-SNAPSHOT 6.2.201 From 757c5302854ebf22ed2674204278d569a16fba21 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Sun, 12 May 2019 10:18:28 +0530 Subject: [PATCH 10/18] Comment unused wso2 appm related files copyings --- .../java/org/wso2/mdm/qsg/AppOperations.java | 194 ------------------ .../java/org/wso2/mdm/qsg/QSGExecutor.java | 53 ----- 2 files changed, 247 deletions(-) delete mode 100644 modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java diff --git a/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java b/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java deleted file mode 100644 index ff5bda18..00000000 --- a/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.wso2.mdm.qsg; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; -import org.wso2.mdm.qsg.dto.EMMQSGConfig; -import org.wso2.mdm.qsg.dto.HTTPResponse; -import org.wso2.mdm.qsg.dto.MobileApplication; -import org.wso2.mdm.qsg.utils.Constants; -import org.wso2.mdm.qsg.utils.HTTPInvoker; -import org.wso2.mdm.qsg.utils.QSGUtils; - -import java.io.File; -import java.util.HashMap; - -/** - * This class holds the app-mgt related operations. - */ -public class AppOperations { - - private static String appmPublisherMobileBinariesUrl = "/api/appm/publisher/v1.1/apps/mobile/binaries"; - private static String appmPublisherResourcesUrl = "/api/appm/publisher/v1.1/apps/static-contents?appType=mobileapp"; - private static String appmPublisherAppsUrl = "/api/appm/publisher/v1.1/apps/mobileapp"; - - - public static MobileApplication uploadApplication(String platform, String appName, String appContentType) { - - String appUploadEndpoint = EMMQSGConfig.getInstance().getEmmHost() + appmPublisherMobileBinariesUrl; - String filePath = "apps" + File.separator + platform + File.separator + appName; - HTTPResponse httpResponse = HTTPInvoker.uploadFile(appUploadEndpoint, filePath, appContentType); - if (Constants.HTTPStatus.OK == httpResponse.getResponseCode()) { - JSONObject appMeta = null; - MobileApplication application = new MobileApplication(); - try { - appMeta = (JSONObject) new JSONParser().parse(httpResponse.getResponse()); - application.setPackageId((String) appMeta.get("package")); - application.setAppId(QSGUtils.getResourceId((String) appMeta.get("path"))); - application.setVersion((String) appMeta.get("version")); - application.setPlatform(platform); - } catch (ParseException e) { - e.printStackTrace(); - } - return application; - } - return null; - } - - public static MobileApplication getPublicApplication(String packageId, String version, String platform) { - MobileApplication application = new MobileApplication(); - application.setVersion(version); - application.setPackageId(packageId); - application.setPlatform(platform); - return application; - } - - private static String uploadAsset(String path) { - - String resUploadEndpoint = EMMQSGConfig.getInstance().getEmmHost() + appmPublisherResourcesUrl; - HTTPResponse httpResponse = HTTPInvoker.uploadFile(resUploadEndpoint, path, "image/jpeg"); - if (Constants.HTTPStatus.OK == httpResponse.getResponseCode()) { - JSONObject resp = null; - try { - resp = (JSONObject) new JSONParser().parse(httpResponse.getResponse()); - return (String) resp.get("id"); - } catch (ParseException e) { - e.printStackTrace(); - } - } - return null; - } - - public static MobileApplication uploadAssets(String platform, MobileApplication application) { - - String assetDir = "apps" + File.separator + platform + File.separator + "images"; - //Upload the icon file - String imgFile = assetDir + File.separator + "icon.jpg"; - String uploadPath = uploadAsset(imgFile); - if (uploadPath != null && !uploadPath.isEmpty()) { - application.setIcon(uploadPath); - } else { - System.out.println("Unable to upload the app icon file."); - return null; - } - - //Upload the banner file - imgFile = assetDir + File.separator + "banner.jpg"; - uploadPath = uploadAsset(imgFile); - if (uploadPath != null && !uploadPath.isEmpty()) { - application.setBanner(uploadPath); - } else { - System.out.println("Unable to upload the app banner file."); - return null; - } - - //Upload the screenshot1 file - imgFile = assetDir + File.separator + "screen1.jpg"; - uploadPath = uploadAsset(imgFile); - if (uploadPath != null && !uploadPath.isEmpty()) { - application.setScreenshot1(uploadPath); - } else { - System.out.println("Unable to upload the app screenshot1 file."); - return null; - } - - //Upload the screenshot2 file - imgFile = assetDir + File.separator + "screen2.jpg"; - uploadPath = uploadAsset(imgFile); - if (uploadPath != null && !uploadPath.isEmpty()) { - application.setScreenshot2(uploadPath); - } else { - System.out.println("Unable to upload the app screenshot2 file."); - return null; - } - - //Upload the screenshot3 file - imgFile = assetDir + File.separator + "screen3.jpg"; - uploadPath = uploadAsset(imgFile); - if (uploadPath != null && !uploadPath.isEmpty()) { - application.setScreenshot3(uploadPath); - } else { - System.out.println("Unable to upload the app screenshot3 file."); - return null; - } - return application; - } - - public static boolean addApplication(String name, MobileApplication mblApp, boolean isEnterpriseApp) { - HashMap headers = new HashMap(); - - String appEndpoint = EMMQSGConfig.getInstance().getEmmHost() + appmPublisherAppsUrl; - //Set the application payload - JSONObject application = new JSONObject(); - application.put("name", name); - application.put("description", "Sample application"); - application.put("type", "enterprise"); - //Set appMeta data - JSONObject appMeta = new JSONObject(); - appMeta.put("package", mblApp.getPackageId()); - appMeta.put("version", mblApp.getVersion()); - if (isEnterpriseApp) { - application.put("marketType", "enterprise"); - appMeta.put("path", mblApp.getAppId()); - } else { - application.put("marketType", "public"); - } - application.put("provider", "admin"); - application.put("displayName", name); - application.put("category", "Business"); - application.put("thumbnailUrl", mblApp.getIcon()); - application.put("version", mblApp.getVersion()); - application.put("banner", mblApp.getBanner()); - application.put("platform", mblApp.getPlatform()); - application.put("appType", mblApp.getPlatform()); - //application.put("appUrL", mblApp.getAppId()); - application.put("mediaType", "application/vnd.wso2-mobileapp+xml"); - - //Set screenshots - JSONArray screenshots = new JSONArray(); - screenshots.add(mblApp.getScreenshot1()); - screenshots.add(mblApp.getScreenshot2()); - screenshots.add(mblApp.getScreenshot3()); - application.put("appmeta", appMeta); - application.put("screenshots", screenshots); - - //Set the headers - headers.put(Constants.Header.CONTENT_TYPE, Constants.ContentType.APPLICATION_JSON); - HTTPResponse - httpResponse = - HTTPInvoker.sendHTTPPostWithOAuthSecurity(appEndpoint, application.toJSONString(), headers); - if (Constants.HTTPStatus.OK == httpResponse.getResponseCode()) { - return true; - } - return false; - } -} diff --git a/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java b/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java index 58a993df..5cde92b0 100644 --- a/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java +++ b/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java @@ -113,59 +113,6 @@ public class QSGExecutor { System.exit(0); } - - System.out.println("Upload the android application "); - //Upload the android application - MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "con-app.apk", - "application/vnd.android.package-archive"); - if (application == null) { - System.out.println("Unable to upload the sample android application. Terminating the IoTS QSG now."); - System.exit(0); - } - //Upload the assets - application = AppOperations.uploadAssets(Constants.DeviceType.ANDROID, application); - if (application == null) { - System.out.println( - "Unable to upload the assets for sample android application. Terminating the IoTS QSG now."); - System.exit(0); - } - - System.out.println("Create the android application "); - //Create application entry in publisher - status = AppOperations.addApplication("WSO2Con-Android", application, true); - if (!status) { - System.out.println("Unable to create the android mobile application. Terminating the IoTS QSG now."); - System.exit(0); - } - - - System.out.println("Upload the iOS application "); - //Add the iOS policy - status = PolicyOperations.createPasscodePolicy("ios-passcode-policy1", Constants.DeviceType.IOS); - if (!status) { - System.out.println("Unable to create the ios passcode policy. Terminating the IoTS QSG now."); - System.exit(0); - } - - //Upload the ios application - MobileApplication iOSApplication = AppOperations.uploadApplication(Constants.DeviceType.IOS, "PNDemo.ipa","application/octet-stream"); - iOSApplication.setVersion("1.0.0"); - //Upload the assets - iOSApplication = AppOperations.uploadAssets(Constants.DeviceType.IOS, iOSApplication); - if (iOSApplication == null) { - System.out.println( - "Unable to upload the assets for sample iOS application. Terminating the IoTS QSG now."); - System.exit(0); - } - - System.out.println("Create the iOS application "); - //Create application entry in publisher - status = AppOperations.addApplication("WSO2Con-iOS", iOSApplication, true); - if (!status) { - System.out.println("Unable to create the iOS mobile application. Terminating the IoTS QSG now."); - System.exit(0); - } - System.out.println("Exit"); } } From c83049f4c4d37551a74c20d16ded21a9cd931b34 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Sun, 12 May 2019 10:19:49 +0530 Subject: [PATCH 11/18] Comment unused wso2 appm related jagerry file copying --- modules/distribution/src/assembly/bin.xml | 34 ++++---- .../conf/datasources/master-datasources.xml | 82 ++++++++++--------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index a3be24e6..2facff0d 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -451,16 +451,16 @@ - - - ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/social/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social - - - **/jaggery.conf - - + + + + + + + + + + @@ -1610,13 +1610,13 @@ 755 - - src/core/jaggeryapps/social/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social/ - - 755 - + + + + + + + diff --git a/modules/distribution/src/core/conf/datasources/master-datasources.xml b/modules/distribution/src/core/conf/datasources/master-datasources.xml index 0ce0ba70..bd21c19b 100755 --- a/modules/distribution/src/core/conf/datasources/master-datasources.xml +++ b/modules/distribution/src/core/conf/datasources/master-datasources.xml @@ -43,26 +43,27 @@ - - WSO2APPM_DB - The datasource used for App Manager database - - jdbc/WSO2APPM_DB - - - - jdbc:h2:repository/database/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - + + + + + + + + + + + + + + + + + + + + + WSO2AM_DB @@ -123,25 +124,26 @@ - - WSO2_SOCIAL_DB - The datasource used for Store social database - - jdbc/WSO2_SOCIAL_DB - - - - jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - - - + + + + + + + + + + + + + + + + + + + + + From bf90a38d1536e59d1a0004846653a3e0e155486f Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Fri, 24 May 2019 06:03:05 +0530 Subject: [PATCH 12/18] Update gitlab-ci --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b64d2455..325b874f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,3 @@ -image: maven:latest - variables: MAVEN_CLI_OPTS: "--batch-mode" MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" @@ -12,7 +10,6 @@ cache: build: stage: build script: - - 'mvn $MAVEN_CLI_OPTS test-compile' - mvn $MAVEN_CLI_OPTS clean install tags: - - OracleJDK1.8 + - OracleJDK1.8 \ No newline at end of file From 8743b9ceaf9fa6a99b390670e63cfc9b4ff8514f Mon Sep 17 00:00:00 2001 From: Madawa Soysa Date: Mon, 17 Jun 2019 15:50:16 +1000 Subject: [PATCH 13/18] Pack new request interceptor feature to the server Fixes entgra/product-iots#104 --- modules/p2-profile/iot-core-profile/pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 52116f85..dc6d39f5 100644 --- a/modules/p2-profile/iot-core-profile/pom.xml +++ b/modules/p2-profile/iot-core-profile/pom.xml @@ -154,6 +154,9 @@ 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} @@ -1036,6 +1039,10 @@ org.wso2.carbon.email.sender.feature.group ${carbon.device.mgt.version} + + io.entgra.ui.request.interceptor.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.certificate.mgt.server.feature.group ${carbon.device.mgt.version} @@ -2096,6 +2103,10 @@ org.wso2.carbon.email.sender.feature.group ${carbon.device.mgt.version} + + io.entgra.ui.request.interceptor.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.certificate.mgt.api.feature.group ${carbon.device.mgt.version} @@ -2760,6 +2771,10 @@ org.wso2.carbon.email.sender.feature.group ${carbon.device.mgt.version} + + io.entgra.ui.request.interceptor.feature.group + ${carbon.device.mgt.version} + org.wso2.carbon.certificate.mgt.server.feature.group ${carbon.device.mgt.version} From 2121f58afe0d12c0fc763f9cc3a936c4dbfbf040 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Wed, 16 Oct 2019 11:37:12 +0530 Subject: [PATCH 14/18] Fix device-mgt version range --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f2ef645..f74c72d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1530,7 +1530,7 @@ 4.0.0-SNAPSHOT - [4.0.0, 5.0.0] + [4.0.0, 5.0.0) ${project.version} From c638672d0a923b6ea341db744630585c8ef26e32 Mon Sep 17 00:00:00 2001 From: sandarudr Date: Thu, 17 Oct 2019 19:15:58 +0530 Subject: [PATCH 15/18] Change version 3.7.0 to 4.0.0 --- README.md | 10 +++++----- .../src/analytics/samples/device-plugins/pom.xml | 2 +- modules/distribution/src/assembly/filter.properties | 2 +- modules/distribution/src/core/bin/carbondump.bat | 2 +- modules/distribution/src/core/release-notes.html | 12 ++++++------ .../src/core/samples/device-plugins-deployer.xml | 2 +- modules/scripts/mobile-qsg/resources/Readme.txt | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 02b745c4..6c73ab26 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It also offers a complete and secure enterprise mobility management (EMM/MDM) so Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state. Find the online documentation at : -https://entgra-documentation.gitlab.io/v3.7.0 +https://entgra-documentation.gitlab.io/v4.0.0 ### Key Features of Entgra IoT Server @@ -53,11 +53,11 @@ https://entgra-documentation.gitlab.io/v3.7.0 * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded entgraiot-3.7.0.zip file; this will create a folder named ‘entgraiot-3.7.0’. +* Extract the downloaded entgraiot-4.0.0.zip file; this will create a folder named ‘entgraiot-4.0.0’. * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: - * entgraiot-3.7.0/bin/broker.sh [.bat] - * entgraiot-3.7.0/bin/iot-server.sh [.bat] - * entgraiot-3.7.0/bin/analytics.sh [.bat] + * entgraiot-4.0.0/bin/broker.sh [.bat] + * entgraiot-4.0.0/bin/iot-server.sh [.bat] + * entgraiot-4.0.0/bin/analytics.sh [.bat] ### How to Contribute diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml index b83c76cc..ac66dc04 100644 --- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml +++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.analytics.devicemgt-plugins analytics-devicetype-feature-installation - 3.7.0-SNAPSHOT + 4.0.0-SNAPSHOT pom Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics http://wso2.org diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 82d409b0..03a44a6f 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -18,7 +18,7 @@ product.name=Entgra IoT Server product.key=IoT -product.version=3.7.0-SNAPSHOT +product.version=4.0.0-SNAPSHOT product.doc.version=360 carbon.version=4.4.26 diff --git a/modules/distribution/src/core/bin/carbondump.bat b/modules/distribution/src/core/bin/carbondump.bat index a4929a84..6d9fbc09 100644 --- a/modules/distribution/src/core/bin/carbondump.bat +++ b/modules/distribution/src/core/bin/carbondump.bat @@ -193,6 +193,6 @@ goto end :invalidUsage echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance] -echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.7.0\ -pid 5151 +echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-4.0.0\ -pid 5151 :END diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html index f9b0317a..9854d417 100644 --- a/modules/distribution/src/core/release-notes.html +++ b/modules/distribution/src/core/release-notes.html @@ -8,14 +8,14 @@
-

Release Note - Entgra IoT Server Version 3.7.0

+

Release Note - Entgra IoT Server Version 4.0.0

-

We are pleased to announce Entgra IoT Server 3.7.0.

+

We are pleased to announce Entgra IoT Server 4.0.0.

-

Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.7.0 pays special focus to Kiosk devices and many other EMM improvements. +

Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 4.0.0 pays special focus to Kiosk devices and many other EMM improvements.

-

What's new in Entgra IoTS 3.7.0

+

What's new in Entgra IoTS 4.0.0

  • New operation to add Android/iOS application configuration
    • @@ -45,11 +45,11 @@

    Documentation

    -Documentations: Entgra IoT Server Documentation +Documentations: Entgra IoT Server Documentation

    Known Issues

    -The known set of issues this version can be found here. +The known set of issues this version can be found here.

    Engaging with Community

    diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml index 97d6fb7b..0a822b88 100644 --- a/modules/distribution/src/core/samples/device-plugins-deployer.xml +++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml @@ -27,7 +27,7 @@ 4.0.0 org.wso2.iot.devicemgt-plugins iot-devicetype-feature-installation - 3.7.0-SNAPSHOT + 4.0.0-SNAPSHOT pom Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - IoT Core http://wso2.org diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt index 14ae3bb8..1838096a 100644 --- a/modules/scripts/mobile-qsg/resources/Readme.txt +++ b/modules/scripts/mobile-qsg/resources/Readme.txt @@ -1,5 +1,5 @@ -WSO2 IoTs 3.7.0 QSG Setup Guide +WSO2 IoTs 4.0.0 QSG Setup Guide --------------------------------- 1. Start the WSO2 IoTS server From 66323230c08cd392ef6c73d49b8364cee2f5491c Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 28 Oct 2019 06:32:52 +0530 Subject: [PATCH 16/18] Modify core and plugins versions to eleased version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4b3cc529..aa16f820 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,7 +1528,7 @@ 4.7.23 - 4.0.0-SNAPSHOT + 4.0.0 [4.0.0, 5.0.0) @@ -1536,7 +1536,7 @@ ${project.version} - 5.0.0-SNAPSHOT + 5.0.0 6.2.201 From 5354dd6ecf40a68560ebd64ec6866014f36537b5 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 28 Oct 2019 22:00:56 +0530 Subject: [PATCH 17/18] Modify release note --- README.md | 10 +++++----- modules/distribution/src/core/release-notes.html | 12 ++++++------ modules/scripts/mobile-qsg/resources/Readme.txt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6c73ab26..8dcefc7c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ It also offers a complete and secure enterprise mobility management (EMM/MDM) so Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state. Find the online documentation at : -https://entgra-documentation.gitlab.io/v4.0.0 +https://entgra-documentation.gitlab.io/v3.8.0 ### Key Features of Entgra IoT Server @@ -53,11 +53,11 @@ https://entgra-documentation.gitlab.io/v4.0.0 * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded entgraiot-4.0.0.zip file; this will create a folder named ‘entgraiot-4.0.0’. +* Extract the downloaded entgraiot-3.8.0.zip file; this will create a folder named ‘entgraiot-3.8.0’. * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: - * entgraiot-4.0.0/bin/broker.sh [.bat] - * entgraiot-4.0.0/bin/iot-server.sh [.bat] - * entgraiot-4.0.0/bin/analytics.sh [.bat] + * entgraiot-3.8.0/bin/broker.sh [.bat] + * entgraiot-3.8.0/bin/iot-server.sh [.bat] + * entgraiot-3.8.0/bin/analytics.sh [.bat] ### How to Contribute diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html index 9854d417..7421acc4 100644 --- a/modules/distribution/src/core/release-notes.html +++ b/modules/distribution/src/core/release-notes.html @@ -8,14 +8,14 @@
    -

    Release Note - Entgra IoT Server Version 4.0.0

    +

    Release Note - Entgra IoT Server Version 3.8.0

    -

    We are pleased to announce Entgra IoT Server 4.0.0.

    +

    We are pleased to announce Entgra IoT Server 3.8.0.

    -

    Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 4.0.0 pays special focus to Kiosk devices and many other EMM improvements. +

    Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.8.0 pays special focus to Kiosk devices and many other EMM improvements.

    -

    What's new in Entgra IoTS 4.0.0

    +

    What's new in Entgra IoTS 3.8.0

    • New operation to add Android/iOS application configuration
      • @@ -45,11 +45,11 @@

      Documentation

      -Documentations: Entgra IoT Server Documentation +Documentations: Entgra IoT Server Documentation

      Known Issues

      -The known set of issues this version can be found here. +The known set of issues this version can be found here.

      Engaging with Community

      diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt index 1838096a..a35eca60 100644 --- a/modules/scripts/mobile-qsg/resources/Readme.txt +++ b/modules/scripts/mobile-qsg/resources/Readme.txt @@ -1,5 +1,5 @@ -WSO2 IoTs 4.0.0 QSG Setup Guide +WSO2 IoTs 3.8.0 QSG Setup Guide --------------------------------- 1. Start the WSO2 IoTS server From 4c944bc7a5019056fc61d737128ea222b6be47a0 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Mon, 28 Oct 2019 22:05:44 +0530 Subject: [PATCH 18/18] Bump device-mgt core version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa16f820..c853bb2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1528,7 +1528,7 @@ 4.7.23 - 4.0.0 + 4.1.0 [4.0.0, 5.0.0)