diff --git a/README.md b/README.md index 02b745c4..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/v3.7.0 +https://entgra-documentation.gitlab.io/v3.8.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-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-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-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/pom.xml b/modules/distribution/pom.xml index 6d67f3b0..898c78f8 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -562,76 +562,76 @@ - + - + - - - create-JAGH2-schema - package - - run - - - - - - - - - - - - - - - - - - - - - - - - - - create-social-db-schema - package - - run - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + create-mobile-android-plugin-mgt-schema 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/bin.xml b/modules/distribution/src/assembly/bin.xml index 13505d10..be2899fb 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -388,36 +388,36 @@ - - - ../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/ - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store - - - storeLogo/** - storeSite/** - base-page/** - login/** - styles-layout.css - **/jaggery.conf - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -437,16 +437,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 - - + + + + + + + + + + @@ -1373,12 +1373,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 @@ -1419,10 +1413,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 @@ -1586,13 +1580,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 @@ -1602,20 +1596,20 @@ 755 - - src/core/jaggeryapps/social/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social/ - - 755 - - - src/core/jaggeryapps/store/jaggery.conf - - ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store/ - - 755 - + + + + + + + + + + + + + + src/core/cloud/portal/common.css @@ -1680,14 +1674,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 @@ -1696,14 +1690,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/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/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 - - - - - 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 - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html index f9b0317a..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 3.7.0

+

Release Note - Entgra IoT Server Version 3.8.0

-

We are pleased to announce Entgra IoT Server 3.7.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 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 3.8.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 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/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/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml index 9c275038..b57634a5 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} @@ -451,49 +454,67 @@ - - 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.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} - - + + @@ -909,62 +930,86 @@ - - 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.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} - - + + @@ -991,6 +1036,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} @@ -1989,44 +2038,18 @@ ${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.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} - - + + @@ -2073,6 +2096,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} @@ -2260,10 +2287,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} @@ -2639,49 +2666,64 @@ 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.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} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2714,6 +2756,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} diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt index 14ae3bb8..a35eca60 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 3.8.0 QSG Setup Guide --------------------------------- 1. Start the WSO2 IoTS server 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"); } } diff --git a/pom.xml b/pom.xml index 8bbc88d9..c853bb2c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ modules/cxf-filters modules/p2-profile modules/distribution - modules/integration + @@ -1269,7 +1269,7 @@ javax.servlet - servlet-api + javax.servlet-api ${servlet-api.version} @@ -1528,14 +1528,15 @@ 4.7.23 - 3.2.15 - [3.1.0, 4.0.0) + 4.1.0 + + [4.0.0, 5.0.0) ${project.version} - 4.2.13 + 5.0.0 6.2.201 @@ -1556,7 +1557,7 @@ 7.0.85.wso2v1 7.0.34.wso2v2 7.0.85.wso2v1 - 2.4 + 4.0.1 1.6.1-wso2v12 @@ -1639,9 +1640,6 @@ 1.0.1 - - 1.5.7 - 1.5.1