karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-2798] Fix hsqldb bundle installation for hsql datasource
Date Fri, 28 Feb 2014 17:33:23 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x 63bff3d9e -> bf298d6d6


[KARAF-2798] Fix hsqldb bundle installation for hsql datasource


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

Branch: refs/heads/karaf-2.3.x
Commit: bf298d6d6f00719258d6c3cf9748895baeb1895e
Parents: 63bff3d
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Fri Feb 28 18:30:38 2014 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Fri Feb 28 18:33:11 2014 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java  | 2 +-
 .../resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/bf298d6d/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
----------------------------------------------------------------------
diff --git a/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java b/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
index 8395067..8790597 100644
--- a/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
+++ b/jdbc/core/src/main/java/org/apache/karaf/jdbc/internal/JdbcServiceImpl.java
@@ -37,7 +37,7 @@ public class JdbcServiceImpl implements JdbcService {
         DERBY("mvn:org.apache.derby/derby/", "10.8.2.2", "datasource-derby.xml"),
         GENERIC(null, null, "datasource-generic.xml"),
         H2("mvn:com.h2database/h2/", "1.3.163", "datasource-h2.xml"),
-        HSQL("mvn:com.h2database/h2/", "1.3.163", "datasource-hsql.xml"),
+        HSQL("mvn:org.hsqldb/hsqldb/", "2.3.2", "datasource-hsql.xml"),
         MYSQL("mvn:mysql/mysql-connector-java/", "5.1.18", "datasource-mysql.xml"),
         ORACLE("wrap:mvn:ojdbc/ojdbc/", "11.2.0.2.0", "datasource-oracle.xml"),
         POSTGRES("wrap:mvn:postgresql/postgresql/", "9.1-901.jdbc4", "datasource-postgres.xml");

http://git-wip-us.apache.org/repos/asf/karaf/blob/bf298d6d/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
----------------------------------------------------------------------
diff --git a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
index 3609661..e869eb7 100644
--- a/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
+++ b/jdbc/core/src/main/resources/org/apache/karaf/jdbc/internal/datasource-hsql.xml
@@ -18,7 +18,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <bean id="dataSource" class="org.hsqldb.jdbc.JDBCDataSource">
-        <property name="URL" value="${url}"/>
+        <property name="url" value="${url}"/>
         <property name="user" value="${user}"/>
         <property name="password" value="${password}"/>
     </bean>


Mime
View raw message