activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: remove compile dep on dbcp2 in favour or generic datasource
Date Fri, 08 Apr 2016 10:10:53 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 2a8218a9a -> c8d96c6e8


remove compile dep on dbcp2 in favour or generic datasource


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

Branch: refs/heads/master
Commit: c8d96c6e8e43191767772c3f8c6335e3176170a7
Parents: 2a8218a
Author: gtully <gary.tully@gmail.com>
Authored: Fri Apr 8 11:10:17 2016 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Fri Apr 8 11:10:17 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java   | 4 ++--
 .../src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/c8d96c6e/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
index 15fe65f..c54c8f5 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
@@ -24,6 +24,7 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
+import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
@@ -33,7 +34,6 @@ import org.apache.activemq.util.Wait;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.jms.JmsMessage;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.commons.dbcp2.BasicDataSource;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
     }
 
     private java.sql.Connection getJDBCConnection() throws Exception {
-        BasicDataSource dataSource = getMandatoryBean(BasicDataSource.class, "managedDataSourceWithRecovery");
+        DataSource dataSource = getMandatoryBean(DataSource.class, "managedDataSourceWithRecovery");
         return dataSource.getConnection();
     }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/c8d96c6e/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
index 16c8a1e..b96ceec 100644
--- a/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
+++ b/activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
@@ -25,6 +25,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import javax.sql.DataSource;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerPlugin;
 import org.apache.activemq.broker.BrokerPluginSupport;
@@ -34,8 +35,6 @@ import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.TransactionId;
 import org.apache.activemq.util.Wait;
 import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -76,7 +75,7 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
     }
 
     private java.sql.Connection getJDBCConnection() throws Exception {
-        BasicDataSource dataSource = getMandatoryBean(BasicDataSource.class, "managedDataSourceWithRecovery");
+        DataSource dataSource = getMandatoryBean(DataSource.class, "managedDataSourceWithRecovery");
         return dataSource.getConnection();
     }
 


Mime
View raw message