Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x c39524b97 -> 02b0bfe6c


[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/02b0bfe6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/02b0bfe6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/02b0bfe6

Branch: refs/heads/karaf-2.x
Commit: 02b0bfe6c29bdf529dbcc2c71aa53b5df45eb745
Parents: c39524b
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Fri Mar 14 12:22:18 2014 +0100
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Fri Mar 14 12:28:41 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/02b0bfe6/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 203e039..75fed3a 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">

Reply via email to