From 8ce4538d2754ab8c343367b191596179c296589f Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Fri, 10 Mar 2017 11:23:08 +0530
Subject: [PATCH] Fixing the CARBON_DB location issue in the analytics profile.

---
 modules/distribution/src/analytics/conf/ds_config.xml | 2 +-
 modules/distribution/src/assembly/bin.xml             | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/distribution/src/analytics/conf/ds_config.xml b/modules/distribution/src/analytics/conf/ds_config.xml
index 08649d4b..3f0d90f4 100644
--- a/modules/distribution/src/analytics/conf/ds_config.xml
+++ b/modules/distribution/src/analytics/conf/ds_config.xml
@@ -8,7 +8,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
+                    <url>jdbc:h2:../../repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 67bcee2c..8cf318e8 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -669,13 +669,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/database</outputDirectory>
         </fileSet>
 
-        <fileSet>
-            <directory>
-                ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/database</outputDirectory>
-        </fileSet>
-
         <fileSet>
             <directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/lib</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/lib</outputDirectory>
@@ -817,7 +810,7 @@
                 <exclude>**/.data</exclude>
                 <exclude>**/.settings</exclude>
                 <exclude>features/**</exclude>
-                <!--<exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>-->
+                <exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
             </excludes>
         </fileSet>