You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/07/24 10:31:56 UTC
svn commit: r797359 - in /activemq/trunk: ./
activemq-core/src/test/java/org/apache/activemq/
activemq-core/src/test/java/org/apache/activemq/broker/
activemq-core/src/test/java/org/apache/activemq/transport/failover/
Author: dejanb
Date: Fri Jul 24 08:31:56 2009
New Revision: 797359
URL: http://svn.apache.org/viewvc?rev=797359&view=rev
Log:
fix for https://issues.apache.org/activemq/browse/AMQ-1380 - upgrade to activeio 3.1.2 and remove backport dependencies
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java?rev=797359&r1=797358&r2=797359&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Fri Jul 24 08:31:56 2009
@@ -17,6 +17,7 @@
package org.apache.activemq;
import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
@@ -46,8 +47,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.Collections;
-
/**
* Test cases used to test the JMS message consumer.
*
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java?rev=797359&r1=797358&r2=797359&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java Fri Jul 24 08:31:56 2009
@@ -18,6 +18,7 @@
import java.net.URI;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,8 +37,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.Collections;
-
@SuppressWarnings("unchecked")
public class NioQueueSubscriptionTest extends QueueSubscriptionTest implements ExceptionListener {
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java?rev=797359&r1=797358&r2=797359&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java Fri Jul 24 08:31:56 2009
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
@@ -43,8 +44,6 @@
import org.apache.activemq.util.ServiceStopper;
import org.apache.log4j.Logger;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-
/**
* TestCase showing the message-destroying described in AMQ-1925
*
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=797359&r1=797358&r2=797359&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Jul 24 08:31:56 2009
@@ -265,12 +265,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>