Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 5797 invoked from network); 24 Jul 2009 08:31:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jul 2009 08:31:14 -0000 Received: (qmail 80789 invoked by uid 500); 24 Jul 2009 08:32:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 80731 invoked by uid 500); 24 Jul 2009 08:32:19 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 80722 invoked by uid 99); 24 Jul 2009 08:32:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2009 08:32:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jul 2009 08:32:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D8B132388877; Fri, 24 Jul 2009 08:31:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Fri, 24 Jul 2009 08:31:56 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090724083156.D8B132388877@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.activemq activeio-core - 3.1.0 + 3.1.2 org.apache.activemq activeio-core - 3.1.0 + 3.1.2 test-jar test