From a91dd73b908bf5c4629c90d4e71e2136c7d864ba Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sun, 12 Jul 2015 04:10:59 +0530
Subject: [PATCH] bam and analytics corrections

---
 modules/distribution/pom.xml                     |   8 +++++++-
 modules/distribution/src/assembly/bin.xml        |   9 +++++++++
 .../repository/jaggeryapps/iot/api/stats-api.jag |   2 +-
 .../jaggeryapps/iotserver/api/stats-api.jag      |   2 +-
 .../src/statistics/IOT_Analytics.tbox            | Bin 0 -> 5405 bytes
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 modules/distribution/src/statistics/IOT_Analytics.tbox

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 625a7f70..9b6cb6fc 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -404,13 +404,19 @@
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps" />
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches" />
-                                
+
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics" />
+
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
                                     <fileset dir="src/repository/jaggeryapps"></fileset>
                                 </copy>
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches" overwrite="true">
                                     <fileset dir="src/sketches" />
                                 </copy>
+
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics" overwrite="true">
+                                    <fileset dir="src/statistics" />
+                                </copy>
                                 <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 267f8312..2ef68f35 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -424,6 +424,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!--        <file>
                     <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
                     </source>
diff --git a/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag
index 951d752c..5fec123a 100644
--- a/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iot/api/stats-api.jag
@@ -27,7 +27,7 @@ var dcProps = require('/config/dc-props.js').config();
 var utility = require("/modules/utility.js").utility;
 
 var result;
-var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.devicecloud.usage.statistics.IoTUsageStatisticsClient;
+var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.analytics.statistics.IoTUsageStatisticsClient;
 
 if (uriMatcher.match("/{context}/api/stats")) {
 
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
index bcd3e72c..95d29d05 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
@@ -27,7 +27,7 @@ var dcProps = require('/config/dc-props.js').config();
 var utility = require("/modules/utility.js").utility;
 
 var result;
-var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.devicecloud.usage.statistics.IoTUsageStatisticsClient;
+var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.analytics.statistics.IoTUsageStatisticsClient;
 
 if (uriMatcher.match("/{context}/api/stats")) {
 
diff --git a/modules/distribution/src/statistics/IOT_Analytics.tbox b/modules/distribution/src/statistics/IOT_Analytics.tbox
new file mode 100644
index 0000000000000000000000000000000000000000..bcf83b9627ee4b4833bee4fbb5fa1348d076df8b
GIT binary patch
literal 5405
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
V7Yv*o;7d^8#}7EGK}WIg{s#reH=h6i

literal 0
HcmV?d00001