Author: chirino
Date: Mon Jul 30 16:45:58 2012
New Revision: 1367162
URL: http://svn.apache.org/viewvc?rev=1367162&view=rev
Log:
Recent changes in StompJMS fixes APLO-224 and also fixes some transaction tests.
Modified:
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsQueueTransactionTest.java
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTopicTransactionTest.java
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
Modified:
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java?rev=1367162&r1=1367161&r2=1367162&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JMSUsecaseTest.java
Mon Jul 30 16:45:58 2012
@@ -37,13 +37,6 @@ public class JMSUsecaseTest extends JmsT
junit.textui.TestRunner.run(suite());
}
- // this method can be removed once
https://issues.apache.org/jira/browse/APLO-224 is resolved.
- public void initCombos() {
- super.initCombos();
- setCombinationValues("protocol", new Object[]{new
OpenwireBrokerProtocol()});
-// setCombinationValues("protocol", new Object[]{new
StompBrokerProtocol()});
- }
-
public void initCombosForTestQueueBrowser() {
addCombinationValues("deliveryMode", new Object[]
{Integer.valueOf(DeliveryMode.NON_PERSISTENT),
Integer.valueOf(DeliveryMode.PERSISTENT)});
addCombinationValues("destinationType", new Object[]
{DestinationType.QUEUE_TYPE, DestinationType.TEMP_QUEUE_TYPE});
Modified:
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsQueueTransactionTest.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsQueueTransactionTest.java?rev=1367162&r1=1367161&r2=1367162&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsQueueTransactionTest.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsQueueTransactionTest.java
Mon Jul 30 16:45:58 2012
@@ -18,7 +18,6 @@ package org.apache.activemq.apollo;
import junit.framework.Test;
import org.apache.activemq.apollo.test.JmsResourceProvider;
-import org.fusesource.stomp.jms.StompJmsSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -171,10 +170,6 @@ public class JmsQueueTransactionTest ext
* @throws Exception
*/
public void testReceiveBrowseReceive() throws Exception {
- if (session instanceof StompJmsSession) {
- // browsing not supported by stomp
- return;
- }
Message[] outbound = new Message[] {session.createTextMessage("First
Message"), session.createTextMessage("Second Message"),
session.createTextMessage("Third Message")};
// lets consume any outstanding messages from previous test runs
Modified:
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTopicTransactionTest.java
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTopicTransactionTest.java?rev=1367162&r1=1367161&r2=1367162&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTopicTransactionTest.java
(original)
+++
activemq/activemq-apollo/trunk/apollo-itests/src/test/java/org/apache/activemq/apollo/JmsTopicTransactionTest.java
Mon Jul 30 16:45:58 2012
@@ -42,10 +42,6 @@ public class JmsTopicTransactionTest ext
@Override
public void runBare() throws Throwable {
- if (protocol instanceof StompBrokerProtocol) {
- // TODO - seem to have a broker hang on some of these tests when
STOMP is used
- return;
- }
super.runBare(); //To change body of overridden methods use File |
Settings | File Templates.
}
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1367162&r1=1367161&r2=1367162&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
Mon Jul 30 16:45:58 2012
@@ -387,12 +387,6 @@ class OpenwireProtocolHandler extends Pr
wire_format =
connection.transport.getProtocolCodec.asInstanceOf[OpenwireCodec].format
wire_format.renegotiateWireFormat(info, preferred_wireformat_settings)
- connection.transport match {
- case x: TcpTransport =>
-
x.getSocketChannel.socket.setTcpNoDelay(wire_format.isTcpNoDelayEnabled())
- case _ =>
- }
-
val inactive_time =
preferred_wireformat_settings.getMaxInactivityDuration().min(info.getMaxInactivityDuration())
val initial_delay =
preferred_wireformat_settings.getMaxInactivityDurationInitalDelay().min(info.getMaxInactivityDurationInitalDelay())
