You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ar...@apache.org on 2015/03/06 18:36:51 UTC
[3/5] activemq git commit: AMQ-5636 - Update old openjsb tests to
more current DBCP2 XA Camel tests
AMQ-5636 - Update old openjsb tests to more current DBCP2 XA Camel tests
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/939c8a14
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/939c8a14
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/939c8a14
Branch: refs/heads/master
Commit: 939c8a14df63dec92bcd807285595bfbdb5cfacc
Parents: 6f1e48d
Author: Jeff Genender <jg...@savoirtech.com>
Authored: Fri Mar 6 09:51:26 2015 -0700
Committer: Jeff Genender <jg...@savoirtech.com>
Committed: Fri Mar 6 09:51:26 2015 -0700
----------------------------------------------------------------------
activemq-camel/pom.xml | 11 ++---------
.../activemq/camel/JmsJdbcXARollbackTest.java | 2 +-
.../org/apache/activemq/camel/JmsJdbcXATest.java | 2 +-
.../org/apache/activemq/camel/jmsXajdbc.xml | 16 ++++++----------
.../org/apache/activemq/camel/jmsXajdbcRollback.xml | 16 ++++++----------
.../org/apache/activemq/usecases/activemq.xml | 2 +-
.../org/apache/activemq/xbean/activemq.xml | 2 +-
.../src/release/examples/conf/activemq-demo.xml | 10 +++++-----
.../src/release/examples/conf/activemq-jdbc.xml | 10 +++++-----
9 files changed, 28 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 5ed94ff..c1b8d0b 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -135,17 +135,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>3.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
<optional>true</optional>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.objectweb.howl</groupId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/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 16bc006..15fe65f 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
@@ -33,7 +33,7 @@ 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.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/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 8481ca6..16c8a1e 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
@@ -34,7 +34,7 @@ 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.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
index 1c58a14..394fad2 100644
--- a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbc.xml
@@ -78,16 +78,12 @@
<property name="cacheLevel" value="0"/>
</bean>
- <!-- openejb provides geronimo NamedXAResources wrapper around commons dbcp such that they have an identity in the howl log -->
- <bean id="geronimoXAResourceWrapper"
- class="org.apache.openejb.resource.GeronimoTransactionManagerFactory.GeronimoXAResourceWrapper"/>
- <bean id="managedDataSourceWithRecovery" class="org.apache.openejb.resource.jdbc.ManagedDataSourceWithRecovery">
- <constructor-arg>
- <ref bean="geronimoXAResourceWrapper"></ref>
- </constructor-arg>
- <property name="jdbcDriver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="jdbcUrl" value="jdbc:derby:target/XatestDs;create=true"/>
- <property name="transactionManager" ref="jenckTransactionManager"/>
+ <bean id="managedDataSourceWithRecovery" class="org.apache.commons.dbcp2.managed.BasicManagedDataSource" destroy-method="close">
+ <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+ <property name="url" value="jdbc:derby:target/XatestDs;create=true" />
+ <property name="username" value="user" />
+ <property name="password" value="secret" />
+ <property name="transactionManager" ref="jenckTransactionManager" />
</bean>
<bean id="required" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
index f5b4306..70b0c7a 100644
--- a/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
+++ b/activemq-camel/src/test/resources/org/apache/activemq/camel/jmsXajdbcRollback.xml
@@ -78,16 +78,12 @@
<property name="cacheLevel" value="0"/>
</bean>
- <!-- openejb provides geronimo NamedXAResources wrapper around commons dbcp such that they have an identity in the howl log -->
- <bean id="geronimoXAResourceWrapper"
- class="org.apache.openejb.resource.GeronimoTransactionManagerFactory.GeronimoXAResourceWrapper"/>
- <bean id="managedDataSourceWithRecovery" class="org.apache.openejb.resource.jdbc.ManagedDataSourceWithRecovery">
- <constructor-arg>
- <ref bean="geronimoXAResourceWrapper"></ref>
- </constructor-arg>
- <property name="jdbcDriver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="jdbcUrl" value="jdbc:derby:target/XatestDs;create=true"/>
- <property name="transactionManager" ref="jenckTransactionManager"/>
+ <bean id="managedDataSourceWithRecovery" class="org.apache.commons.dbcp2.managed.BasicManagedDataSource" destroy-method="close">
+ <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
+ <property name="url" value="jdbc:derby:target/XatestDs;create=true" />
+ <property name="username" value="user" />
+ <property name="password" value="secret" />
+ <property name="transactionManager" ref="jenckTransactionManager" />
</bean>
<bean id="required" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
index 908b0cf..b495497 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/usecases/activemq.xml
@@ -87,7 +87,7 @@
<!-- MySql DataSource Sample Setup -->
<!--
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
<property name="url" value="jdbc:mysql://localhost/activemq"/>
<property name="username" value="activemq"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
index 9884523..aadfa15 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/xbean/activemq.xml
@@ -53,7 +53,7 @@
<!-- MySql DataSource Sample Setup -->
<!--
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
<property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
<property name="username" value="activemq"/>
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/assembly/src/release/examples/conf/activemq-demo.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/conf/activemq-demo.xml b/assembly/src/release/examples/conf/activemq-demo.xml
index ce89f9c..13524db 100644
--- a/assembly/src/release/examples/conf/activemq-demo.xml
+++ b/assembly/src/release/examples/conf/activemq-demo.xml
@@ -261,24 +261,24 @@
<!-- MySql DataSource Sample Setup -->
<!--
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
<property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
<property name="username" value="activemq"/>
<property name="password" value="activemq"/>
- <property name="maxActive" value="200"/>
+ <property name="maxTotal" value="200"/>
<property name="poolPreparedStatements" value="true"/>
</bean>
-->
<!-- Oracle DataSource Sample Setup -->
<!--
- <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="oracle-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
<property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
<property name="username" value="scott"/>
<property name="password" value="tiger"/>
- <property name="maxActive" value="200"/>
+ <property name="maxTotal" value="200"/>
<property name="poolPreparedStatements" value="true"/>
</bean>
-->
@@ -291,4 +291,4 @@
</bean>
-->
-</beans>
\ No newline at end of file
+</beans>
http://git-wip-us.apache.org/repos/asf/activemq/blob/939c8a14/assembly/src/release/examples/conf/activemq-jdbc.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/examples/conf/activemq-jdbc.xml b/assembly/src/release/examples/conf/activemq-jdbc.xml
index 026341f..aac9ba9 100644
--- a/assembly/src/release/examples/conf/activemq-jdbc.xml
+++ b/assembly/src/release/examples/conf/activemq-jdbc.xml
@@ -77,26 +77,26 @@
<!-- MySql DataSource Sample Setup -->
<!--
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="mysql-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="com.mysql.jdbc.Driver"/>
<property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
<property name="username" value="activemq"/>
<property name="password" value="activemq"/>
- <property name="maxActive" value="200"/>
+ <property name="maxTotal" value="200"/>
<property name="poolPreparedStatements" value="true"/>
</bean>
-->
<!-- Oracle DataSource Sample Setup -->
<!--
- <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <bean id="oracle-ds" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/>
<property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/>
<property name="username" value="scott"/>
<property name="password" value="tiger"/>
- <property name="maxActive" value="200"/>
+ <property name="maxTotal" value="200"/>
<property name="poolPreparedStatements" value="true"/>
</bean>
-->
-</beans>
\ No newline at end of file
+</beans>