From cb1a3d462d419da5935fc6afb44e5379e03b676b Mon Sep 17 00:00:00 2001
From: susinda <susinda@wso2.com>
Date: Mon, 30 Jan 2017 10:05:26 +0530
Subject: [PATCH] ios policy addition moved to bottom, passwords changed

---
 .../mobile-qsg/resources/mobile-qsg.jar       | Bin 1429267 -> 1429265 bytes
 .../java/org/wso2/mdm/qsg/QSGExecutor.java    |  19 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/core/scripts/mobile-qsg/resources/mobile-qsg.jar b/modules/core/scripts/mobile-qsg/resources/mobile-qsg.jar
index accbc96385f40a1d52f0bab7d61c833092178395..1da25ffe107a58d5536458b9b65463b48880ea96 100644
GIT binary patch
delta 2870
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

delta 2863
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

diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java b/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java
index 2e5be085..240e84b9 100644
--- a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java
+++ b/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java
@@ -31,11 +31,11 @@ import java.util.*;
 public class QSGExecutor {
 
     private static String iotAdminUser= "chris";
-    private static String iotAdminPassword = "chris@IoTS";
+    private static String iotAdminPassword = "chrisadmin";
     private static String iotAdminEmail = "chris@mobx.com";
 
     private static String iotMobileUser = "alex";
-    private static String iotMobileUserPassword = "alex@IoTS";
+    private static String iotMobileUserPassword = "alexuser";
     private static String roleName = "iotMobileUser";
 
     public static void main(String[] args) {
@@ -112,12 +112,7 @@ public class QSGExecutor {
             System.out.println("Unable to create the windows passcode policy. Terminating the IoTS QSG now.");
             System.exit(0);
         }
-        //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);
-        }
+
 
         System.out.println("Upload the android application ");
         //Upload the android application
@@ -143,7 +138,15 @@ public class QSGExecutor {
             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");