From 2313928741e503a31624504dc82805283ae977a3 Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Wed, 22 Nov 2017 22:52:11 +0530
Subject: [PATCH] Add remote control configurations as remove unused methods

---
 .../session/RemoteSessionConfiguration.java   | 26 +++++--------------
 .../repository/conf/cdm-config.xml            |  3 +--
 .../src/main/resources/conf/cdm-config.xml    | 15 +++++++++++
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/remote/session/RemoteSessionConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/remote/session/RemoteSessionConfiguration.java
index 426e2db3080..4c97ce9213b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/remote/session/RemoteSessionConfiguration.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/remote/session/RemoteSessionConfiguration.java
@@ -33,8 +33,7 @@ public class RemoteSessionConfiguration {
     private int maxTotalHTTPConnections;
     private int maxMessagesPerSecond;
     private int sessionIdleTimeOut;
-    private int maxSessionDuration;
-    private int sessionBufferSize;
+    private int maxMessageBufferSize;
 
     public void setRemoteSessionServerUrl(String remoteSessionServerUrl) {
         this.remoteSessionServerUrl = remoteSessionServerUrl;
@@ -113,30 +112,17 @@ public class RemoteSessionConfiguration {
         this.sessionIdleTimeOut = sessionIdleTimeOut;
     }
 
-    /**
-     * Maximum session duration in minutes
-     * @return
-     */
-    @XmlElement(name = "MaximumSessionDuration", required = true, defaultValue = "15")
-    public int getMaxSessionDuration() {
-        return maxSessionDuration;
-    }
-
-    public void setMaxSessionDuration(int maxSessionDuration) {
-        this.maxSessionDuration = maxSessionDuration;
-    }
-
     /**
      * Maximum session buffer size in kilo bytes
      * @return
      */
-    @XmlElement(name = "SessionBufferSize", required = true, defaultValue = "640")
-    public int getSessionBufferSize() {
-        return sessionBufferSize;
+    @XmlElement(name = "MaximumMessageBufferSize", required = true, defaultValue = "640")
+    public int getMaxMessageBufferSize() {
+        return maxMessageBufferSize;
     }
 
-    public void setSessionBufferSize(int sessionBufferSize) {
-        this.sessionBufferSize = sessionBufferSize;
+    public void setMaxMessageBufferSize(int MaxMessageBufferSize) {
+        this.maxMessageBufferSize = MaxMessageBufferSize;
     }
 }
 
diff --git a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 18f2ad56ba5..bc48130dd52 100644
--- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -103,8 +103,7 @@
         <MaximumTotalHTTPConnections>100</MaximumTotalHTTPConnections>
         <MaximumMessagesPerSecond>20</MaximumMessagesPerSecond>
         <SessionIdleTimeOut>15</SessionIdleTimeOut>
-        <MaximumSessionDuration>60</MaximumSessionDuration>
-        <SessionBufferSize>640</SessionBufferSize>
+        <MaximumMessageBufferSize>640</MaximumMessageBufferSize>
     </RemoteSessionConfiguration>
     <DefaultGroupsConfiguration>BYOD,COPE</DefaultGroupsConfiguration>
 </DeviceMgtConfiguration>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
index 518edb4d8d3..a609215f287 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
@@ -46,6 +46,11 @@
         <AdminUsername>admin</AdminUsername>
         <AdminPassword>admin</AdminPassword>
     </IdentityConfiguration>
+    <KeyManagerConfiguration>
+        <ServerUrl>https://localhost:9443</ServerUrl>
+        <AdminUsername>admin</AdminUsername>
+        <AdminPassword>admin</AdminPassword>
+    </KeyManagerConfiguration>
     <PolicyConfiguration>
         <MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
         <MonitoringEnable>true</MonitoringEnable>
@@ -91,6 +96,16 @@
         <isEnabled>false</isEnabled>
         <PublishOperationResponse>false</PublishOperationResponse>
     </OperationAnalyticsConfiguration>
+    <!--This configuration used to configure the options for remote device control feature -->
+    <RemoteSessionConfiguration>
+        <Enabled>true</Enabled>
+        <RemoteSessionServerUrl>wss://localhost:9443</RemoteSessionServerUrl>
+        <MaximumHTTPConnectionPerHost>2</MaximumHTTPConnectionPerHost>
+        <MaximumTotalHTTPConnections>100</MaximumTotalHTTPConnections>
+        <MaximumMessagesPerSecond>20</MaximumMessagesPerSecond>
+        <SessionIdleTimeOut>15</SessionIdleTimeOut>
+        <MaximumMessageBufferSize>640</MaximumMessageBufferSize>
+    </RemoteSessionConfiguration>
     <DefaultGroupsConfiguration>BYOD,COPE</DefaultGroupsConfiguration>
 </DeviceMgtConfiguration>