From f9fb51b671643e9e88519f4ac322bff00a575804 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Fri, 23 Jun 2017 17:21:13 +0530
Subject: [PATCH 1/3] Updating the qsg script out dated readme.

---
 .../scripts/mobile-qsg/resources/Readme.txt    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt
index 64ce0ece..76c1494c 100644
--- a/modules/scripts/mobile-qsg/resources/Readme.txt
+++ b/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,
-+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.
\ No newline at end of file
+4. There will be two users getting created once you ran the script with user name 'chris' and 'alex'.
+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.
\ No newline at end of file

From ff6642b5ba4daa2d13263ebb0ff520c5ab2115a9 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Fri, 23 Jun 2017 17:23:49 +0530
Subject: [PATCH 2/3] Adding the executable permission for the mobile qsg
 script.

---
 modules/distribution/src/assembly/bin.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 00d9372a..967980a0 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/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

From c69f74ad2bc8fabe1c9a89b51e341a918b8ba279 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Fri, 23 Jun 2017 18:13:44 +0530
Subject: [PATCH 3/3] Updating the source/target JDK versions to 1.8.

---
 .../src/core/samples/connectedcup/component/agent/pom.xml     | 4 ++--
 .../src/core/samples/connectedcup/component/api/pom.xml       | 4 ++--
 .../src/core/samples/connectedcup/component/plugin/pom.xml    | 4 ++--
 pom.xml                                                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml
index 2a6ad992..14540069 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml
+++ b/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>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml
index b248b5cb..4516a402 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml
+++ b/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>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
                 <version>2.3.2</version>
             </plugin>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
index 74f686b8..4236a15b 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
+++ b/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>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 				<version>2.3.2</version>
 			</plugin>
diff --git a/pom.xml b/pom.xml
index 76de4c11..baaf4a15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1694,8 +1694,8 @@
                 <version>2.3.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>