Merge branch 'master' of https://github.com/wso2/product-iots

modules/distribution/src/assembly/bin.xml

@@ -72,6 +72,7 @@
                 <exclude>**/registry.xml</exclude>
                 <exclude>**/client-truststore.jks</exclude>
                 <exclude>**/wso2carbon.jks</exclude>
+                <exclude>**/wso2carbon.jks</exclude>
                 <exclude>**/WSO2AM_DB.h2.db</exclude>
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/lib/httpmime*</exclude>
@@ -253,6 +254,7 @@
                 <exclude>**/web-apps/**</exclude>
                 <exclude>**/appm-tenant-conf.xml</exclude>
 				<exclude>**/client-truststore.jks</exclude>
+				<exclude>**/wso2carbon.jks</exclude>
             </excludes>
 
         </fileSet>
@@ -326,6 +328,7 @@
             </outputDirectory>
 			<excludes>
 				<exclude>**/client-truststore.jks</exclude>
+				<exclude>**/wso2carbon.jks</exclude>
 			</excludes>
         </fileSet>
 
@@ -695,6 +698,7 @@
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
 				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
+				<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -978,6 +982,7 @@
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/dbscripts</exclude>
 				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
+				<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -1615,6 +1620,7 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
+
         <file>
             <source>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
@@ -1967,6 +1973,21 @@
 			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
 			<fileMode>644</fileMode>
 		</file>
+        <file>
+            <source>src/core/resources/security/wso2carbon.jks</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/resources/security/wso2carbon.jks</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/resources/security/wso2carbon.jks</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
 		<!--End-->
     </files>
 </assembly>

modules/distribution/src/core/README

@@ -28,15 +28,7 @@ Running the IoT server
    password : admin
 5. Navigate to https://localhost:9443/api-store to see the available device APIs. You can subscribe to these APIs with the default application (or by creating a new application).
    In the API Store, go to my subscriptions and locate the client ID and secret, which can be used to invoke these APIs.
