From 3d69503e96e1c3d68b1f9b1c6d50fb9503091c05 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Wed, 20 May 2015 14:25:17 +0530
Subject: [PATCH] Merged

---
 .../carbon/device/mgt/core/util/DeviceManagerUtil.java    | 2 +-
 .../src/main/resources/conf/user-api-publisher-config.xml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
index 308ed6813f..126d60b543 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
@@ -179,7 +179,7 @@ public final class DeviceManagerUtil {
                 getURITemplates(config.getEndpoint(), APIConstants.AUTH_APPLICATION_OR_USER_LEVEL_TOKEN));
         api.setVisibility(APIConstants.API_GLOBAL_VISIBILITY);
         api.addAvailableTiers(provider.getTiers());
-        api.setEndpointSecured(false);
+        api.setEndpointSecured(true);
         api.setStatus(APIStatus.PUBLISHED);
         api.setTransports(config.getTransports());
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
index 12a46052c0..f252dcb019 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
@@ -50,5 +50,13 @@
             <Endpoint>http://localhost:9763/operations</Endpoint>
             <Transports>http,https</Transports>
         </API>
+        <API>
+            <Name>deviceList</Name>
+            <Owner>admin</Owner>
+            <Context>devices</Context>
+            <Version>1.0.0</Version>
+            <Endpoint>http://localhost:9763/devices</Endpoint>
+            <Transports>http,https</Transports>
+        </API>
     </APIs>
 </APIPublisherConfig>