[jboss-cvs] JBoss Messaging SVN: r6469 - in trunk: src/main/org/jboss/messaging/core/client/impl and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 17 04:52:26 EDT 2009
Author: jmesnil
Date: 2009-04-17 04:52:25 -0400 (Fri, 17 Apr 2009)
New Revision: 6469
Added:
trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
trunk/src/schemas/jbm-jms.xsd
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/LargeMessageTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionSendAcknowledgementHandlerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/CrashClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java
trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/remote/PingStressTest.java
Log:
JBMESSAGING-1597: JMS resources deployment is not tested
* added JMSServerDeployerTest to check that XML configuration is taken into account when creating JMS resources
* fixed parsing issue with send-window-size (the correct XML element name is producer-window-size)
* renamed constant/methods ProducerWindowSize instead of SendWindowSize to be consistent with other parameters
* in jbm-jms.xsd, allow multiple JNDI entries for a single JMS destination (both queues and topics)
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -47,9 +47,9 @@
int getConsumerWindowSize();
- void setSendWindowSize(int size);
+ void setProducerWindowSize(int size);
- int getSendWindowSize();
+ int getProducerWindowSize();
void setConsumerMaxRate(int rate);
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -64,7 +64,7 @@
public static final int DEFAULT_CONSUMER_MAX_RATE = -1;
- public static final int DEFAULT_SEND_WINDOW_SIZE = 1024 * 1024;
+ public static final int DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024;
public static final int DEFAULT_PRODUCER_MAX_RATE = -1;
@@ -118,7 +118,7 @@
private volatile int consumerMaxRate;
- private volatile int sendWindowSize;
+ private volatile int producerWindowSize;
private volatile int producerMaxRate;
@@ -190,7 +190,7 @@
this.callTimeout = DEFAULT_CALL_TIMEOUT;
this.consumerWindowSize = DEFAULT_CONSUMER_WINDOW_SIZE;
this.consumerMaxRate = DEFAULT_CONSUMER_MAX_RATE;
- this.sendWindowSize = DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = DEFAULT_PRODUCER_WINDOW_SIZE;
this.producerMaxRate = DEFAULT_PRODUCER_MAX_RATE;
this.blockOnAcknowledge = DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.blockOnNonPersistentSend = DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -216,7 +216,7 @@
final long callTimeout,
final int consumerWindowSize,
final int consumerMaxRate,
- final int sendWindowSize,
+ final int producerWindowSize,
final int producerMaxRate,
final int minLargeMessageSize,
final boolean blockOnAcknowledge,
@@ -258,7 +258,7 @@
this.callTimeout = callTimeout;
this.consumerWindowSize = consumerWindowSize;
this.consumerMaxRate = consumerMaxRate;
- this.sendWindowSize = sendWindowSize;
+ this.producerWindowSize = producerWindowSize;
this.producerMaxRate = producerMaxRate;
this.blockOnAcknowledge = blockOnAcknowledge;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -302,7 +302,7 @@
this.callTimeout = callTimeout;
this.consumerWindowSize = consumerWindowSize;
this.consumerMaxRate = consumerMaxRate;
- this.sendWindowSize = sendWindowSize;
+ this.producerWindowSize = sendWindowSize;
this.producerMaxRate = producerMaxRate;
this.blockOnAcknowledge = blockOnAcknowledge;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -353,7 +353,7 @@
this.callTimeout = DEFAULT_CALL_TIMEOUT;
this.consumerWindowSize = DEFAULT_CONSUMER_WINDOW_SIZE;
this.consumerMaxRate = DEFAULT_CONSUMER_MAX_RATE;
- this.sendWindowSize = DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = DEFAULT_PRODUCER_WINDOW_SIZE;
this.producerMaxRate = DEFAULT_PRODUCER_MAX_RATE;
this.blockOnAcknowledge = DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.blockOnNonPersistentSend = DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -402,7 +402,7 @@
this.callTimeout = DEFAULT_CALL_TIMEOUT;
this.consumerWindowSize = DEFAULT_CONSUMER_WINDOW_SIZE;
this.consumerMaxRate = DEFAULT_CONSUMER_MAX_RATE;
- this.sendWindowSize = DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = DEFAULT_PRODUCER_WINDOW_SIZE;
this.producerMaxRate = DEFAULT_PRODUCER_MAX_RATE;
this.blockOnAcknowledge = DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.blockOnNonPersistentSend = DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -449,7 +449,7 @@
this.connectionTTL = DEFAULT_CONNECTION_TTL;
this.consumerWindowSize = DEFAULT_CONSUMER_WINDOW_SIZE;
this.consumerMaxRate = DEFAULT_CONSUMER_MAX_RATE;
- this.sendWindowSize = DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = DEFAULT_PRODUCER_WINDOW_SIZE;
this.producerMaxRate = DEFAULT_PRODUCER_MAX_RATE;
this.blockOnAcknowledge = DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.blockOnNonPersistentSend = DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -516,7 +516,7 @@
this.callTimeout = callTimeout;
this.consumerWindowSize = consumerWindowSize;
this.consumerMaxRate = consumerMaxRate;
- this.sendWindowSize = sendWindowSize;
+ this.producerWindowSize = sendWindowSize;
this.producerMaxRate = producerMaxRate;
this.blockOnAcknowledge = blockOnAcknowledge;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -608,14 +608,14 @@
consumerWindowSize = size;
}
- public int getSendWindowSize()
+ public int getProducerWindowSize()
{
- return sendWindowSize;
+ return producerWindowSize;
}
- public void setSendWindowSize(final int size)
+ public void setProducerWindowSize(final int size)
{
- sendWindowSize = size;
+ producerWindowSize = size;
}
public int getProducerMaxRate()
@@ -876,7 +876,7 @@
minLargeMessageSize,
blockOnAcknowledge,
autoGroup,
- sendWindowSize,
+ producerWindowSize,
consumerWindowSize,
consumerMaxRate,
producerMaxRate,
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -37,7 +37,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PING_PERIOD;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import java.nio.ByteBuffer;
import java.util.HashSet;
@@ -590,7 +590,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -92,7 +92,7 @@
private final int consumerMaxRate;
- private final int sendWindowSize;
+ private final int producerWindowSize;
private final int producerMaxRate;
@@ -133,7 +133,7 @@
final int transactionBatchSize,
final int consumerWindowSize,
final int consumerMaxRate,
- final int sendWindowSize,
+ final int producerWindowSize,
final int producerMaxRate,
final int minLargeMessageSize,
final boolean blockOnAcknowledge,
@@ -162,7 +162,7 @@
this.consumerMaxRate = consumerMaxRate;
this.consumerWindowSize = consumerWindowSize;
this.producerMaxRate = producerMaxRate;
- this.sendWindowSize = sendWindowSize;
+ this.producerWindowSize = producerWindowSize;
this.blockOnAcknowledge = blockOnAcknowledge;
this.minLargeMessageSize = minLargeMessageSize;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -196,7 +196,7 @@
this.consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
this.consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
this.producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
- this.sendWindowSize = ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
this.blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
this.blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -257,7 +257,7 @@
this.consumerMaxRate = consumerMaxRate;
this.consumerWindowSize = consumerWindowSize;
this.producerMaxRate = producerMaxRate;
- this.sendWindowSize = sendWindowSize;
+ this.producerWindowSize = sendWindowSize;
this.blockOnAcknowledge = blockOnAcknowledge;
this.minLargeMessageSize = minLargeMessageSize;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -313,7 +313,7 @@
this.consumerMaxRate = consumerMaxRate;
this.consumerWindowSize = consumerWindowSize;
this.producerMaxRate = producerMaxRate;
- this.sendWindowSize = sendWindowSize;
+ this.producerWindowSize = sendWindowSize;
this.blockOnAcknowledge = blockOnAcknowledge;
this.minLargeMessageSize = minLargeMessageSize;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -344,7 +344,7 @@
this.consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
this.consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
this.producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
- this.sendWindowSize = ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
this.blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
this.blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -379,7 +379,7 @@
this.consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
this.consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
this.producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
- this.sendWindowSize = ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
this.blockOnAcknowledge = blockOnAcknowledge;
this.minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
this.blockOnNonPersistentSend = blockOnNonPersistentSend;
@@ -414,7 +414,7 @@
this.consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
this.consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
this.producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
- this.sendWindowSize = ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+ this.producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
this.blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
this.minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
this.blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND;
@@ -554,7 +554,7 @@
public int getProducerWindowSize()
{
- return sendWindowSize;
+ return producerWindowSize;
}
public int getProducerMaxRate()
@@ -662,7 +662,7 @@
callTimeout,
consumerWindowSize,
consumerMaxRate,
- sendWindowSize,
+ producerWindowSize,
producerMaxRate,
minLargeMessageSize,
blockOnAcknowledge,
@@ -689,7 +689,7 @@
callTimeout,
consumerWindowSize,
consumerMaxRate,
- sendWindowSize,
+ producerWindowSize,
producerMaxRate,
minLargeMessageSize,
blockOnAcknowledge,
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -55,7 +55,7 @@
private static final String CONSUMER_MAX_RATE_ELEMENT = "consumer-max-rate";
- private static final String SEND_WINDOW_SIZE = "send-window-size";
+ private static final String PRODUCER_WINDOW_SIZE = "producer-window-size";
private static final String PRODUCER_MAX_RATE_ELEMENT = "producer-max-rate";
@@ -158,7 +158,7 @@
int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
int consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE;
int consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE;
- int sendWindowSize = ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+ int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE;
@@ -202,9 +202,9 @@
{
consumerMaxRate = org.jboss.messaging.utils.XMLUtil.parseInt(child);
}
- else if (SEND_WINDOW_SIZE.equals(child.getNodeName()))
+ else if (PRODUCER_WINDOW_SIZE.equals(child.getNodeName()))
{
- sendWindowSize = org.jboss.messaging.utils.XMLUtil.parseInt(child);
+ producerWindowSize = org.jboss.messaging.utils.XMLUtil.parseInt(child);
}
else if (PRODUCER_MAX_RATE_ELEMENT.equals(child.getNodeName()))
{
@@ -352,7 +352,7 @@
transactionBatchSize,
consumerWindowSize,
consumerMaxRate,
- sendWindowSize,
+ producerWindowSize,
producerMaxRate,
minLargeMessageSize,
blockOnAcknowledge,
@@ -380,7 +380,7 @@
transactionBatchSize,
consumerWindowSize,
consumerMaxRate,
- sendWindowSize,
+ producerWindowSize,
producerMaxRate,
minLargeMessageSize,
blockOnAcknowledge,
Modified: trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/main/org/jboss/messaging/ra/JBMResourceAdapter.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -1374,7 +1374,7 @@
: getConsumerWindowSize(),
getConsumerMaxRate() == null ? ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE
: getConsumerMaxRate(),
- getSendWindowSize() == null ? ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE
+ getSendWindowSize() == null ? ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE
: getSendWindowSize(),
getProducerMaxRate() == null ? ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE
: getProducerMaxRate(),
@@ -1426,7 +1426,7 @@
: getConsumerWindowSize(),
getConsumerMaxRate() == null ? ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE
: getConsumerMaxRate(),
- getSendWindowSize() == null ? ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE
+ getSendWindowSize() == null ? ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE
: getSendWindowSize(),
getProducerMaxRate() == null ? ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE
: getProducerMaxRate(),
Modified: trunk/src/schemas/jbm-jms.xsd
===================================================================
--- trunk/src/schemas/jbm-jms.xsd 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/src/schemas/jbm-jms.xsd 2009-04-17 08:52:25 UTC (rev 6469)
@@ -13,7 +13,7 @@
<xsd:element ref="connection-factory"
maxOccurs="unbounded" minOccurs="0">
</xsd:element>
- <xsd:choice maxOccurs="unbounded" minOccurs="1">
+ <xsd:choice maxOccurs="unbounded" minOccurs="0">
<xsd:element ref="queue" maxOccurs="1"
minOccurs="1">
</xsd:element>
@@ -28,6 +28,8 @@
<xsd:all>
<xsd:element name="connector-ref" type="connector-refType" maxOccurs="1" minOccurs="0"></xsd:element>
<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="discovery-initial-wait" type="xsd:unsignedLong" maxOccurs="1" minOccurs="0"></xsd:element>
+
<xsd:element name="entries" maxOccurs="1" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
@@ -103,9 +105,6 @@
<xsd:element name="load-balancing-policy-class-name" type="xsd:string"
maxOccurs="1" minOccurs="0">
</xsd:element>
- <xsd:element name="discovery-initial-wait" type="xsd:unsignedLong"
- maxOccurs="1" minOccurs="0">
- </xsd:element>
</xsd:all>
<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
</xsd:complexType>
@@ -128,7 +127,7 @@
<xsd:complexType name="destinationType">
<xsd:sequence>
- <xsd:element name="entry" type="entryType" maxOccurs="1" minOccurs="1"></xsd:element>
+ <xsd:element name="entry" type="entryType" maxOccurs="unbounded" minOccurs="1"></xsd:element>
</xsd:sequence>
<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
</xsd:complexType>
Added: trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml
===================================================================
--- trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml (rev 0)
+++ trunk/tests/config/jbm-jms-for-JMSServerDeployerTest.xml 2009-04-17 08:52:25 UTC (rev 6469)
@@ -0,0 +1,48 @@
+<deployment xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-jms.xsd ">
+
+ <connection-factory name="testConnectionFactory">
+ <entries>
+ <entry name="/testConnectionFactory"/>
+ <entry name="/acme/testConnectionFactory"/>
+ <entry name="java:/xyz/testConnectionFactory"/>
+ <entry name="java:/connectionfactories/acme/testConnectionFactory"/>
+ </entries>
+ <connector-ref connector-name="netty"/>
+ <ping-period>1234</ping-period>
+ <call-timeout>5678</call-timeout>
+ <consumer-window-size>12345</consumer-window-size>
+ <consumer-max-rate>6789</consumer-max-rate>
+ <producer-window-size>123456</producer-window-size>
+ <producer-max-rate>789</producer-max-rate>
+ <min-large-message-size>12</min-large-message-size>
+ <client-id>TestClientID</client-id>
+ <dups-ok-batch-size>3456</dups-ok-batch-size>
+ <transaction-batch-size>4567</transaction-batch-size>
+ <block-on-acknowledge>true</block-on-acknowledge>
+ <send-np-messages-synchronously>false</send-np-messages-synchronously>
+ <send-p-messages-synchronously>true</send-p-messages-synchronously>
+ <auto-group-id>false</auto-group-id>
+ <pre-acknowledge>true</pre-acknowledge>
+ <connection-ttl>2345</connection-ttl>
+ <discovery-initial-wait>678</discovery-initial-wait>
+ <failover-on-server-shutdown>false</failover-on-server-shutdown>
+ <load-balancing-policy-class-name>FooClass</load-balancing-policy-class-name>
+ <max-connections>12</max-connections>
+ <reconnect-attempts>34</reconnect-attempts>
+ <retry-interval>5</retry-interval>
+ <retry-interval-multiplier>6.0</retry-interval-multiplier>
+ </connection-factory>
+
+ <queue name="testQueue">
+ <entry name="/testQueue"/>
+ <entry name="/queue/testQueue"/>
+ </queue>
+
+ <topic name="testTopic">
+ <entry name="/testTopic"/>
+ <entry name="/topic/testTopic"/>
+ </topic>
+
+</deployment>
\ No newline at end of file
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -91,7 +91,7 @@
ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE,
ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
true,
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -66,7 +66,7 @@
ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE,
ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
true,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/LargeMessageTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/LargeMessageTestBase.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/chunkmessage/LargeMessageTestBase.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -144,7 +144,7 @@
if (producerWindow > 0)
{
- sf.setSendWindowSize(producerWindow);
+ sf.setProducerWindowSize(producerWindow);
}
sf.setMinLargeMessageSize(minSize);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionFactoryTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -73,7 +73,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -105,7 +105,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -250,7 +250,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -284,7 +284,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -315,7 +315,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -404,7 +404,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -436,7 +436,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -487,7 +487,7 @@
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND,
@@ -503,7 +503,7 @@
cf.setMinLargeMessageSize(minLargeMessageSize);
cf.setPreAcknowledge(preAcknowledge);
cf.setProducerMaxRate(producerMaxRate);
- cf.setSendWindowSize(windowSize);
+ cf.setProducerWindowSize(windowSize);
assertFactoryParams(cf,
batchSize,
ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT,
@@ -609,7 +609,7 @@
assertEquals(cf.getMinLargeMessageSize(), minLargeMessageSize);
assertEquals(cf.getPingPeriod(), pingPeriod);
assertEquals(cf.getProducerMaxRate(), producerMaxRate);
- assertEquals(cf.getSendWindowSize(), sendWindowSize);
+ assertEquals(cf.getProducerWindowSize(), sendWindowSize);
assertEquals(cf.isAutoGroup(), autoGroup);
assertEquals(cf.isBlockOnAcknowledge(), blockOnAcknowledge);
assertEquals(cf.isBlockOnNonPersistentSend(), blockOnNonPersistentSend);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionSendAcknowledgementHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionSendAcknowledgementHandlerTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ClientSessionSendAcknowledgementHandlerTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -81,7 +81,7 @@
ClientSession session = csf.createSession(null, null, false, true, true, false, 1);
- csf.setSendWindowSize(1024);
+ csf.setProducerWindowSize(1024);
session.createQueue(address, queueName, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/ClientCrashTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -39,7 +39,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientMessage;
@@ -158,7 +158,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/CrashClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/CrashClient.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/clientcrash/CrashClient.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -39,7 +39,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import static org.jboss.messaging.tests.integration.clientcrash.ClientCrashTest.QUEUE;
import java.util.Arrays;
@@ -87,7 +87,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -90,8 +90,8 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
- sf2.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
+ sf2.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
@@ -175,8 +175,8 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
- sf2.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
+ sf2.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -86,7 +86,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
@@ -171,7 +171,7 @@
sf1 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
session1 = sf1.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -88,7 +88,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
@@ -187,7 +187,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -88,7 +88,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
@@ -177,7 +177,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -82,7 +82,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
@@ -132,7 +132,7 @@
ClientSessionFactoryInternal sf2 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf2.setSendWindowSize(32 * 1024);
+ sf2.setProducerWindowSize(32 * 1024);
ClientSession session2 = sf2.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -76,7 +76,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -91,7 +91,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
ClientSession session1 = sf1.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -1346,7 +1346,7 @@
ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
-1);
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
return sf;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -83,7 +83,7 @@
new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
return sf;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -328,7 +328,7 @@
final ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"),
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
return sf;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -228,7 +228,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, false, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -39,7 +39,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import java.util.HashMap;
import java.util.Map;
@@ -104,7 +104,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -118,7 +118,7 @@
DEFAULT_RETRY_INTERVAL_MULTIPLIER,
DEFAULT_RECONNECT_ATTEMPTS);
- sf1.setSendWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
assertEquals(0, liveServer.getRemotingService().getConnections().size());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -86,7 +86,7 @@
{
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, true, true);
@@ -135,7 +135,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, true, true);
@@ -213,7 +213,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, true, true);
@@ -294,7 +294,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, true, true);
@@ -362,7 +362,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, true, true);
@@ -432,7 +432,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
final int numSessions = ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS * 2;
@@ -520,7 +520,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
final int numSessions = ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS * 2;
@@ -551,7 +551,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
final int numSessions = ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS * 2;
@@ -597,7 +597,7 @@
retryMultiplier,
reconnectAttempts);
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession session = sf.createSession(false, true, true);
@@ -700,7 +700,7 @@
1,
-1);
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
for (int i = 0; i < 10; i++)
{
@@ -770,7 +770,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
ClientSession sess = sf.createSession(false, true, true);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -642,7 +642,7 @@
new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
backupParams));
- sf.setSendWindowSize(32 * 1024);
+ sf.setProducerWindowSize(32 * 1024);
return sf;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -39,7 +39,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createQueueControl;
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
@@ -481,7 +481,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -35,7 +35,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import java.util.HashMap;
import java.util.HashSet;
@@ -215,7 +215,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
true,
@@ -251,7 +251,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
true,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -40,7 +40,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import java.util.HashMap;
import java.util.Map;
@@ -119,7 +119,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -201,7 +201,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -227,7 +227,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -38,7 +38,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import javax.jms.Connection;
import javax.jms.ExceptionListener;
@@ -112,7 +112,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -38,7 +38,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import javax.jms.Connection;
import javax.jms.Message;
@@ -102,7 +102,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Added: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -0,0 +1,168 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.messaging.tests.integration.jms.server;
+
+import java.net.URL;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.Context;
+
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.server.MessagingServer;
+import org.jboss.messaging.integration.transports.netty.NettyConnectorFactory;
+import org.jboss.messaging.jms.client.JBossConnectionFactory;
+import org.jboss.messaging.jms.server.JMSServerManager;
+import org.jboss.messaging.jms.server.impl.JMSServerDeployer;
+import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
+import org.jboss.messaging.tests.unit.util.InVMContext;
+import org.jboss.messaging.tests.util.ServiceTestBase;
+import org.w3c.dom.Element;
+
+/**
+ * A JMSServerDeployerTest
+ *
+ * @author jmesnil
+ *
+ *
+ */
+public class JMSServerDeployerTest extends ServiceTestBase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ private MessagingServer server;
+
+ private JMSServerManager jmsServer;
+
+ private Context context;
+
+ // Public --------------------------------------------------------
+
+ public void testValidateEmptyConfiguration() throws Exception
+ {
+ JMSServerDeployer deployer = new JMSServerDeployer(jmsServer,
+ server.getDeploymentManager(),
+ server.getConfiguration());
+
+ String xml = "<deployment xmlns='urn:jboss:messaging'> " + "</deployment>";
+
+ Element rootNode = org.jboss.messaging.utils.XMLUtil.stringToElement(xml);
+ deployer.validate(rootNode);
+ }
+
+ public void testDeployFullConfiguration() throws Exception
+ {
+ JMSServerDeployer deployer = new JMSServerDeployer(jmsServer,
+ server.getDeploymentManager(),
+ server.getConfiguration());
+
+ String conf = "jbm-jms-for-JMSServerDeployerTest.xml";
+ URL confURL = Thread.currentThread().getContextClassLoader().getResource(conf);
+
+ deployer.deploy(confURL);
+
+ JBossConnectionFactory cf = (JBossConnectionFactory)context.lookup("/testConnectionFactory");
+ assertNotNull(cf);
+ assertEquals(1234, cf.getPingPeriod());
+ assertEquals(5678, cf.getCallTimeout());
+ assertEquals(12345, cf.getConsumerWindowSize());
+ assertEquals(6789, cf.getConsumerMaxRate());
+ assertEquals(123456, cf.getProducerWindowSize());
+ assertEquals(789, cf.getProducerMaxRate());
+ assertEquals(12, cf.getMinLargeMessageSize());
+ assertEquals("TestClientID", cf.getClientID());
+ assertEquals(3456, cf.getDupsOKBatchSize());
+ assertEquals(4567, cf.getTransactionBatchSize());
+ assertEquals(true, cf.isBlockOnAcknowledge());
+ assertEquals(false, cf.isBlockOnNonPersistentSend());
+ assertEquals(true, cf.isBlockOnPersistentSend());
+ assertEquals(false, cf.isAutoGroup());
+ assertEquals(true, cf.isPreAcknowledge());
+ assertEquals(2345, cf.getConnectionTTL());
+ assertEquals(false, cf.isFailoverOnServerShutdown());
+ assertEquals(12, cf.getMaxConnections());
+ assertEquals(34, cf.getReconnectAttempts());
+ assertEquals(5, cf.getRetryInterval());
+ assertEquals(6.0, cf.getRetryIntervalMultiplier());
+
+ Queue queue = (Queue)context.lookup("/testQueue");
+ assertNotNull(queue);
+ assertEquals("testQueue", queue.getQueueName());
+
+ Queue queue2 = (Queue)context.lookup("/queue/testQueue");
+ assertNotNull(queue2);
+ assertEquals("testQueue", queue2.getQueueName());
+
+ Topic topic = (Topic)context.lookup("/testTopic");
+ assertNotNull(topic);
+ assertEquals("testTopic", topic.getTopicName());
+
+ Topic topic2 = (Topic)context.lookup("/topic/testTopic");
+ assertNotNull(topic2);
+ assertEquals("testTopic", topic2.getTopicName());
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ Configuration conf = new ConfigurationImpl();
+ conf.getConnectorConfigurations().put("netty", new TransportConfiguration(NettyConnectorFactory.class.getName()));
+ server = createServer(false, conf);
+ server.start();
+
+ jmsServer = new JMSServerManagerImpl(server);
+ jmsServer.start();
+
+ context = new InVMContext();
+ jmsServer.setContext(context);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ jmsServer.stop();
+ server.stop();
+
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -40,7 +40,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createJMSQueueControl;
import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
@@ -707,7 +707,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -143,7 +143,7 @@
ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE,
ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE,
- ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE,
ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -40,7 +40,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import javax.jms.Connection;
@@ -91,7 +91,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -121,7 +121,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
true,
@@ -167,7 +167,7 @@
DEFAULT_ACK_BATCH_SIZE,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -40,7 +40,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import java.util.Set;
@@ -136,7 +136,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -211,7 +211,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -286,7 +286,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -392,7 +392,7 @@
DEFAULT_CALL_TIMEOUT,
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/remote/PingStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/remote/PingStressTest.java 2009-04-17 08:12:58 UTC (rev 6468)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/remote/PingStressTest.java 2009-04-17 08:52:25 UTC (rev 6469)
@@ -38,7 +38,7 @@
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL;
import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE;
+import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE;
import java.util.concurrent.CountDownLatch;
@@ -158,7 +158,7 @@
// for this test
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
@@ -208,7 +208,7 @@
// test
DEFAULT_CONSUMER_WINDOW_SIZE,
DEFAULT_CONSUMER_MAX_RATE,
- DEFAULT_SEND_WINDOW_SIZE,
+ DEFAULT_PRODUCER_WINDOW_SIZE,
DEFAULT_PRODUCER_MAX_RATE,
DEFAULT_MIN_LARGE_MESSAGE_SIZE,
DEFAULT_BLOCK_ON_ACKNOWLEDGE,
More information about the jboss-cvs-commits
mailing list