-
+   
-
-Running other runtimes individually (Analytics, Broker)
-========================================================
-1. Extract wso2iot-@product.version@.zip and go to the extracted directory.
-2. Go to wso2iot-@product.version@/wso2 directory.
-3. Go to appropriate runtime directory (analytics/broker) /bin.
-4. Execute wso2server.sh or wso2server.bat.
-3. Access the url related to the required runtime. (For example, use https://localhost:9445/carbon for the analytics runtime.)
 
 Running all runtimes (IoT, Analytics, Broker)
 ==================================================================
@@ -191,4 +183,4 @@ We are committed to ensuring that your enterprise middleware deployment is compl
 For additional support information please refer to http://wso2.com/support/
 
 ---------------------------------------------------------------------------
-(c) Copyright 2017 WSO2 Inc.
+(c) Copyright 2017 WSO2 Inc.

modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml

@@ -36,7 +36,7 @@
 	</ProvisioningConnectorConfigs>
 	<!--<DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>-->
 	<ClaimConfig></ClaimConfig>
-	<Certificate>MIIDSTCCAjGgAwIBAgIERUubMzANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzAzMjEwOTEzMDdaFw0xNzA2MTkwOTEzMDdaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu8lfLCQV2hbiz8OGA8baKI1E1cgE/QLKefa4Od2G2KextaAwSESr5ICakVX8w6tU5+IhKYQQKt9U3/U0ae9tXf04g6iWh0dRllsr9mOgjSZxQK09/ygUsFH8syL5aD3heRUYzJWZ/KOsd57BXuI2QZnuEjN0g0+5jNvnswfwD/tM01totaJpI3xN+2JZsaBRCc0G5yA/pdW83Aa4IE30EL57wkK7u8YDl3UTcmi+HO74XQmK1VEqSnA+/mFo3M16cRlm2PTZ2Z1E5gd4j+5sV1P5v63uqyFniEU0zPXforBb06pgSBoIRQBintSSDyEmyuVzW0pc2eYC5Dhfgk337QIDAQABoyEwHzAdBgNVHQ4EFgQU4lneZCvKn04NH5DtJItdRXdXankwDQYJKoZIhvcNAQELBQADggEBAEnCNr0JEcAxtF/ypwGgFu1rYOv3i02PB4jDWbFj8s58l1zF1tMr480khVX4d3AmLjsUpvV+Jg83JFIk1rJFLEb48EFv0nJ/G7pTQrCypNKozyuyLzx5UvKNFBMmnGvkHVqt6j4MSiOjnRdlo7ofDluA/umSkSf/VmsOIZ+5610pCJpahnPUkb8GYK0HcwNV2NLU/0X4nSjKjGwWYv0tX8XW8RwJKb/r0GDehA8PESi76XOVrpXSjP9WPK8XaK//8B0SH3hm0xpzmSQYgtkNQwP2MqBe/ZEUuKxrn3pP6oxo9RxeSIQ8dTLiBA/mcsBmAlpQPPi0LqqDKpkyHt8Ar2w=</Certificate>
+	<Certificate>MIIDSTCCAjGgAwIBAgIEAoLQ/TANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzA3MTkwNjUyNTFaFw0yNzA3MTcwNjUyNTFaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAluZFdW1ynitztkWLC6xKegbRWxky+5P0p4ShYEOkHs30QI2VCuR6Qo4Bz5rTgLBrky03W1GAVrZxuvKRGj9V9+PmjdGtau4CTXu9pLLcqnruaczoSdvBYA3lS9a7zgFU0+s6kMl2EhB+rk7gXluEep7lIOenzfl2f6IoTKa2fVgVd3YKiSGsyL4tztS70vmmX121qm0sTJdKWP4HxXyqK9neolXI9fYyHOYILVNZ69z/73OOVhkh/mvTmWZLM7GM6sApmyLX6OXUp8z0pkY+vT/9+zRxxQs7GurC4/C1nK3rI/0ySUgGEafO1atNjYmlFN+M3tZX6nEcA6g94IavyQIDAQABoyEwHzAdBgNVHQ4EFgQUtS8kIYxQ8UVvVrZSdgyide9OHxUwDQYJKoZIhvcNAQELBQADggEBABfk5mqsVUrpFCYTZZhOxTRRpGXqoW1G05bOxHxs42Paxw8rAJ06Pty9jqM1CgRPpqvZa2lPQBQqZrHkdDE06q4NG0DqMH8NT+tNkXBe9YTre3EJCSfsvswtLVDZ7GDvTHKojJjQvdVCzRj6XH5Truwefb4BJz9APtnlyJIvjHk1hdozqyOniVZd0QOxLAbcdt946chNdQvCm6aUOputp8Xogr0KBnEy3U8es2cAfNZaEkPU8Va5bU6Xjny8zGQnXCXxPKp7sMpgO93nPBt/liX1qfyXM7xEotWoxmm6HZx8oWQ8U5aiXjZ5RKDWCCq4ZuXl6wVsUz1iE61suO5yWi8=</Certificate>
 	<PermissionAndRoleConfig></PermissionAndRoleConfig>
 	<JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
 </IdentityProvider>

modules/distribution/src/core/release-notes.html

@@ -12,16 +12,16 @@
 
 <h2>We are pleased to announce WSO2 IoT Server 3.1.0.</h2>
 
-<p>WSO2 IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as wellas rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build.</p>
+<p>WSO2 IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as well as rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build. </p>
 
-<p>These capabilities involve device management, Smart Analytics, API/App management for devices, transport extensions for MQTT, XMPP and many more.</p>
+<p>These capabilities involve device management, smart analytics, API and app management for devices, transport extensions for MQTT, XMPP and many more.</p>
 
 <h4>What's new in WSO2 IoTS 3.1.0</h4>
 
 <ul>
-  <li>Complete API driven device type definition eliminating the necessity to create deployable plugins</li>
+  <li>A complete API-driven device type definition eliminating the necessity to create deployable plugins</li>
-  <li>Geo-fencing and alerting as a reusable functionality</li>
+  <li>Support for location based services such as Geofencing and alerting as a reusable functionality</li>
-  <li>Redesigned device overview page for better user experience</li>
+  <li>A redesigned device overview page for better user experience</li>
   <li>Improved product profiles for scalable deployment</li>
   <li>Performance enhancements</li>
   <li>Enhancements to prebuilt agents</li>

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java

@@ -86,7 +86,7 @@ public class MobileQSGTestCase extends TestBase {
                 Constants.APPLICATION_JSON, accessTokenString);
         HttpResponse response = appManagerRestClient.get(Constants.QSGManagement.GET_MOBILE_APPS_ENDPONT);
         Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        Assert.assertTrue(response.getData().contains("Con-App-Android"),
+        Assert.assertTrue(response.getData().contains("WSO2Con-Android"),
                 "Con-App-Android addition through script is not successful");
     }
 

modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java

@@ -132,7 +132,7 @@ public class QSGExecutor {
 
         System.out.println("Create the android application ");
         //Create application entry in publisher
-        status = AppOperations.addApplication("Con-App-Android", application, true);
+        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);
@@ -160,7 +160,7 @@ public class QSGExecutor {
 
         System.out.println("Create the iOS application ");
         //Create application entry in publisher
-        status = AppOperations.addApplication("WSO2Con", iOSApplication, true);
+        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);

pom.xml

@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.45</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.49</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-	    <carbon.device.mgt.plugin.version>4.0.39</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.40</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.95</carbon.api.mgt.version>