Repository: karaf Updated Branches: refs/heads/master 5bdbfa6bf -> 75cf819c9
[KARAF-3713] Fix username property in the JDBC generic datasource Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/75cf819c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/75cf819c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/75cf819c Branch: refs/heads/master Commit: 75cf819c94776b3ab2507b9c0861fdfb4dbdea1d Parents: 5bdbfa6 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed May 6 20:42:38 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed May 6 20:42:38 2015 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/jdbc/internal/datasource-generic.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/75cf819c/jdbc/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml ---------------------------------------------------------------------- diff --git a/jdbc/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml b/jdbc/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml index 090daee..302ae52 100644 --- a/jdbc/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml +++ b/jdbc/src/main/resources/org/apache/karaf/jdbc/internal/datasource-generic.xml @@ -20,7 +20,7 @@ <bean id="dataSource" destroy-method="close" class="org.apache.commons.dbcp.BasicDataSource"> <property name="driverClassName" value="${driver}"/> <property name="url" value="${url}"/> - <property name="user" value="${user}"/> + <property name="username" value="${user}"/> <property name="password" value="${password}"/> <property name="maxIdle" value="1"/> </bean>
