community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'newAPPM' into 'application-manager-new'

Browse Source 
Merge with upstream

See merge request entgra/product-iots!21
merge-requests/25/head
Dharmakeerthi Lasantha 5 years ago
parent 60f3fc6d37 1c8defff2c
commit e60208ffbb
10 changed files with 35 additions and 102 deletions
Show Stats Download Patch File Download Diff File

8
README.md
Unescape View File

@ -53,11 +53,11 @@ https://entgra.atlassian.net/wiki/spaces/IoTS340/overview.
* Support for SCEP protocol (encryption and authenticity) * Support for SCEP protocol (encryption and authenticity)
### How to Run ### How to Run
* Extract the downloaded entgraiot-3.4.0.zip file; this will create a folder named ‘entgraiot-3.4.0’. * Extract the downloaded entgraiot-3.6.0.zip file; this will create a folder named ‘entgraiot-3.6.0’.
* IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts: * 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.4.0/bin/broker.sh [.bat] * entgraiot-3.6.0/bin/broker.sh [.bat]
* entgraiot-3.4.0/bin/iot-server.sh [.bat] * entgraiot-3.6.0/bin/iot-server.sh [.bat]
* entgraiot-3.4.0/bin/analytics.sh [.bat] * entgraiot-3.6.0/bin/analytics.sh [.bat]
### How to Contribute ### How to Contribute

26
modules/distribution/pom.xml
Unescape View File

@ -631,32 +631,6 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution>
<!-- Creating Windows Mobile Plugin Management schema -->
<id>create-mobile-windows-plugin-mgt-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create WINDOWS Mobile plugin Management H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileWindows_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/windows/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution> <execution>
<id>3-extract-docs-from-components</id> <id>3-extract-docs-from-components</id>

2
modules/distribution/src/analytics/samples/device-plugins/pom.xml
Unescape View File

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId> <groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId>
<artifactId>analytics-devicetype-feature-installation</artifactId> <artifactId>analytics-devicetype-feature-installation</artifactId>
<version>3.4.0-SNAPSHOT</version> <version>3.6.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics</name> <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

23
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -356,20 +356,6 @@
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<!-- Copying windows-web-agent-->
<fileSet>
<directory>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/windows-web-agent
</directory>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent
</outputDirectory>
<excludes>
<exclude>**/jaggery.conf</exclude>
</excludes>
</fileSet>
<fileSet> <fileSet>
<directory> <directory>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps/ ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps/
@ -462,7 +448,7 @@
<!-- </excludes>--> <!-- </excludes>-->
<!-- </fileSet>--> <!-- </fileSet>-->
<!-- Copying Android Mutual SSL and Windows Synapse files --> <!-- Copying Android Mutual SSL Synapse files -->
<fileSet> <fileSet>
<directory> <directory>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/synapse-configs/default/api/ ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/synapse-configs/default/api/
@ -1624,13 +1610,6 @@
<!--</outputDirectory>--> <!--</outputDirectory>-->
<!--<fileMode>755</fileMode>--> <!--<fileMode>755</fileMode>-->
<!--</file>--> <!--</file>-->
<file>
<source>src/core/jaggeryapps/windows-web-agent/jaggery.conf</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/windows-web-agent/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file> <file>
<source> <source>
src/core/cloud/portal/common.css src/core/cloud/portal/common.css

2
modules/distribution/src/core/bin/carbondump.bat
Unescape View File

@ -193,6 +193,6 @@ goto end
:invalidUsage :invalidUsage
echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance] echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance]
echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.4.0\ -pid 5151 echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.6.0\ -pid 5151
:END :END

41
modules/distribution/src/core/release-notes.html
Unescape View File

