You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/03/14 12:23:01 UTC

git commit: [KARAF-2819] Fix password substitution in the MySQL datasource

Repository: karaf
Updated Branches:
  refs/heads/master ba11f3b43 -> 2abdf4ccd


[KARAF-2819] Fix password substitution in the MySQL datasource


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2abdf4cc
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2abdf4cc
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2abdf4cc

Branch: refs/heads/master
Commit: 2abdf4ccd28a5c713db28267a67ffda5a648fda1
Parents: ba11f3b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 14 12:22:18 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 14 12:22:18 2014 +0100

----------------------------------------------------------------------
 .../resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/2abdf4cc/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
----------------------------------------------------------------------
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
index d890481..012ecaf 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-mysql.xml
@@ -20,7 +20,7 @@
     <bean id="dataSource" class="com.mysql.jdbc.jdbc2.optional.MysqlDataSource">
         <property name="url" value="${url}"/>
         <property name="user" value="${user}"/>
-        <property name="password" value="${test}"/>
+        <property name="password" value="${password}"/>
     </bean>
 
     <service interface="javax.sql.DataSource" ref="dataSource">