From 78475963e3ac9ad06b784e194b9761dd10c31a21 Mon Sep 17 00:00:00 2001
From: GPrathap <geesara@wso2.com>
Date: Wed, 25 May 2016 14:38:46 +0530
Subject: [PATCH 1/2] added entry for websocket url

---
 .../main/resources/jaggeryapps/devicemgt/app/conf/config.json   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 7a3920667c..bef0d5884f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -4,6 +4,8 @@
   "apiContext" : "api",
   "httpsURL" : "%https.ip%",
   "httpURL" : "%http.ip%",
+  "wssURL" : "%https.ip%",
+  "wsURL" : "%http.ip%",
   "enrollmentDir": "/emm-web-agent/enrollment",
   "iOSConfigRoot" : "%https.ip%/ios-enrollment/",
   "iOSAPIRoot" : "%https.ip%/ios/",

From c9c0a754305872e5c4840e8ba333c940058de075 Mon Sep 17 00:00:00 2001
From: GPrathap <geesara@wso2.com>
Date: Wed, 25 May 2016 14:39:59 +0530
Subject: [PATCH 2/2] added  a bundleDef :net.minidev:json-smart

---
 .../pom.xml                                                    | 3 +++
 pom.xml                                                        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
index 925de55455..82a384b647 100644
--- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
+++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
@@ -102,6 +102,9 @@
                                 <bundleDef>
                                     org.wso2.orbit.com.nimbusds:nimbus-jose-jwt:${nimbus.orbit.version}
                                 </bundleDef>
+                                <bundleDef>
+                                    net.minidev:json-smart:${json.smart.version}
+                                </bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
diff --git a/pom.xml b/pom.xml
index 7ad4fc14b7..1ac139acd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1821,6 +1821,7 @@
         <nimbus.orbit.version>2.26.1.wso2v3</nimbus.orbit.version>
 
         <commons-json.version>2.0.0.wso2v1</commons-json.version>
+        <json.smart.version>1.3</json.smart.version>
         <google.gson.version>2.3.1</google.gson.version>
         <jsr311.version>1.1.1</jsr311.version>
         <commons.logging.version>1.2</commons.logging.version>