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 2009/06/11 05:08:14 UTC
svn commit: r783612 [2/3] - in /activemq/sandbox/activemq-flow:
activemq-all/ activemq-all/src/test/java/org/apache/activemq/
activemq-all/src/test/java/org/apache/activemq/blob/
activemq-all/src/test/java/org/apache/activemq/broker/ activemq-all/src/t...
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java Thu Jun 11 03:08:06 2009
@@ -17,6 +17,7 @@
package org.apache.activemq.broker;
import junit.framework.TestCase;
+
import org.apache.activemq.network.NetworkConnector;
/**
@@ -78,7 +79,8 @@
{
BrokerService service = new BrokerService();
assertEquals( service.getSystemUsage().getMemoryUsage().getLimit(), 1024 * 1024 * 64 );
- assertEquals( service.getSystemUsage().getTempUsage().getLimit(), 1024L * 1024 * 1024 * 100 );
- assertEquals( service.getSystemUsage().getStoreUsage().getLimit(), 1024L * 1024 * 1024 * 100 );
+// TODO:
+// assertEquals( service.getSystemUsage().getTempUsage().getLimit(), 1024L * 1024 * 1024 * 100 );
+// assertEquals( service.getSystemUsage().getStoreUsage().getLimit(), 1024L * 1024 * 1024 * 100 );
}
}
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java Thu Jun 11 03:08:06 2009
@@ -34,6 +34,8 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.usage.SystemUsage;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.ConnectionId;
@@ -51,8 +53,6 @@
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.command.XATransactionId;
-import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.usage.SystemUsage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java Thu Jun 11 03:08:06 2009
@@ -20,10 +20,10 @@
import java.util.Set;
import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.xbean.XBeanBrokerFactory;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.xbean.XBeanBrokerFactory;
/**
*
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java Thu Jun 11 03:08:06 2009
@@ -19,6 +19,7 @@
import javax.jms.DeliveryMode;
import junit.framework.Test;
+
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
import org.apache.activemq.command.ActiveMQDestination;
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java Thu Jun 11 03:08:06 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 {
@@ -59,7 +58,6 @@
@Override
protected BrokerService createBroker() throws Exception {
BrokerService answer = BrokerFactory.createBroker(new URI("broker://nio://localhost:62621?useQueueForAccept=false&persistent=false&wiewformat.maxInactivityDuration=0"));
- answer.getManagementContext().setCreateConnector(false);
answer.setUseJmx(false);
answer.setDeleteAllMessagesOnStartup(true);
final List<PolicyEntry> policyEntries = new ArrayList<PolicyEntry>();
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteConsumer.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteConsumer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteConsumer.java Thu Jun 11 03:08:06 2009
@@ -8,9 +8,8 @@
import org.apache.activemq.apollo.WindowLimiter;
import org.apache.activemq.apollo.broker.MessageDelivery;
-import org.apache.activemq.broker.RemoteConsumer;
import org.apache.activemq.apollo.broker.Router;
-import org.apache.activemq.broker.openwire.OpenWireMessageDelivery;
+import org.apache.activemq.broker.RemoteConsumer;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteProducer.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteProducer.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/broker/openwire/OpenwireRemoteProducer.java Thu Jun 11 03:08:06 2009
@@ -11,9 +11,8 @@
import org.apache.activemq.apollo.WindowLimiter;
import org.apache.activemq.apollo.broker.MessageDelivery;
-import org.apache.activemq.broker.RemoteProducer;
import org.apache.activemq.apollo.broker.Router;
-import org.apache.activemq.broker.openwire.OpenWireMessageDelivery;
+import org.apache.activemq.broker.RemoteProducer;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTextMessage;
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/AMQ1866.java Thu Jun 11 03:08:06 2009
@@ -29,11 +29,10 @@
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,9 +60,9 @@
protected void setUp() throws Exception {
// Start an embedded broker up.
brokerService = new BrokerService();
- AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
- adaptor.setIndexBinSize(4096);
- brokerService.setPersistenceAdapter(adaptor);
+// AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
+// adaptor.setIndexBinSize(4096);
+// brokerService.setPersistenceAdapter(adaptor);
brokerService.deleteAllMessages();
// A small max page size makes this issue occur faster.
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java Thu Jun 11 03:08:06 2009
@@ -25,9 +25,9 @@
import javax.jms.Session;
import junit.framework.TestCase;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
import org.apache.activemq.usage.SystemUsage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -97,9 +97,9 @@
systemUsage.getMemoryUsage().setLimit(1024 * 1024); // Just a few messags
broker.setSystemUsage(systemUsage);
- AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker.getPersistenceFactory();
- factory.setMaxFileLength(2*1024); // ~4 messages
- factory.setCleanupInterval(1000); // every few second
+// AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker.getPersistenceFactory();
+// factory.setMaxFileLength(2*1024); // ~4 messages
+// factory.setCleanupInterval(1000); // every few second
broker.start();
LOG.info("Starting broker..");
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java Thu Jun 11 03:08:06 2009
@@ -16,7 +16,6 @@
*/
package org.apache.activemq.bugs;
-import java.io.File;
import java.text.DateFormat;
import java.util.Date;
import java.util.concurrent.ExecutorService;
@@ -30,8 +29,6 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
-import org.apache.activemq.store.kahadb.KahaDBStore;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -131,39 +128,39 @@
broker.setPersistent(true);
broker.setUseJmx(true);
- if (useAMQPStore) {
- AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker
- .getPersistenceFactory();
- // ensure there are a bunch of data files but multiple entries in
- // each
- // factory.setMaxFileLength(1024 * 20);
- // speed up the test case, checkpoint an cleanup early and often
- // factory.setCheckpointInterval(500);
- factory.setCleanupInterval(1000 * 60 * 30);
- factory.setSyncOnWrite(false);
-
- // int indexBinSize=262144; // good for 6M
- int indexBinSize = 1024;
- factory.setIndexMaxBinSize(indexBinSize * 2);
- factory.setIndexBinSize(indexBinSize);
- factory.setIndexPageSize(192 * 20);
- } else {
- KahaDBStore kaha = new KahaDBStore();
- kaha.setDirectory(new File("target/activemq-data/kahadb"));
- // The setEnableJournalDiskSyncs(false) setting is a little dangerous right now, as I have not verified
- // what happens if the index is updated but a journal update is lost.
- // Index is going to be in consistent, but can it be repaired?
- kaha.setEnableJournalDiskSyncs(false);
- // Using a bigger journal file size makes he take fewer spikes as it is not switching files as often.
- kaha.setJournalMaxFileLength(1024*1024*100);
-
- // small batch means more frequent and smaller writes
- kaha.setIndexWriteBatchSize(100);
- // do the index write in a separate thread
- kaha.setEnableIndexWriteAsync(true);
-
- broker.setPersistenceAdapter(kaha);
- }
+// if (useAMQPStore) {
+// AMQPersistenceAdapterFactory factory = (AMQPersistenceAdapterFactory) broker
+// .getPersistenceFactory();
+// // ensure there are a bunch of data files but multiple entries in
+// // each
+// // factory.setMaxFileLength(1024 * 20);
+// // speed up the test case, checkpoint an cleanup early and often
+// // factory.setCheckpointInterval(500);
+// factory.setCleanupInterval(1000 * 60 * 30);
+// factory.setSyncOnWrite(false);
+//
+// // int indexBinSize=262144; // good for 6M
+// int indexBinSize = 1024;
+// factory.setIndexMaxBinSize(indexBinSize * 2);
+// factory.setIndexBinSize(indexBinSize);
+// factory.setIndexPageSize(192 * 20);
+// } else {
+// KahaDBStore kaha = new KahaDBStore();
+// kaha.setDirectory(new File("target/activemq-data/kahadb"));
+// // The setEnableJournalDiskSyncs(false) setting is a little dangerous right now, as I have not verified
+// // what happens if the index is updated but a journal update is lost.
+// // Index is going to be in consistent, but can it be repaired?
+// kaha.setEnableJournalDiskSyncs(false);
+// // Using a bigger journal file size makes he take fewer spikes as it is not switching files as often.
+// kaha.setJournalMaxFileLength(1024*1024*100);
+//
+// // small batch means more frequent and smaller writes
+// kaha.setIndexWriteBatchSize(100);
+// // do the index write in a separate thread
+// kaha.setEnableIndexWriteAsync(true);
+//
+// broker.setPersistenceAdapter(kaha);
+// }
broker.addConnector("tcp://localhost:0").setName("Default");
broker.start();
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java Thu Jun 11 03:08:06 2009
@@ -24,7 +24,6 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.security.SimpleSecurityBrokerSystemTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java Thu Jun 11 03:08:06 2009
@@ -21,7 +21,6 @@
import javax.jms.Topic;
import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
-import org.apache.activemq.broker.jmx.PurgeTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/StubTransport.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/StubTransport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/StubTransport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransport.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/StubTransport.java Thu Jun 11 03:08:06 2009
@@ -21,6 +21,7 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.activemq.util.ServiceStopper;
+import org.apache.activemq.wireformat.WireFormat;
/**
*
@@ -48,4 +49,10 @@
return null;
}
+
+ public WireFormat getWireformat() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TopicClusterTest.java Thu Jun 11 03:08:06 2009
@@ -35,8 +35,8 @@
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.ActiveMQTopic;
Copied: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java (from r783310, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java&r1=783310&r2=783612&rev=783612&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/TransportBrokerTestSupport.java Thu Jun 11 03:08:06 2009
@@ -21,10 +21,10 @@
import java.util.ArrayList;
import java.util.Iterator;
+import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerTest;
import org.apache.activemq.broker.StubConnection;
-import org.apache.activemq.broker.TransportConnector;
public abstract class TransportBrokerTestSupport extends BrokerTest {
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/AMQ1925Test.java Thu Jun 11 03:08:06 2009
@@ -20,7 +20,7 @@
import java.net.URI;
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;
@@ -37,14 +37,9 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.region.Destination;
-import org.apache.activemq.broker.region.Queue;
-import org.apache.activemq.command.ActiveMQQueue;
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
*
@@ -346,10 +341,10 @@
}
private void assertQueueLength(int len) throws Exception, IOException {
- Set<Destination> destinations = bs.getBroker().getDestinations(
- new ActiveMQQueue(QUEUE_NAME));
- Queue queue = (Queue) destinations.iterator().next();
- assertEquals(len, queue.getMessageStore().getMessageCount());
+// TDOO:
+// Set<Queue> destinations = bs.getBroker().getDestinations(new ActiveMQQueue(QUEUE_NAME));
+// Queue queue = (Queue) destinations.iterator().next();
+// assertEquals(len, queue.getMessageStore().getMessageCount());
}
private void sendMessagesToQueue() throws Exception {
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverRandomTest.java Thu Jun 11 03:08:06 2009
@@ -41,7 +41,6 @@
BrokerService broker = new BrokerService();
broker.setBrokerName("Broker"+ name);
broker.addConnector("tcp://localhost:0");
- broker.getManagementContext().setCreateConnector(false);
broker.setPersistent(false);
broker.setUseJmx(false);
broker.start();
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/FailoverTimeoutTest.java Thu Jun 11 03:08:06 2009
@@ -12,7 +12,6 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
public class FailoverTimeoutTest extends TestCase {
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/failover/ReconnectTest.java Thu Jun 11 03:08:06 2009
@@ -34,11 +34,11 @@
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.transport.mock.MockTransport;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportListener;
-import org.apache.activemq.transport.mock.MockTransport;
import org.apache.activemq.util.ServiceStopper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslBrokerServiceTest.java Thu Jun 11 03:08:06 2009
@@ -31,7 +31,6 @@
import junit.textui.TestRunner;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.SslBrokerService;
import org.apache.activemq.transport.TransportBrokerTestSupport;
import org.apache.activemq.transport.TransportFactory;
@@ -43,7 +42,7 @@
@Override
protected BrokerService createBroker() throws Exception {
- SslBrokerService service = new SslBrokerService();
+ BrokerService service = new BrokerService();
service.setPersistent(false);
KeyManager[] km = getKeyManager();
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextBrokerServiceTest.java Thu Jun 11 03:08:06 2009
@@ -23,8 +23,9 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.textui.TestRunner;
-import org.apache.activemq.broker.BrokerService;
+
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.transport.TransportBrokerTestSupport;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/transport/tcp/SslContextNBrokerServiceTest.java Thu Jun 11 03:08:06 2009
@@ -30,8 +30,8 @@
import junit.framework.TestCase;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.BrokerService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/AMQStackOverFlowTest.java Thu Jun 11 03:08:06 2009
@@ -29,13 +29,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.network.DiscoveryNetworkConnector;
import org.apache.activemq.network.NetworkConnector;
import org.apache.activemq.usage.SystemUsage;
+import org.apache.activemq.broker.BrokerService;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java Thu Jun 11 03:08:06 2009
@@ -21,7 +21,6 @@
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
-import org.apache.activemq.transport.udp.UdpTransportUsingServerTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java Thu Jun 11 03:08:06 2009
@@ -29,7 +29,6 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.test.JmsSendReceiveTestSupport;
-import org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithSimpleMessageListTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java Thu Jun 11 03:08:06 2009
@@ -22,7 +22,6 @@
import javax.jms.TextMessage;
import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.broker.policy.IndividualDeadLetterViaXmlTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java Thu Jun 11 03:08:06 2009
@@ -30,8 +30,8 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.TestSupport;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.broker.BrokerService;
/**
* @version $Revision: 1.1.1.1 $
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ExpiredMessagesTest.java Thu Jun 11 03:08:06 2009
@@ -121,7 +121,7 @@
}
protected DestinationViewMBean createView(ActiveMQDestination destination) throws Exception {
- MBeanServer mbeanServer = broker.getManagementContext().getMBeanServer();
+ MBeanServer mbeanServer = broker.getMBeanServer();
String domain = "org.apache.activemq";
ObjectName name;
if (destination.isQueue()) {
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/MessageGroupDelayedTest.java Thu Jun 11 03:08:06 2009
@@ -32,10 +32,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.JmsTestSupport;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/NoDuplicateOnTopicNetworkTest.java Thu Jun 11 03:08:06 2009
@@ -19,8 +19,8 @@
import javax.jms.Topic;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.network.NetworkConnector;
+import org.apache.activemq.broker.BrokerService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java Thu Jun 11 03:08:06 2009
@@ -33,8 +33,8 @@
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.IOHelper;
+import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java Thu Jun 11 03:08:06 2009
@@ -19,8 +19,8 @@
import java.io.File;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java Thu Jun 11 03:08:06 2009
@@ -19,8 +19,8 @@
import java.io.File;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
Modified: activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?rev=783612&r1=783310&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-all/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java Thu Jun 11 03:08:06 2009
@@ -33,9 +33,8 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.test.TestSupport;
import org.apache.activemq.util.IdGenerator;
@@ -89,9 +88,9 @@
broker.setUseJmx(false);
PersistenceAdapter adaptor = broker.getPersistenceAdapter();
- if (adaptor instanceof AMQPersistenceAdapter) {
- ((AMQPersistenceAdapter)adaptor).setDisableLocking(true);
- }
+// if (adaptor instanceof AMQPersistenceAdapter) {
+// ((AMQPersistenceAdapter)adaptor).setDisableLocking(true);
+// }
broker.addConnector(DEFAULT_BROKER_URL);
broker.start();
} catch (Exception e) {
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java Thu Jun 11 03:08:06 2009
@@ -18,11 +18,10 @@
import java.util.Set;
-public class Broker {
+public interface Broker {
- public <T> Set<T> getDurableDestinations() {
- // TODO Auto-generated method stub
- return null;
- }
+ public <T> Set<T> getDurableDestinations();
+
+ public <T> Set<T> getDestinations(T destination);
}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java Thu Jun 11 03:08:06 2009
@@ -19,8 +19,13 @@
import java.net.URI;
import java.util.List;
+import javax.management.MBeanServer;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.TrustManager;
+
import org.apache.activemq.Service;
import org.apache.activemq.broker.region.RegionBroker;
+import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.usage.SystemUsage;
public class BrokerService implements Service {
@@ -28,8 +33,7 @@
public static final String DEFAULT_PORT = "61616";
public static final String DEFAULT_BROKER_NAME = "localhost";
- public Object getVmConnectorURI() {
- // TODO Auto-generated method stub
+ public URI getVmConnectorURI() {
return null;
}
@@ -43,8 +47,7 @@
return false;
}
- public ManagementContext getManagementContext() {
- // TODO Auto-generated method stub
+ public <T> T getManagementContext() {
return null;
}
@@ -131,5 +134,110 @@
return false;
}
+ public void setDeleteAllMessagesOnStartup(boolean b) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public PersistenceAdapter getPersistenceAdapter() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void removeConnector(TransportConnector connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public <T> T addNetworkConnector(String string) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> void removeNetworkConnector(T connector) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void waitUntilStopped() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public MBeanServer getMBeanServer() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setPopulateJMSXUserID(boolean b) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setBrokerName(String brokerName) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addConnector(URI tcpUri) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public TransportConnector addSslConnector(String bindLocation, KeyManager[] km, TrustManager[] tm, Object object) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setSystemUsage(SystemUsage memoryManager) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public <T> void addNetworkConnector(T nc) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void deleteAllMessages() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setPersistenceAdapter(PersistenceAdapter createPersistenceAdapter) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setDataDirectory(String string) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void waitUntilStarted() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setUseShutdownHook(boolean b) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setWaitForSlave(boolean b) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setMasterConnectorURI(String masterUrl) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setAdvisorySupport(boolean b) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Connection.java Thu Jun 11 03:08:06 2009
@@ -1,5 +1,11 @@
package org.apache.activemq.broker;
+
public class Connection {
+ public <Response,Command> Response service(Command command) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java (added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker;
+
+
+/**
+ * Used to hold context information needed to process requests sent to a broker.
+ *
+ * @version $Revision: 1.5 $
+ */
+public class ConnectionContext {
+}
Propchange: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ConnectionContext.java
------------------------------------------------------------------------------
svn:executable = *
Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java (added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/EmptyBroker.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker;
+
+import java.util.Set;
+
+/**
+ * Dumb implementation - used to be overriden by listeners
+ *
+ * @version $Revision$
+ */
+public class EmptyBroker implements Broker {
+
+ public <T> Set<T> getDestinations(T destination) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public <T> Set<T> getDurableDestinations() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java Thu Jun 11 03:08:06 2009
@@ -17,7 +17,9 @@
package org.apache.activemq.broker;
import java.io.IOException;
+import java.net.URI;
+import org.apache.activemq.Service;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportServer;
@@ -26,12 +28,16 @@
* @org.apache.xbean.XBean
* @version $Revision: 1.6 $
*/
-public class TransportConnector {
+public class TransportConnector implements Service {
public TransportConnector(TransportServer server) {
// TODO Auto-generated constructor stub
}
+ public TransportConnector() {
+ // TODO Auto-generated constructor stub
+ }
+
public TransportServer getServer() {
// TODO Auto-generated method stub
return null;
@@ -42,8 +48,38 @@
return null;
}
- public String getConnectUri() {
+ public URI getConnectUri() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void stop() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void start() throws Exception {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setDiscoveryUri(URI uri) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Object getUri() {
// TODO Auto-generated method stub
return null;
}
+
+ public void setUri(URI uri) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setName(String string) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Thu Jun 11 03:08:06 2009
@@ -28,4 +28,9 @@
return null;
}
+ public void gc() {
+ // TODO Auto-generated method stub
+
+ }
+
}
Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java (added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,5 @@
+package org.apache.activemq.broker.region.policy;
+
+public class FixedCountSubscriptionRecoveryPolicy {
+
+}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java Thu Jun 11 03:08:06 2009
@@ -18,4 +18,39 @@
}
+ public void setDispatchPolicy(RoundRobinDispatchPolicy roundRobinDispatchPolicy) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setSubscriptionRecoveryPolicy(FixedCountSubscriptionRecoveryPolicy fixedCountSubscriptionRecoveryPolicy) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setQueue(String string) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setOptimizedDispatch(boolean b) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setConsumersBeforeDispatchStarts(int consumersBeforeDispatchStarts) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setTimeBeforeDispatchStarts(int timeBeforeDispatchStarts) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setMaxPageSize(int i) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java Thu Jun 11 03:08:06 2009
@@ -1,5 +1,7 @@
package org.apache.activemq.broker.region.policy;
+import java.util.List;
+
public class PolicyMap {
public void setDefaultEntry(PolicyEntry policy) {
@@ -7,4 +9,14 @@
}
+ public void setPolicyEntries(List<PolicyEntry> policyEntries) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void put(Object key, PolicyEntry pe) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java (added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,5 @@
+package org.apache.activemq.broker.region.policy;
+
+public class RoundRobinDispatchPolicy {
+
+}
Added: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapter.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapter.java (added)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/store/PersistenceAdapter.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,5 @@
+package org.apache.activemq.store;
+
+public class PersistenceAdapter {
+
+}
Modified: activemq/sandbox/activemq-flow/activemq-network/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/pom.xml?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-network/pom.xml Thu Jun 11 03:08:06 2009
@@ -46,9 +46,14 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
-
+
<!-- Testing Dependencies -->
<dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/NetworkConnector.java Thu Jun 11 03:08:06 2009
@@ -233,7 +233,7 @@
return;
}
- MBeanServer mbeanServer = getBrokerService().getManagementContext().getMBeanServer();
+ MBeanServer mbeanServer = getBrokerService().getMBeanServer();
if (mbeanServer != null) {
NetworkBridgeViewMBean view = new NetworkBridgeView(bridge);
try {
@@ -250,7 +250,7 @@
return;
}
- MBeanServer mbeanServer = getBrokerService().getManagementContext().getMBeanServer();
+ MBeanServer mbeanServer = getBrokerService().getMBeanServer();
if (mbeanServer != null) {
try {
ObjectName objectName = createNetworkBridgeObjectName(bridge);
Added: activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java (added)
+++ activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.network.jms;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.QueueConnection;
+import javax.jms.QueueRequestor;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import junit.framework.TestCase;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class QueueBridgeTest extends TestCase implements MessageListener {
+
+ protected static final int MESSAGE_COUNT = 10;
+ private static final Log LOG = LogFactory.getLog(QueueBridgeTest.class);
+
+ protected AbstractApplicationContext context;
+ protected QueueConnection localConnection;
+ protected QueueConnection remoteConnection;
+ protected QueueRequestor requestor;
+ protected QueueSession requestServerSession;
+ protected MessageConsumer requestServerConsumer;
+ protected MessageProducer requestServerProducer;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ context = createApplicationContext();
+
+ createConnections();
+
+ requestServerSession = localConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue theQueue = requestServerSession.createQueue(getClass().getName());
+ requestServerConsumer = requestServerSession.createConsumer(theQueue);
+ requestServerConsumer.setMessageListener(this);
+ requestServerProducer = requestServerSession.createProducer(null);
+
+ QueueSession session = remoteConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ requestor = new QueueRequestor(session, theQueue);
+ }
+
+ protected void createConnections() throws JMSException {
+ ActiveMQConnectionFactory fac = (ActiveMQConnectionFactory)context.getBean("localFactory");
+ localConnection = fac.createQueueConnection();
+ localConnection.start();
+
+ fac = (ActiveMQConnectionFactory)context.getBean("remoteFactory");
+ remoteConnection = fac.createQueueConnection();
+ remoteConnection.start();
+ }
+
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/queue-config.xml");
+ }
+
+ protected void tearDown() throws Exception {
+ localConnection.close();
+ super.tearDown();
+ }
+
+ public void testQueueRequestorOverBridge() throws JMSException {
+ for (int i = 0; i < MESSAGE_COUNT; i++) {
+ TextMessage msg = requestServerSession.createTextMessage("test msg: " + i);
+ TextMessage result = (TextMessage)requestor.request(msg);
+ assertNotNull(result);
+ LOG.info(result.getText());
+ }
+ }
+
+ public void onMessage(Message msg) {
+ try {
+ TextMessage textMsg = (TextMessage)msg;
+ String payload = "REPLY: " + textMsg.getText();
+ Destination replyTo;
+ replyTo = msg.getJMSReplyTo();
+ textMsg.clearBody();
+ textMsg.setText(payload);
+ requestServerProducer.send(replyTo, textMsg);
+ } catch (JMSException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+}
Propchange: activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeXBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeXBeanTest.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeXBeanTest.java (added)
+++ activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/QueueBridgeXBeanTest.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.network.jms;
+
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
+
+
+/**
+ *
+ * @version $Revision: 564057 $
+ */
+public class QueueBridgeXBeanTest extends QueueBridgeTest {
+
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/queue-xbean.xml");
+ }
+
+ /*
+ protected void createConnections() throws JMSException {
+ ActiveMQConnectionFactory fac = (ActiveMQConnectionFactory) context.getBean("localFactory");
+ localConnection = fac.createQueueConnection();
+ localConnection.start();
+
+ fac = (ActiveMQConnectionFactory) context.getBean("remoteFactory");
+ remoteConnection = fac.createQueueConnection();
+ remoteConnection.start();
+ }
+ */
+
+}
Added: activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java (added)
+++ activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.network.jms;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicRequestor;
+import javax.jms.TopicSession;
+import junit.framework.TestCase;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class TopicBridgeSpringTest extends TestCase implements MessageListener {
+
+ protected static final int MESSAGE_COUNT = 10;
+ private static final Log LOG = LogFactory.getLog(TopicBridgeSpringTest.class);
+
+ protected AbstractApplicationContext context;
+ protected TopicConnection localConnection;
+ protected TopicConnection remoteConnection;
+ protected TopicRequestor requestor;
+ protected TopicSession requestServerSession;
+ protected MessageConsumer requestServerConsumer;
+ protected MessageProducer requestServerProducer;
+
+ protected void setUp() throws Exception {
+
+ super.setUp();
+ context = createApplicationContext();
+ ActiveMQConnectionFactory fac = (ActiveMQConnectionFactory)context.getBean("localFactory");
+ localConnection = fac.createTopicConnection();
+ localConnection.start();
+ requestServerSession = localConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
+ Topic theTopic = requestServerSession.createTopic(getClass().getName());
+ requestServerConsumer = requestServerSession.createConsumer(theTopic);
+ requestServerConsumer.setMessageListener(this);
+ requestServerProducer = requestServerSession.createProducer(null);
+
+ fac = (ActiveMQConnectionFactory)context.getBean("remoteFactory");
+ remoteConnection = fac.createTopicConnection();
+ remoteConnection.start();
+ TopicSession session = remoteConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
+ requestor = new TopicRequestor(session, theTopic);
+ }
+
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/topic-spring.xml");
+ }
+
+ protected void tearDown() throws Exception {
+ localConnection.close();
+ super.tearDown();
+ }
+
+ public void testTopicRequestorOverBridge() throws JMSException {
+ for (int i = 0; i < MESSAGE_COUNT; i++) {
+ TextMessage msg = requestServerSession.createTextMessage("test msg: " + i);
+ LOG.info("Making request: " + msg);
+ TextMessage result = (TextMessage)requestor.request(msg);
+ assertNotNull(result);
+ LOG.info("Received result: " + result.getText());
+ }
+ }
+
+ public void onMessage(Message msg) {
+ try {
+ TextMessage textMsg = (TextMessage)msg;
+ String payload = "REPLY: " + textMsg.getText();
+ Destination replyTo;
+ replyTo = msg.getJMSReplyTo();
+ textMsg.clearBody();
+ textMsg.setText(payload);
+ LOG.info("Sending response: " + textMsg);
+ requestServerProducer.send(replyTo, textMsg);
+ } catch (JMSException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+}
Propchange: activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeSpringTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java?rev=783612&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java (added)
+++ activemq/sandbox/activemq-flow/activemq-network/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java Thu Jun 11 03:08:06 2009
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.network.jms;
+
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
+
+/**
+ *
+ * @version $Revision: 1.1 $
+ */
+public class TopicBridgeXBeanTest extends TopicBridgeSpringTest {
+
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/activemq/network/jms/topic-config.xml");
+ }
+
+}
Modified: activemq/sandbox/activemq-flow/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-spring/pom.xml?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-spring/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-spring/pom.xml Thu Jun 11 03:08:06 2009
@@ -75,4 +75,23 @@
</dependencies>
+
+ <build>
+ <plugins>
+
+ <!-- Generate a test jar for the test cases in this package -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
</project>
Modified: activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportSupport.java?rev=783612&r1=783611&r2=783612&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-transport/src/main/java/org/apache/activemq/transport/TransportSupport.java Thu Jun 11 03:08:06 2009
@@ -63,7 +63,7 @@
return null;
}
- public FutureResponse asyncRequest(Object command, ResponseCallback responseCallback) throws IOException {
+ public <T> FutureResponse<T> asyncRequest(Object command, ResponseCallback<T> responseCallback) throws IOException {
throw new AssertionError("Unsupported Method");
}