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:26:05 UTC
[1/2] git commit: [KARAF-2819] Fix password substitution in the MySQL
datasource
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 0270ea3a1 -> 729cbef16
[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/c96aa0e8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c96aa0e8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c96aa0e8
Branch: refs/heads/karaf-3.0.x
Commit: c96aa0e85b2880d65c5fe74aeefd4226227d0cae
Parents: 60e52d7
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:25:17 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/c96aa0e8/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">
[2/2] git commit: Merge branch 'karaf-3.0.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Posted by jb...@apache.org.
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/729cbef1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/729cbef1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/729cbef1
Branch: refs/heads/karaf-3.0.x
Commit: 729cbef161552b3dc91c9dfa3c1a2dee829bce6a
Parents: c96aa0e 0270ea3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 14 12:25:51 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 14 12:25:51 2014 +0100
----------------------------------------------------------------------
.../karaf/tooling/features/AbstractFeatureMojo.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------