Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove compile dep on dbcp2 in favour or generic datasource

This commit is contained in:
gtully 2016-04-08 11:10:17 +01:00
parent 2a8218a9a8
commit c8d96c6e8e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXARollbackTest.java
View File

@ -24,6 +24,7 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageProducer; import javax.jms.MessageProducer;
import javax.jms.Session; import javax.jms.Session;
import javax.jms.TextMessage; import javax.jms.TextMessage;
import javax.sql.DataSource;
import javax.transaction.TransactionManager; import javax.transaction.TransactionManager;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService; 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.Exchange;
import org.apache.camel.component.jms.JmsMessage; import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.test.spring.CamelSpringTestSupport; import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -75,7 +75,7 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
} }
private java.sql.Connection getJDBCConnection() throws Exception { private java.sql.Connection getJDBCConnection() throws Exception {
BasicDataSource dataSource = getMandatoryBean(BasicDataSource.class, "managedDataSourceWithRecovery"); DataSource dataSource = getMandatoryBean(DataSource.class, "managedDataSourceWithRecovery");
return dataSource.getConnection(); return dataSource.getConnection();
} }

5
activemq-camel/src/test/java/org/apache/activemq/camel/JmsJdbcXATest.java
View File

@ -25,6 +25,7 @@ import javax.jms.MessageProducer;
import javax.jms.Session; import javax.jms.Session;
import javax.jms.TextMessage; import javax.jms.TextMessage;
import javax.sql.DataSource;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerPlugin; import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.BrokerPluginSupport; 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.command.TransactionId;
import org.apache.activemq.util.Wait; import org.apache.activemq.util.Wait;
import org.apache.camel.test.spring.CamelSpringTestSupport; import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -76,7 +75,7 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
} }
private java.sql.Connection getJDBCConnection() throws Exception { private java.sql.Connection getJDBCConnection() throws Exception {
BasicDataSource dataSource = getMandatoryBean(BasicDataSource.class, "managedDataSourceWithRecovery"); DataSource dataSource = getMandatoryBean(DataSource.class, "managedDataSourceWithRecovery");
return dataSource.getConnection(); return dataSource.getConnection();
} }