From 2ca214975cea7afcbf75dae1cc9e4308f7959ffc Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 9 Jun 2015 12:20:37 +0530
Subject: [PATCH] few changes to resolve the error on bam config

---
 .../conf/datasources/master-datasources.xml     |   9 +++++----
 .../repository/database/WSO2MobileDM_DB.h2.db   | Bin 45056 -> 0 bytes
 2 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 modules/distribution/src/repository/database/WSO2MobileDM_DB.h2.db

diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 3b4f35cf..602de15b 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -201,7 +201,7 @@
         </datasource>
 
         <!-- *****Replace ${BAM_HOME} in `url` element with your WSO2 BAM home directory.***** -->
-        <!--datasource>
+        <datasource>
             <name>WSO2IOT_STATS_DB</name>
             <jndiConfig>
             <name>jdbc/WSO2IOT_STATS_DB</name>
@@ -209,7 +209,8 @@
             <description>The datasource used for analyzer data</description>
             <definition type="RDBMS">
             <configuration>
-                <url>jdbc:h2:${BAM_HOME}/repository/database/IOT_STATS_DB;AUTO_SERVER=TRUE</url>
+                <url>jdbc:h2:$/repository/database/IOT_STATS_DB;AUTO_SERVER=TRUE</url>
+                <!--url>jdbc:h2:${BAM_HOME}/repository/database/IOT_STATS_DB;AUTO_SERVER=TRUE</url-->
                 <username>wso2carbon</username>
                 <password>wso2carbon</password>
                 <driverClassName>org.h2.Driver</driverClassName>
@@ -220,7 +221,7 @@
                 <validationInterval>30000</validationInterval>
             </configuration>
             </definition>
-        </datasource-->
-        
+        </datasource>
+
     </datasources>
 </datasources-configuration>
diff --git a/modules/distribution/src/repository/database/WSO2MobileDM_DB.h2.db b/modules/distribution/src/repository/database/WSO2MobileDM_DB.h2.db
deleted file mode 100644
index 45be40b9a9201ce27e9b08e30f7cb4d91ff067df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45056
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
U8~h*vB!C2v01`j~A1wm^2RHMpi2wiq