From 0a1d8c91e6bc7a2fb98a2582b2431a5f05f6b53b Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Mon, 9 Oct 2017 17:58:03 +0530
Subject: [PATCH] Add oauth http publisher

---
 .../src/analytics/conf/output-adapter-change.xml | 16 +++++++++++++++-
 modules/p2-profile/analytics-profile/pom.xml     | 13 ++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml
index 89d97b19..87fe69b7 100644
--- a/modules/distribution/src/analytics/conf/output-adapter-change.xml
+++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml
@@ -2,7 +2,21 @@
 	<!-- Add outpu event adapter config element -->
 	<add>
 		<after>/outputEventAdaptersConfig/adapterConfig[@type="websocket"]</after>
-		<value><![CDATA[<adapterConfig type="oauth-mqtt">
+		<value><![CDATA[<adapterConfig type="oauth-http">
+      <!-- Thread Pool Related Properties -->
+        <property key="minThread">8</property>
+        <property key="maxThread">100</property>
+        <property key="keepAliveTimeInMillis">20000</property>
+        <property key="jobQueueSize">10000</property>
+        <property key="connectionKeepAliveInterval">60</property>
+        <property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
+        <property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
+        <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+        <property key="username">admin</property>
+		<property key="password">admin</property>
+    </adapterConfig>
+
+    <adapterConfig type="oauth-mqtt">
       <!-- Thread Pool Related Properties -->
         <property key="minThread">8</property>
         <property key="maxThread">100</property>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 33061356..15804c16 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -400,9 +400,12 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.devicegroup.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
-								</featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                                 <!-- GPL Siddhi Extension Script for Geo Fencing -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
@@ -854,6 +857,10 @@
                                     <id>org.wso2.extension.siddhi.devicegroup.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
 
 								<!--android sense analytics feature-->
 								<feature>