You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/11/17 01:29:13 UTC
svn commit: r475999 [4/4] - in /incubator/activemq/trunk: ./ activemq-core/
activemq-core/src/main/java/org/apache/activemq/
activemq-core/src/main/java/org/apache/activemq/advisory/
activemq-core/src/main/java/org/apache/activemq/broker/ activemq-core...
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java Thu Nov 16 16:29:03 2006
@@ -41,9 +41,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
*
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java Thu Nov 16 16:29:03 2006
@@ -40,8 +40,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
public class FanoutTransportBrokerTest extends NetworkTestSupport {
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java Thu Nov 16 16:29:03 2006
@@ -156,4 +156,4 @@
return MESSAGE_COUNT * NUMBER_IN_CLUSTER;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/reliable/ReliableTransportTest.java Thu Nov 16 16:29:03 2006
@@ -25,7 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.Queue;
+import java.util.Queue;
/**
*
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java Thu Nov 16 16:29:03 2006
@@ -31,8 +31,8 @@
import javax.net.SocketFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
public class InactivityMonitorTest extends CombinationTestSupport implements TransportAcceptListener {
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubX509Certificate.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubX509Certificate.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubX509Certificate.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/StubX509Certificate.java Thu Nov 16 16:29:03 2006
@@ -163,4 +163,4 @@
return null;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/udp/UdpSendReceiveWithTwoConnectionsTest.java Thu Nov 16 16:29:03 2006
@@ -54,4 +54,4 @@
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory(brokerURI);
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java Thu Nov 16 16:29:03 2006
@@ -61,4 +61,4 @@
assertTrue(intValue.intValue() == i);
}
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java Thu Nov 16 16:29:03 2006
@@ -60,4 +60,4 @@
public void onMessage(Message msg) {
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java Thu Nov 16 16:29:03 2006
@@ -17,7 +17,7 @@
*/
package org.apache.activemq.usecases;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
@@ -130,4 +130,4 @@
broker.stop();
super.tearDown();
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java Thu Nov 16 16:29:03 2006
@@ -182,4 +182,4 @@
super.tearDown();
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java Thu Nov 16 16:29:03 2006
@@ -158,4 +158,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java Thu Nov 16 16:29:03 2006
@@ -41,8 +41,8 @@
import org.apache.activemq.broker.Broker;
import org.apache.activemq.test.TestSupport;
import org.apache.activemq.util.IdGenerator;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Revision: 1.1.1.1 $
@@ -178,4 +178,4 @@
int count = messagesReceived.get();
assertTrue("Not enough messages received: " + count, count > firstBatch);
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java Thu Nov 16 16:29:03 2006
@@ -37,7 +37,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CountDownLatch;
/**
@@ -164,4 +164,4 @@
}
super.tearDown();
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TransactionTest.java Thu Nov 16 16:29:03 2006
@@ -36,7 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CountDownLatch;
/**
* @author pragmasoft
@@ -121,4 +121,4 @@
}
super.tearDown();
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.java Thu Nov 16 16:29:03 2006
@@ -31,7 +31,7 @@
import java.util.ArrayList;
import java.net.URI;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Revision: 1.1.1.1 $
Modified: incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java (original)
+++ incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java Thu Nov 16 16:29:03 2006
@@ -85,4 +85,4 @@
public void setMinaServiceRegistry(ServiceRegistry minaServiceRegistry) {
super.setMinaServiceRegistry(minaServiceRegistry);
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java (original)
+++ incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java Thu Nov 16 16:29:03 2006
@@ -198,4 +198,4 @@
throw lce;
}
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java (original)
+++ incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java Thu Nov 16 16:29:03 2006
@@ -124,4 +124,4 @@
}
this.minaServiceRegistry = minaServiceRegistry;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java (original)
+++ incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/OpenWireGenerator.java Thu Nov 16 16:29:03 2006
@@ -165,4 +165,4 @@
}
return text.substring(0, 1).toUpperCase() + text.substring(1);
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/benchmark/BenchmarkSupport.java Thu Nov 16 16:29:03 2006
@@ -17,7 +17,7 @@
*/
package org.apache.activemq.benchmark;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.util.IdGenerator;
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/AcidTestTool.java Thu Nov 16 16:29:03 2006
@@ -40,10 +40,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Revision$
@@ -361,4 +361,4 @@
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ConsumerTool.java Thu Nov 16 16:29:03 2006
@@ -138,4 +138,4 @@
System.in.read();
}
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ProducerTool.java Thu Nov 16 16:29:03 2006
@@ -131,4 +131,4 @@
buffer.append(' ');
return buffer.toString();
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/tool/ToolSupport.java Thu Nov 16 16:29:03 2006
@@ -82,4 +82,4 @@
ActiveMQConnection c = (ActiveMQConnection) connection;
c.getConnectionStats().dump(new IndentPrinter());
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java Thu Nov 16 16:29:03 2006
@@ -17,9 +17,9 @@
*/
package org.apache.activemq.transport.http;
-import edu.emory.mathcs.backport.java.util.Queue;
-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
import org.apache.activemq.transport.TransportSupport;
import org.apache.activemq.util.ServiceStopper;
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java Thu Nov 16 16:29:03 2006
@@ -36,8 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ArrayBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.TimeUnit;
/**
* A servlet which handles server side HTTP transport, delegating to the
Modified: incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java (original)
+++ incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQEndpointActivationKey.java Thu Nov 16 16:29:03 2006
@@ -78,4 +78,4 @@
// ActivationSpec does not implement equals()
return o.activationSpec == activationSpec && o.messageEndpointFactory == messageEndpointFactory;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java (original)
+++ incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/LocalAndXATransaction.java Thu Nov 16 16:29:03 2006
@@ -149,4 +149,4 @@
transactionContext.cleanup();
inManagedTx=false;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java (original)
+++ incubator/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ServerSessionPoolImpl.java Thu Nov 16 16:29:03 2006
@@ -35,8 +35,8 @@
import org.apache.activemq.command.MessageDispatch;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @version $Revision$ $Date$
Modified: incubator/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java (original)
+++ incubator/activemq/trunk/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java Thu Nov 16 16:29:03 2006
@@ -50,8 +50,8 @@
import org.apache.activemq.ra.ActiveMQActivationSpec;
import org.apache.activemq.ra.ActiveMQResourceAdapter;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
public class MDBTest extends TestCase {
Modified: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java (original)
+++ incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java Thu Nov 16 16:29:03 2006
@@ -114,4 +114,4 @@
assertEquals("expected number of messages when received", messageCount, getMessageCount());
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java (original)
+++ incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Producer.java Thu Nov 16 16:29:03 2006
@@ -66,4 +66,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java (original)
+++ incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/ClientAgent.java Thu Nov 16 16:29:03 2006
@@ -29,4 +29,4 @@
public void setDestination(Destination destination);
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java (original)
+++ incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/Scenario.java Thu Nov 16 16:29:03 2006
@@ -29,4 +29,4 @@
public void setDestination(Destination destination);
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java (original)
+++ incubator/activemq/trunk/activemq-systest/src/main/java/org/apache/activemq/systest/impl/AgentMessageListener.java Thu Nov 16 16:29:03 2006
@@ -17,7 +17,7 @@
*/
package org.apache.activemq.systest.impl;
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
import javax.jms.Message;
import javax.jms.MessageListener;
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/pom.xml Thu Nov 16 16:29:03 2006
@@ -57,10 +57,6 @@
<artifactId>derbynet</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemConsumer.java Thu Nov 16 16:29:03 2006
@@ -106,4 +106,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemProducer.java Thu Nov 16 16:29:03 2006
@@ -72,4 +72,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/src/main/java/org/apache/activemq/tool/MemoryMonitoringTool.java Thu Nov 16 16:29:03 2006
@@ -17,7 +17,7 @@
*/
package org.apache.activemq.tool;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.io.DataOutputStream;
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/pom.xml?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/pom.xml (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/pom.xml Thu Nov 16 16:29:03 2006
@@ -56,10 +56,6 @@
<artifactId>derbynet</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java Thu Nov 16 16:29:03 2006
@@ -137,4 +137,4 @@
return dest;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsMeasurableClient.java Thu Nov 16 16:29:03 2006
@@ -21,7 +21,7 @@
import javax.jms.ConnectionFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLong;
public abstract class AbstractJmsMeasurableClient extends AbstractJmsClient implements MeasurableClient {
protected AtomicLong throughput = new AtomicLong(0);
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java Thu Nov 16 16:29:03 2006
@@ -31,7 +31,7 @@
import javax.jms.MessageListener;
import javax.jms.Topic;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
public class JmsConsumerClient extends AbstractJmsMeasurableClient {
private static final Log log = LogFactory.getLog(JmsConsumerClient.class);
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/AbstractPerformanceSampler.java Thu Nov 16 16:29:03 2006
@@ -19,7 +19,7 @@
import org.apache.activemq.tool.reports.PerformanceReportWriter;
import org.apache.activemq.tool.properties.AbstractObjectProperties;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicBoolean;
public abstract class AbstractPerformanceSampler extends AbstractObjectProperties implements PerformanceSampler {
protected long rampUpTime = 30 * 1000; // 30 secs
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/sampler/plugins/LinuxCpuSamplerPlugin.java Thu Nov 16 16:29:03 2006
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.tool.sampler.plugins;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.io.BufferedReader;
import java.io.InputStreamReader;
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/pom.xml Thu Nov 16 16:29:03 2006
@@ -56,10 +56,6 @@
<artifactId>derbynet</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
Modified: incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java (original)
+++ incubator/activemq/trunk/activemq-tooling/maven-activemq-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java Thu Nov 16 16:29:03 2006
@@ -114,4 +114,4 @@
return dest;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java (original)
+++ incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java Thu Nov 16 16:29:03 2006
@@ -51,7 +51,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.Semaphore;
+import java.util.concurrent.Semaphore;
/**
* Represents a messaging client used from inside a web container typically
Modified: incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java (original)
+++ incubator/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java Thu Nov 16 16:29:03 2006
@@ -40,4 +40,4 @@
public void renderMessage(PrintWriter writer, HttpServletRequest request, HttpServletResponse response,
QueueBrowser browser, Message message) throws JMSException, ServletException;
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/pom.xml?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Thu Nov 16 16:29:03 2006
@@ -132,10 +132,6 @@
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -277,7 +273,7 @@
<goal>createbundle</goal>
</goals>
<configuration>
- <includes>activemq-core,activemq-console,activeio-core,activemq-jaas,activemq-optional,backport-util-concurrent,commons-logging,geronimo-jms_1.1_spec,geronimo-j2ee-management_1.0_spec,derby</includes>
+ <includes>activemq-core,activemq-console,activeio-core,activemq-jaas,activemq-optional,commons-logging,geronimo-jms_1.1_spec,geronimo-j2ee-management_1.0_spec,derby</includes>
</configuration>
</execution>
</executions>
Modified: incubator/activemq/trunk/assembly/src/release/example/src/ConsumerTool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/example/src/ConsumerTool.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/src/ConsumerTool.java (original)
+++ incubator/activemq/trunk/assembly/src/release/example/src/ConsumerTool.java Thu Nov 16 16:29:03 2006
@@ -277,4 +277,4 @@
this.verbose = verbose;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java (original)
+++ incubator/activemq/trunk/assembly/src/release/example/src/ProducerAndConsumerTool.java Thu Nov 16 16:29:03 2006
@@ -49,4 +49,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java Thu Nov 16 16:29:03 2006
@@ -17,7 +17,7 @@
*/
package org.apache.activemq.benchmark;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.util.IdGenerator;
Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java Thu Nov 16 16:29:03 2006
@@ -44,7 +44,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Revision: 1.1.1.1 $
@@ -177,4 +177,4 @@
assertEquals("Expected message count not correct", expectedReceiveCount(), receivedMessageCount.get());
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/pom.xml?view=diff&rev=475999&r1=475998&r2=475999
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Thu Nov 16 16:29:03 2006
@@ -226,12 +226,6 @@
<!-- Required dependencies -->
<!-- =============================== -->
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport-util-concurrent-version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging-version}</version>
@@ -843,8 +837,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
@@ -899,7 +893,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
+ <link>http://java.sun.com/j2ee/1.5/docs/api</link>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
<link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
@@ -925,7 +919,6 @@
<aopalliance-version>1.0</aopalliance-version>
<axion-version>1.0-M3-dev</axion-version>
<axis-version>1.2-RC1</axis-version>
- <backport-util-concurrent-version>2.1</backport-util-concurrent-version>
<cglib-version>2.0</cglib-version>
<commons-beanutils-version>1.6.1</commons-beanutils-version>
<commons-collections-version>2.1</commons-collections-version>