@ -8,29 +8,34 @@
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/> <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
<h1>Release Note - Entgra IoT Server Version 3.5.0</h1> <h1>Release Note - Entgra IoT Server Version 3.6.0</h1>
<h2>We are pleased to announce Entgra IoT Server 3.5.0.</h2> <h2>We are pleased to announce Entgra IoT Server 3.6.0.</h2>
<p>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.5.0 pays special focus to Kiosk devices and many other EMM improvements. <p>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.6.0 pays special focus to Kiosk devices and many other EMM improvements.
</p> </p>
<h4>What's new in Entgra IoTS 3.5.0</h4> <h4>What's new in Entgra IoTS 3.6.0</h4>
<ul> <ul>
<li>Policy to install apps at device enrollment time</li> <li>Ability to add operations to groups/lists of devices</li>
<li>Policy to configure global HTTP Proxy on devices</li> <li>Install certificates in iOS and Android devices</li>
<li>Notify enrollment complete status to external systems</li> <li>Ability to add third party applictions as VPN providers for Android devices (Always on VPN)</li>
<li>QR code based Kiosk and COPE device enrollment</li> <li>Ability to measure data usage in Android Devices</li>
<li>Multi app and single app Kiosk support</li> <li>New Restrictions for Android Devices in Device Owner Mode</li>
<li>Policy for custom theming and idle timeout videos support for Kiosks</li> <li style="margin-left:2em">Disallow set wallpaper</li>
<li>User session support for Kiosk(Shared device)</li> <li style="margin-left:2em">Disallow Bluetooth</li>
<li>Remote configurable secure browser support for Kiosk</li> <li style="margin-left:2em">Disallow Bluetooth sharing</li>
<li>OpenVPN configuration policy for Android</li> <li style="margin-left:2em">Disallow data roaming</li>
<li>iOS application blacklisting and whitelisting support</li> <li style="margin-left:2em">Disallow set user icon</li>
<li>Background Enrollment triggering from external apps(iOS and Android)</li> <li style="margin-left:2em">Disallow remote management profile</li>
<li>Android TV OS support</li> <li style="margin-left:2em">Disallow remove user</li>
<li>Multiple bug fixes and improvements in UI and APIs</li> <li style="margin-left:2em">Disallow autofill</li>
<li>Improvements to Android Kiosk Mode</li>
<li>Support for iOS Kiosk Mode</li>
<li>New API to install/remove external profiles on Apple devices.</li>
<li>New API to permanently delete devices</li>
<li>New API to query devices based on device properties</li>
</ul> </ul>
<h4>Documentation</h4> <h4>Documentation</h4>
@ -39,7 +44,7 @@ Documentations: <a href='https://entgra.atlassian.net/wiki/spaces/IoTS350/overvi
<h4>Known Issues</h4> <h4>Known Issues</h4>
The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=%E2%9C%93&state=opened&milestone_title=IoT%203.5.0-GA'> here.</a> The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=%E2%9C%93&state=opened&milestone_title=IoT%203.6.0-GA'> here.</a>
<h3>Engaging with Community</h3> <h3>Engaging with Community</h3>

2
modules/distribution/src/core/samples/device-plugins-deployer.xml
Unescape View File

@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.iot.devicemgt-plugins</groupId> <groupId>org.wso2.iot.devicemgt-plugins</groupId>
<artifactId>iot-devicetype-feature-installation</artifactId> <artifactId>iot-devicetype-feature-installation</artifactId>
<version>3.4.0-SNAPSHOT</version> <version>3.6.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - IoT Core</name> <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - IoT Core</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

23
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -180,9 +180,6 @@
<!-- Device Management Plugin Features --> <!-- Device Management Plugin Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
@ -1102,10 +1099,6 @@
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
@ -2166,10 +2159,6 @@
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
@ -2583,10 +2572,6 @@
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.apimgt.application.extension.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2830,10 +2815,6 @@
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
@ -3212,10 +3193,6 @@
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.apimgt.gateway.feature.group</id> <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>

2
modules/scripts/mobile-qsg/resources/Readme.txt
Unescape View File

@ -1,5 +1,5 @@
WSO2 IoTs 3.4.0 QSG Setup Guide WSO2 IoTs 3.6.0 QSG Setup Guide
--------------------------------- ---------------------------------
1. Start the WSO2 IoTS server 1. Start the WSO2 IoTS server

8
pom.xml
Unescape View File

@ -1528,14 +1528,15 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.2.7-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>3.2.9-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.2.7-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.2.9-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
@ -1639,9 +1640,6 @@
<!-- Caramel version--> <!-- Caramel version-->
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version-->
<appmgt.feature.version>1.5.5</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.5.1</carbon.store.version> <carbon.store.version>1.5.1</carbon.store.version>

Write Preview
Loading…
Cancel
Save