mirror of https://github.com/apache/activemq.git
https://issues.apache.org/activemq/browse/AMQ-2529 - browse over network
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@889677 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0fdd03febd
commit
10dae9c659
|
@ -67,6 +67,9 @@ public class QueueBrowserSubscription extends QueueSubscription {
|
|||
*/
|
||||
protected void acknowledge(ConnectionContext context, final MessageAck ack, final MessageReference n)
|
||||
throws IOException {
|
||||
if (info.isNetworkSubscription()) {
|
||||
super.acknowledge(context, ack, n);
|
||||
}
|
||||
}
|
||||
|
||||
synchronized public void incrementQueueRef() {
|
||||
|
|
|
@ -36,6 +36,8 @@ import javax.jms.Destination;
|
|||
import javax.jms.JMSException;
|
||||
import javax.jms.MessageConsumer;
|
||||
import javax.jms.MessageProducer;
|
||||
import javax.jms.Queue;
|
||||
import javax.jms.QueueBrowser;
|
||||
import javax.jms.Session;
|
||||
import javax.jms.TextMessage;
|
||||
import javax.jms.Topic;
|
||||
|
@ -229,6 +231,14 @@ public class JmsMultipleBrokersTestSupport extends CombinationTestSupport {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
protected QueueBrowser createBrowser(String brokerName, Destination dest) throws Exception {
|
||||
BrokerItem brokerItem = brokers.get(brokerName);
|
||||
if (brokerItem != null) {
|
||||
return brokerItem.createBrowser(dest);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
protected MessageConsumer createDurableSubscriber(String brokerName, Topic dest, String name) throws Exception {
|
||||
BrokerItem brokerItem = brokers.get(brokerName);
|
||||
|
@ -434,6 +444,13 @@ public class JmsMultipleBrokersTestSupport extends CombinationTestSupport {
|
|||
consumers.put(client, messageIdList);
|
||||
return client;
|
||||
}
|
||||
|
||||
public QueueBrowser createBrowser(Destination dest) throws Exception {
|
||||
Connection c = createConnection();
|
||||
c.start();
|
||||
Session s = c.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||
return s.createBrowser((Queue)dest);
|
||||
}
|
||||
|
||||
public MessageConsumer createDurableSubscriber(Topic dest, String name) throws Exception {
|
||||
Connection c = createConnection();
|
||||
|
|
|
@ -0,0 +1,84 @@
|
|||
/**
|
||||
* 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.usecases;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.Enumeration;
|
||||
|
||||
import javax.jms.Destination;
|
||||
import javax.jms.MessageConsumer;
|
||||
import javax.jms.QueueBrowser;
|
||||
|
||||
import org.apache.activemq.JmsMultipleBrokersTestSupport;
|
||||
import org.apache.activemq.broker.region.QueueSubscription;
|
||||
import org.apache.activemq.util.MessageIdList;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
public class BrowseOverNetworkTest extends JmsMultipleBrokersTestSupport {
|
||||
private static final Log LOG = LogFactory.getLog(QueueSubscription.class);
|
||||
protected static final int MESSAGE_COUNT = 10;
|
||||
|
||||
public void testBrowse() throws Exception {
|
||||
bridgeBrokers("BrokerA", "BrokerB");
|
||||
|
||||
startAllBrokers();
|
||||
|
||||
Destination dest = createDestination("TEST.FOO", false);
|
||||
|
||||
sendMessages("BrokerA", dest, MESSAGE_COUNT);
|
||||
|
||||
browseMessages(dest);
|
||||
|
||||
Thread.sleep(2000);
|
||||
|
||||
MessageConsumer clientA = createConsumer("BrokerA", dest);
|
||||
MessageIdList msgsA = getConsumerMessages("BrokerA", clientA);
|
||||
msgsA.waitForMessagesToArrive(MESSAGE_COUNT);
|
||||
|
||||
Thread.sleep(2000);
|
||||
MessageConsumer clientB = createConsumer("BrokerB", dest);
|
||||
MessageIdList msgsB = getConsumerMessages("BrokerB", clientB);
|
||||
msgsB.waitForMessagesToArrive(MESSAGE_COUNT);
|
||||
|
||||
LOG.info("A+B: " + msgsA.getMessageCount() + "+"
|
||||
+ msgsB.getMessageCount());
|
||||
assertEquals(MESSAGE_COUNT, msgsA.getMessageCount()
|
||||
+ msgsB.getMessageCount());
|
||||
}
|
||||
|
||||
protected void browseMessages(Destination dest) throws Exception {
|
||||
QueueBrowser browser = createBrowser("BrokerB", dest);
|
||||
Enumeration msgs = browser.getEnumeration();
|
||||
int browsedMessage = 0;
|
||||
while (msgs.hasMoreElements()) {
|
||||
browsedMessage++;
|
||||
msgs.nextElement();
|
||||
}
|
||||
System.out.println(browsedMessage);
|
||||
}
|
||||
|
||||
public void setUp() throws Exception {
|
||||
super.setAutoFail(true);
|
||||
super.setUp();
|
||||
createBroker(new URI(
|
||||
"broker:(tcp://localhost:61616)/BrokerA?persistent=false&useJmx=false"));
|
||||
createBroker(new URI(
|
||||
"broker:(tcp://localhost:61617)/BrokerB?persistent=false&useJmx=false"));
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue