From 6e26569310c6240896f8722ad18f2fea06b9f7c9 Mon Sep 17 00:00:00 2001
From: sameeram <mgjaye@gmail.com>
Date: Tue, 26 May 2015 02:20:11 +0530
Subject: [PATCH] Fix to allow tenants to log in

---
 modules/distribution/pom.xml                               | 6 +++---
 .../src/repository/conf/datasources/master-datasources.xml | 2 +-
 modules/p2-profile-gen/pom.xml                             | 7 +++++++
 pom.xml                                                    | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 4f33e5e3..897b089f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -200,15 +200,15 @@
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
-                                    <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/application-mgt/h2.sql" />
+                                    <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql" />
                                 </sql>
-                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                <!--sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
                                     <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql" />
 
-                                </sql>
+                                </sql-->
                                 <echo message="##################### END ########################" />
                             </target>
                         </configuration>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index fa4afb2f..7f0f3783 100644
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -35,7 +35,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index be635de6..2cc5af14 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -281,6 +281,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.feature:${carbon.multitenancy.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.usage.agent.feature:${carbon.multitenancy.version}
                                 </featureArtifactDef>
@@ -596,6 +599,10 @@
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
diff --git a/pom.xml b/pom.xml
index 8af717bd..2a923ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -609,12 +609,12 @@
         <automation.utils.version>4.3.0</automation.utils.version>
 
         <!--repo versions-->
-        <carbon.commons.version>4.4.1</carbon.commons.version>
+        <carbon.commons.version>4.4.3</carbon.commons.version>
         <carbon.registry.version>4.4.1</carbon.registry.version>
         <carbon.governance.version>4.4.0</carbon.governance.version>
         <carbon.deployment.version>4.4.0</carbon.deployment.version>
-        <carbon.identity.version>4.4.0</carbon.identity.version>
-        <carbon.multitenancy.version>4.4.0</carbon.multitenancy.version>
+        <carbon.identity.version>4.5.0</carbon.identity.version>
+        <carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
 
         <operadriver.version>0.8.1</operadriver.version>
         <selenium.version>2.40.0</selenium.version>