Merge pull request #1052 from sinthuja/origin-master

Fixing the mobile qsg issues and target/source jdk version.

modules/distribution/src/assembly/bin.xml

@@ -575,6 +575,9 @@
             <includes>
                 <include>**/**</include>
             </includes>
+            <excludes>
+                <exclude>**/*.sh*</exclude>
+            </excludes>
         </fileSet>
 
         <!-- Files required to mobile-qsg -->
@@ -1590,6 +1593,13 @@
                 ${pom.artifactId}-${pom.version}/samples/mobile-qsg
             </outputDirectory>
         </file>
+        <file>
+            <source>../scripts/mobile-qsg/resources/mobile-qsg.sh</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/samples/mobile-qsg
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
         <file>
             <source>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml

modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml

@@ -69,8 +69,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
+          <source>1.8</source>
-          <target>1.6</target>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>

modules/distribution/src/core/samples/connectedcup/component/api/pom.xml

@@ -145,8 +145,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
+                    <source>1.8</source>
-                    <target>1.7</target>
+                    <target>1.8</target>
                 </configuration>
                 <version>2.3.2</version>
             </plugin>

modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml

@@ -43,8 +43,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.7</source>
+					<source>1.8</source>
-					<target>1.7</target>
+					<target>1.8</target>
 				</configuration>
 				<version>2.3.2</version>
 			</plugin>

modules/scripts/mobile-qsg/resources/Readme.txt

@@ -1,7 +1,19 @@
-    IoTs 3.1.0 QSG Setup guide
+
+WSO2 IoTs 3.1.0 QSG Setup Guide
+---------------------------------
 
 1. Start the WSO2 IoTS server
 2. Navigate to <IoTS_HOME>/core/samples/mobile-qsg/ directory using the terminal.
 3. Once server is started execute the mobile-qsg.sh script
-4. Then login to the https://<your-server>:9443/devicemgt/ and use the username,password as alex alex@IoTS,
+4. There will be two users getting created once you ran the script with user name 'chris' and 'alex'.
-+Note that for this sample we have configured above user from the script. If you want to run this script again you have to login as admin and remove the user alex, chris and role iotMobileUser from the IoT Server.
+5. Then login to the https://<your-server>:9443/devicemgt/ and use the username/password of chris/alex.
+6. User chris will be having admin role, and you can login as chris with below details.
+   username: chris
+   password: chrisadmin
+5. Alex will be restricted user, and he has permission to only enrol a device. You can login as alex with below details.
+   username: alex
+   password: alexuser
+
+Note:
+For this sample we have configured above user from the script. If you want to run this script again you have to login as
+admin and remove the user alex, chris and role iotMobileUser from the IoT Server.

pom.xml

@@ -1694,8 +1694,8 @@
                 <version>2.3.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.7</source>
+                    <source>1.8</source>
-                    <target>1.7</target>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>