From c9a652e04b1ad3430a0e430c2ea585dd79fc6182 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Tue, 1 Nov 2016 20:01:06 +0530
Subject: [PATCH] Adding DAS remote location with port offset 1.

---
 modules/distribution/src/assembly/bin.xml     | 21 +++---
 .../conf/analytics/analytics-data-config.xml  | 73 +++++++++++++++++++
 2 files changed, 82 insertions(+), 12 deletions(-)
 create mode 100644 modules/distribution/src/repository/conf/analytics/analytics-data-config.xml

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 91582b37..8e6aa3d9 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -550,18 +550,6 @@
         </fileSet>
 
         <!-- Analytics related config -->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics</outputDirectory>
-            <includes>
-                <include>**/analytics-config.xml</include>
-                <include>**/rdbms-config.xml</include>
-                <include>**/analytics-data-config.xml</include>
-                <include>**/analytics-eventsink-config.xml</include>
-            </includes>
-        </fileSet>
 
         <fileSet>
             <directory>
@@ -1186,6 +1174,15 @@
         </file>
         <!-- ************* Data bridge related files end ********** -->
 
+        <!-- ************* Analytics API related files Start ********** -->
+        <file>
+            <source>src/repository/conf/analytics/analytics-data-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- ************* Analytics API related files End ********** -->
+
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties
diff --git a/modules/distribution/src/repository/conf/analytics/analytics-data-config.xml b/modules/distribution/src/repository/conf/analytics/analytics-data-config.xml
new file mode 100644
index 00000000..1520c8ef
--- /dev/null
+++ b/modules/distribution/src/repository/conf/analytics/analytics-data-config.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+
+<AnalyticsDataConfiguration>
+
+    <!--Mode can be either as LOCAL, REMOTE or AUTO. If LOCAL mode is configured the analytics api will lookup -->
+    <!--necessary services within the the same node, and will invoke then directly without going through network.-->
+    <!--But If the current node is a light weight node, and doesn't have analytics data services, -->
+    <!--then the mode should be configured as REMOTE. If AUTO mode is configured, based on the data service availability
+    it will automatically switch the mode with LOCAL and REMOTE -->
+
+    <Mode>AUTO</Mode>
+
+    <!--Note: The following parameters will be used only when the mode is configured to REMOTE.-->
+
+    <!--The URL of the analytics data service is being hosted-->
+
+    <URL>http://localhost:9764</URL>
+
+    <!-- A valid user name which have necessary permissions to use the remote services -->
+
+    <Username>admin</Username>
+
+    <!--A valid password of the user provided above. You also can use secure vault, if you don't want to configure -->
+    <!--the plain text password here.-->
+
+    <Password>admin</Password>
+
+    <!--The maximum number of connections made from this node to the remote instances to perform the operations.-->
+
+    <MaxConnections>200</MaxConnections>
+
+    <!--The maximum number of connections per given route from this node to the remote instances to perform the operations.-->
+
+    <MaxConnectionsPerRoute>200</MaxConnectionsPerRoute>
+
+    <!--The socket connection timeout when trying to connect the remote service-->
+
+    <SocketConnectionTimeout>60000</SocketConnectionTimeout>
+
+    <!--The connection timeout when trying to connect the remote service-->
+
+    <ConnectionTimeout>60000</ConnectionTimeout>
+
+    <!--The path of the trust store location, it will be used if the connection URL is in HTTPS protocol.
+    If it is not configured, and the client is running from wso2 carbon environment, then by default the trust
+    store configured from carbon.xml will be picked.-->
+
+    <!--<TrustStoreLocation>repository/resources/security/client-truststore.jks</TrustStoreLocation>-->
+
+    <!-- The password of the above mentioned trust store, it will be used if the connection URL is in HTTPS protocol.
+    If it is not configured,and the client is running from wso2 carbon environment, then by default the trust store
+    configured from carbon.xml will be picked.-->
+
+    <!--<TrustStorePassword>wso2carbon</TrustStorePassword>-->
+
+</AnalyticsDataConfiguration>