Author: jmesnil Date: 2009-12-08 11:54:49 -0500 (Tue, 08 Dec 2009) New Revision: 8621 Modified: trunk/docs/user-manual/en/appserver-integration.xml trunk/docs/user-manual/en/configuration-index.xml trunk/docs/user-manual/en/examples.xml trunk/docs/user-manual/en/ha.xml trunk/docs/user-manual/en/jms-bridge.xml trunk/docs/user-manual/en/management.xml trunk/docs/user-manual/en/perf-tuning.xml trunk/docs/user-manual/en/preface.xml trunk/docs/user-manual/en/send-guarantees.xml trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java trunk/examples/jms/security/server0/hornetq-jms.xml trunk/src/config/common/schema/hornetq-jms.xsd trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml trunk/src/config/ra.xml trunk/src/main/org/hornetq/core/client/ClientProducer.java trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: HORNETQ-185: review core API * used consistently durable/non-durable message (instead of persistent) * renamed methods isBlockOnPersistentSend() to isBlockOnDurableSend() (& ditto for non-durable) * updated XML schema + config * updated doc & examples + fixed ResourceAdapterTest Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -534,14 +534,14 @@ <entry>If true then block on acknowledge of messages.</entry> </row> <row> - <entry>BlockOnNonPersistentSend</entry> + <entry>BlockOnNonDurableSend</entry> <entry>boolean</entry> - <entry>If true then block when sending non persistent messages</entry> + <entry>If true then block when sending non-durable messages</entry> </row> <row> - <entry>BlockOnPersistentSend</entry> + <entry>BlockOnDurableSend</entry> <entry>boolean</entry> - <entry>If true then block when sending persistent messages</entry> + <entry>If true then block when sending durable messages</entry> </row> <row> <entry>AutoGroup</entry> Modified: trunk/docs/user-manual/en/configuration-index.xml =================================================================== --- trunk/docs/user-manual/en/configuration-index.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/configuration-index.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -866,17 +866,17 @@ </row> <row> <entry><link linkend="non-transactional-sends" - >connection-factory.block-on-non-persistent-send</link></entry> + >connection-factory.block-on-non-durable-send</link></entry> <entry>Boolean</entry> - <entry>whether or not non persistent messages are sent + <entry>whether or not non-durable messages are sent synchronously</entry> <entry>false</entry> </row> <row> <entry><link linkend="non-transactional-sends" - >connection-factory.block-on-persistent-send</link></entry> + >connection-factory.block-on-durable-send</link></entry> <entry>Boolean</entry> - <entry>whether or not persistent messages are sent synchronously</entry> + <entry>whether or not durable messages are sent synchronously</entry> <entry>true</entry> </row> <row> Modified: trunk/docs/user-manual/en/examples.xml =================================================================== --- trunk/docs/user-manual/en/examples.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/examples.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -161,7 +161,7 @@ subscriber - i.e. they will accumulate messages sent to the topic even if there is no active subscriber on them. They will also survive server restarts or crashes. Note that for the messages to be persisted, the messages sent to them must be marked - as persistent messages. </para> + as durable messages. </para> </section> <section> <title>Embedded</title> Modified: trunk/docs/user-manual/en/ha.xml =================================================================== --- trunk/docs/user-manual/en/ha.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/ha.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -51,7 +51,7 @@ response serially in an RPC manner before replicating the next piece of data.</para> <para>When the user receives confirmation that a transaction has committed, prepared - or rolled back or a persistent message has been sent, we can guarantee it has + or rolled back or a durable message has been sent, we can guarantee it has reached the backup server and been persisted.</para> <para>Data replication introduces some inevitable performance overhead compared to non replicated operation, but has the advantage in that it requires no expensive @@ -319,7 +319,7 @@ linkend="duplicate-detection"/>) in the transaction, and retry the transaction operations again after the call is unblocked. If the transaction had indeed been committed on the live server successfully before failover, then when - the transaction is retried, duplicate detection will ensure that any persistent + the transaction is retried, duplicate detection will ensure that any durable messages resent in the transaction will be ignored on the server to prevent them getting sent more than once.</para> <note> Modified: trunk/docs/user-manual/en/jms-bridge.xml =================================================================== --- trunk/docs/user-manual/en/jms-bridge.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/jms-bridge.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -368,7 +368,7 @@ to the destination. Therefore there is a possibility that if failure occurs between removing them from the source and them arriving at the destination they could be lost. Hence delivery will occur at most once.</para> - <para>This mode is available for both persistent and non persistent messages.</para> + <para>This mode is available for both durable and non-durable messages.</para> </section> <section> <title>DUPLICATES_OK</title> @@ -378,7 +378,7 @@ destination but before acknowledging them, they could be sent again when the system recovers. I.e. the destination might receive duplicates after a failure.</para> - <para>This mode is available for both persistent and non persistent messages.</para> + <para>This mode is available for both durable and non-durable messages.</para> </section> <section> <title>ONCE_AND_ONLY_ONCE</title> @@ -393,7 +393,7 @@ degree of durability. If JTA is required then both supplied connection factories need to be XAConnectionFactory implementations. This is likely to be the slowest mode since it requires extra persistence for the transaction logging.</para> - <para>This mode is only available for persistent messages.</para> + <para>This mode is only available for durable messages.</para> <note> <para>For a specific application it may possible to provide once and only once semantics without using the ONCE_AND_ONLY_ONCE QoS level. This can be done Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/management.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -376,9 +376,9 @@ <para>The <literal>ConnectionFactoryControl</literal> exposes JMS ConnectionFactory configuration through its attributes (e.g. <literal - flow control, <literal>isBlockOnNonPersistentSend()</literal> to know wether + flow control, <literal>isBlockOnNonDurableSend()</literal> to know wether the producers created from the connection factory will block or not when - sending non-persistent messages, etc.)</para> + sending non-durable messages, etc.)</para> </listitem> </itemizedlist> </section> Modified: trunk/docs/user-manual/en/perf-tuning.xml =================================================================== --- trunk/docs/user-manual/en/perf-tuning.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/perf-tuning.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -95,9 +95,9 @@ acknowledgements with one acknowledge/commit. </para> </listitem> <listitem> - <para>Avoid persistent messages. By default JMS messages are persistent. If you - don't really need persistent messages then set them to be non persistent. - Persistent messages incur a lot more overhead in persisting them to + <para>Avoid durable messages. By default JMS messages are durable. If you + don't really need durable messages then set them to be non-durable. + Durable messages incur a lot more overhead in persisting them to storage.</para> </listitem> </itemizedlist> @@ -107,9 +107,9 @@ <para>There are various other places in HornetQ where we can perform some tuning:</para> <itemizedlist> <listitem> - <para>Use Asynchronous Send Acknowledgements. If you need to send persistent + <para>Use Asynchronous Send Acknowledgements. If you need to send durable messages non transactionally and you need a guarantee that they have reached the - server by the time the call to send() returns, don't set persistent messages to + server by the time the call to send() returns, don't set durable messages to be sent blocking, instead use asynchronous send acknowledgements to get your acknowledgements of send back in a separate stream, see <xref linkend="send-guarantees"/> for more information on this.</para> @@ -143,13 +143,13 @@ <literal>hornetq-configuration.xml</literal> can give you better non-transactional persistent performance at the expense of some possibility of - loss of persistent messages on failure. See <xref linkend="send-guarantees"/> + loss of durable messages on failure. See <xref linkend="send-guarantees"/> for more information.</para> </listitem> <listitem> <para>Send messages non blocking. Setting <literal - >block-on-persistent-send</literal> and <literal - >block-on-non-persistent-send</literal> to <literal>false</literal> in + >block-on-durable-send</literal> and <literal + >block-on-non-durable-send</literal> to <literal>false</literal> in <literal>hornetq-jms.xml</literal> (if you're using JMS and JNDI) or directly on the ClientSessionFactory. This means you don't have to wait a whole network round trip for every message sent. See <xref linkend="send-guarantees"/> Modified: trunk/docs/user-manual/en/preface.xml =================================================================== --- trunk/docs/user-manual/en/preface.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/preface.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -50,8 +50,8 @@ </listitem> <listitem> <para>Superb performance. Our ground-breaking high performance journal provides - persistent messaging performance at rates normally seen for non persistent - messaging, our non persistent messaging performance rocks the boat too.</para> + persistent messaging performance at rates normally seen for non-persistent + messaging, our non-persistent messaging performance rocks the boat too.</para> </listitem> <listitem> <para>Full feature set. All the features you'd expect in any serious messaging system, Modified: trunk/docs/user-manual/en/send-guarantees.xml =================================================================== --- trunk/docs/user-manual/en/send-guarantees.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/docs/user-manual/en/send-guarantees.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -43,19 +43,19 @@ <para>If you are sending messages to a server using a non transacted session, HornetQ can be configured to block the call to send until the message has definitely reached the server, and a response has been sent back to the client. This can be configured - individually for persistent and non-persistent messages, and is determined by the + individually for durable and non-durable messages, and is determined by the following two parameters:</para> <itemizedlist> <listitem> - <para><literal>BlockOnPersistentSend</literal>. If this is set to <literal - >true</literal> then all calls to send for persistent messages on non + <para><literal>BlockOnDurableSend</literal>. If this is set to <literal + >true</literal> then all calls to send for durable messages on non transacted sessions will block until the message has reached the server, and a response has been sent back. The default value is <literal>true</literal>. </para> </listitem> <listitem> - <para><literal>BlockOnNonPersistentSend</literal>. If this is set to <literal - >true</literal> then all calls to send for non-persistent messages on non + <para><literal>BlockOnNonDurableSend</literal>. If this is set to <literal + >true</literal> then all calls to send for non-durable messages on non transacted sessions will block until the message has reached the server, and a response has been sent back. The default value is <literal @@ -72,15 +72,15 @@ <para>If you are using JMS and you're using the JMS service on the server to load your JMS connection factory instances into JNDI then these parameters can be configured in <literal>hornetq-jms.xml</literal> using the elements <literal - >block-on-persistent-send</literal> and <literal - >block-on-non-persistent-send</literal>. If you're using JMS but not using JNDI then + >block-on-durable-send</literal> and <literal + >block-on-non-durable-send</literal>. If you're using JMS but not using JNDI then you can set these values directly on the <literal>HornetQConnectionFactory</literal> instance using the appropriate setter methods.</para> <para>If you're using core you can set these values directly on the <literal methods.</para> <para>When the server receives a message sent from a non transactional session, and that - message is persistent and the message is routed to at least one durable queue, then the + message is durable and the message is routed to at least one durable queue, then the server will persist the message in permanent storage. If the journal parameter <literal server will not send a response back to the client until the message has been persisted Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java =================================================================== --- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -211,7 +211,7 @@ factory.setAckBatchSize(perfParams.getBatchSize()); factory.setBlockOnAcknowledge(perfParams.isBlockOnACK()); - factory.setBlockOnPersistentSend(perfParams.isBlockOnPersistent()); + factory.setBlockOnDurableSend(perfParams.isBlockOnPersistent()); } private void displayAverage(final long numberOfMessages, final long start, final long end) Modified: trunk/examples/jms/security/server0/hornetq-jms.xml =================================================================== --- trunk/examples/jms/security/server0/hornetq-jms.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/examples/jms/security/server0/hornetq-jms.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -6,8 +6,8 @@ <connectors> <connector-ref connector-name="netty-connector"/> </connectors> - <block-on-persistent-send>true</block-on-persistent-send> - <block-on-non-persistent-send>true</block-on-non-persistent-send> + <block-on-durable-send>true</block-on-durable-send> + <block-on-non-durable-send>true</block-on-non-durable-send> <entries> <entry name="ConnectionFactory"/> </entries> Modified: trunk/src/config/common/schema/hornetq-jms.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-jms.xsd 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/config/common/schema/hornetq-jms.xsd 2009-12-08 16:54:49 UTC (rev 8621) @@ -88,10 +88,10 @@ <xsd:element name="block-on-acknowledge" type="xsd:boolean" maxOccurs="1" minOccurs="0"> </xsd:element> - <xsd:element name="block-on-non-persistent-send" type="xsd:boolean" + <xsd:element name="block-on-non-durable-send" type="xsd:boolean" maxOccurs="1" minOccurs="0"> </xsd:element> - <xsd:element name="block-on-persistent-send" type="xsd:boolean" + <xsd:element name="block-on-durable-send" type="xsd:boolean" maxOccurs="1" minOccurs="0"> </xsd:element> <xsd:element name="auto-group-id" type="xsd:boolean" Modified: trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml =================================================================== --- trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -185,14 +185,14 @@ <config-property-value></config-property-value> </config-property> <config-property> - <description>The block on non persistent send</description> - <config-property-name>BlockOnNonPersistentSend</config-property-name> + <description>The block on non durable send</description> + <config-property-name>BlockOnNonDurableSend</config-property-name> <config-property-type>java.lang.Boolean</config-property-type> <config-property-value></config-property-value> </config-property> <config-property> - <description>The block on persistent send</description> - <config-property-name>BlockOnPersistentSend</config-property-name> + <description>The block on durable send</description> + <config-property-name>BlockOnDurableSend</config-property-name> <config-property-type>java.lang.Boolean</config-property-type> <config-property-value></config-property-value> </config-property> Modified: trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -185,14 +185,14 @@ <config-property-value></config-property-value> </config-property> <config-property> - <description>The block on non persistent send</description> - <config-property-name>BlockOnNonPersistentSend</config-property-name> + <description>The block on non-durable send</description> + <config-property-name>BlockOnNonDurableSend</config-property-name> <config-property-type>java.lang.Boolean</config-property-type> <config-property-value></config-property-value> </config-property> <config-property> - <description>The block on persistent send</description> - <config-property-name>BlockOnPersistentSend</config-property-name> + <description>The block on durable send</description> + <config-property-name>BlockOnDurableSend</config-property-name> <config-property-type>java.lang.Boolean</config-property-type> <config-property-value></config-property-value> </config-property> Modified: trunk/src/config/ra.xml =================================================================== --- trunk/src/config/ra.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/config/ra.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -185,14 +185,14 @@ <config-property-value></config-property-value> </config-property> <config-property> - <description>The block on non persistent send</description> - <config-property-name>BlockOnNonPersistentSend</config-property-name> + <description>The block on non durable send</description> + <config-property-name>BlockOnNonDurableSend</config-property-name> <config-property-type>java.lang.Boolean</config-property-type> <config-property-value></config-property-value> </config-property> <config-property> - <description>The block on persistent send</description> - <config-property-name>BlockOnPersistentSend</config-property-name> + <description>The block on durable send</description> + <config-property-name>BlockOnDurableSend</config-property-name> <config-property-type>java.lang.Boolean</config-property-type> <config-property-value></config-property-value> </config-property> Modified: trunk/src/main/org/hornetq/core/client/ClientProducer.java =================================================================== --- trunk/src/main/org/hornetq/core/client/ClientProducer.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/ClientProducer.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -73,18 +73,18 @@ boolean isClosed(); /** - * Return whether the producer will block when sending <em>persistent</em> messages. + * Return whether the producer will block when sending <em>durable</em> messages. * - * @return <code>true</code> if the producer blocks when sending persistent, <code>false</code> else + * @return <code>true</code> if the producer blocks when sending durable, <code>false</code> else */ - boolean isBlockOnPersistentSend(); + boolean isBlockOnDurableSend(); /** - * Return whether the producer will block when sending <em>non-persistent</em> messages. + * Return whether the producer will block when sending <em>non-durable</em> messages. * - * @return <code>true</code> if the producer blocks when sending non-persistent, <code>false</code> else + * @return <code>true</code> if the producer blocks when sending non-durable, <code>false</code> else */ - boolean isBlockOnNonPersistentSend(); + boolean isBlockOnNonDurableSend(); /** * Return the producer maximum rate. Modified: trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -368,36 +368,36 @@ void setBlockOnAcknowledge(boolean blockOnAcknowledge); /** - * Return whether producers created through this factory will block while sending <em>persistent</em> messages or do it asynchronously. + * Return whether producers created through this factory will block while sending <em>durable</em> messages or do it asynchronously. * - * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_PERSISTENT_SEND}. + * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_DURABLE_SEND}. * * @return whether producers will block while sending persistent messages or do it asynchronously */ - boolean isBlockOnPersistentSend(); + boolean isBlockOnDurableSend(); /** - * Set whether producers created through this factory will block while sending <em>persistent</em> messages or do it asynchronously. + * Set whether producers created through this factory will block while sending <em>durable</em> messages or do it asynchronously. * - * @param blockOnPersistentSend <code>true</code> to block when sending persistent messages or <code>false</code> to send them asynchronously + * @param blockOnDurableSend <code>true</code> to block when sending durable messages or <code>false</code> to send them asynchronously */ - void setBlockOnPersistentSend(boolean blockOnPersistentSend); + void setBlockOnDurableSend(boolean blockOnDurableSend); /** - * Return whether producers created through this factory will block while sending <em>non-persistent</em> messages or do it asynchronously. + * Return whether producers created through this factory will block while sending <em>non-durable</em> messages or do it asynchronously. * - * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND}. + * Default value is {@value org.hornetq.core.client.impl.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. * - * @return whether producers will block while sending non-persistent messages or do it asynchronously + * @return whether producers will block while sending non-durable messages or do it asynchronously */ - boolean isBlockOnNonPersistentSend(); + boolean isBlockOnNonDurableSend(); /** - * Set whether producers created through this factory will block while sending <em>non-persistent</em> messages or do it asynchronously. + * Set whether producers created through this factory will block while sending <em>non-durable</em> messages or do it asynchronously. * - * @param blockOnNonPersistentSend <code>true</code> to block when sending non-persistent messages or <code>false</code> to send them asynchronously + * @param blockOnNonDurableSend <code>true</code> to block when sending non-durable messages or <code>false</code> to send them asynchronously */ - void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend); + void setBlockOnNonDurableSend(boolean blockOnNonDurableSend); /** * Return whether producers created through this factory will automatically Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -61,9 +61,9 @@ private final TokenBucketLimiter rateLimiter; - private final boolean blockOnNonPersistentSend; + private final boolean blockOnNonDurableSend; - private final boolean blockOnPersistentSend; + private final boolean blockOnDurableSend; private final SimpleString groupID; @@ -78,8 +78,8 @@ public ClientProducerImpl(final ClientSessionInternal session, final SimpleString address, final TokenBucketLimiter rateLimiter, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend, + final boolean blockOnNonDurableSend, + final boolean blockOnDurableSend, final boolean autoGroup, final SimpleString groupID, final int minLargeMessageSize, @@ -93,9 +93,9 @@ this.rateLimiter = rateLimiter; - this.blockOnNonPersistentSend = blockOnNonPersistentSend; + this.blockOnNonDurableSend = blockOnNonDurableSend; - this.blockOnPersistentSend = blockOnPersistentSend; + this.blockOnDurableSend = blockOnDurableSend; if (autoGroup) { @@ -169,14 +169,14 @@ return closed; } - public boolean isBlockOnPersistentSend() + public boolean isBlockOnDurableSend() { - return blockOnPersistentSend; + return blockOnDurableSend; } - public boolean isBlockOnNonPersistentSend() + public boolean isBlockOnNonDurableSend() { - return blockOnNonPersistentSend; + return blockOnNonDurableSend; } public int getMaxRate() @@ -229,7 +229,7 @@ msg.putStringProperty(MessageImpl.HDR_GROUP_ID, groupID); } - boolean sendBlocking = msg.isDurable() ? blockOnPersistentSend : blockOnNonPersistentSend; + boolean sendBlocking = msg.isDurable() ? blockOnDurableSend : blockOnNonDurableSend; session.workDone(); Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -82,9 +82,9 @@ public static final boolean DEFAULT_BLOCK_ON_ACKNOWLEDGE = false; - public static final boolean DEFAULT_BLOCK_ON_PERSISTENT_SEND = true; + public static final boolean DEFAULT_BLOCK_ON_DURABLE_SEND = true; - public static final boolean DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND = false; + public static final boolean DEFAULT_BLOCK_ON_NON_DURABLE_SEND = false; public static final boolean DEFAULT_AUTO_GROUP = false; @@ -171,9 +171,9 @@ private boolean blockOnAcknowledge; - private boolean blockOnPersistentSend; + private boolean blockOnDurableSend; - private boolean blockOnNonPersistentSend; + private boolean blockOnNonDurableSend; private boolean autoGroup; @@ -355,9 +355,9 @@ blockOnAcknowledge = other.isBlockOnAcknowledge(); - blockOnPersistentSend = other.isBlockOnPersistentSend(); + blockOnDurableSend = other.isBlockOnDurableSend(); - blockOnNonPersistentSend = other.isBlockOnNonPersistentSend(); + blockOnNonDurableSend = other.isBlockOnNonDurableSend(); autoGroup = other.isAutoGroup(); @@ -416,9 +416,9 @@ blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - blockOnPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND; + blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; - blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND; + blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; @@ -617,26 +617,26 @@ this.blockOnAcknowledge = blockOnAcknowledge; } - public synchronized boolean isBlockOnPersistentSend() + public synchronized boolean isBlockOnDurableSend() { - return blockOnPersistentSend; + return blockOnDurableSend; } - public synchronized void setBlockOnPersistentSend(final boolean blockOnPersistentSend) + public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) { checkWrite(); - this.blockOnPersistentSend = blockOnPersistentSend; + this.blockOnDurableSend = blockOnDurableSend; } - public synchronized boolean isBlockOnNonPersistentSend() + public synchronized boolean isBlockOnNonDurableSend() { - return blockOnNonPersistentSend; + return blockOnNonDurableSend; } - public synchronized void setBlockOnNonPersistentSend(final boolean blockOnNonPersistentSend) + public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) { checkWrite(); - this.blockOnNonPersistentSend = blockOnNonPersistentSend; + this.blockOnNonDurableSend = blockOnNonDurableSend; } public synchronized boolean isAutoGroup() @@ -1133,8 +1133,8 @@ consumerWindowSize, producerMaxRate, consumerMaxRate, - blockOnNonPersistentSend, - blockOnPersistentSend, + blockOnNonDurableSend, + blockOnDurableSend, initialMessagePacketSize, groupID); Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -146,9 +146,9 @@ private final int producerMaxRate; - private final boolean blockOnNonPersistentSend; + private final boolean blockOnNonDurableSend; - private final boolean blockOnPersistentSend; + private final boolean blockOnDurableSend; private final int minLargeMessageSize; @@ -197,8 +197,8 @@ final int confirmationWindowSize, final int producerWindowSize, final int producerMaxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend, + final boolean blockOnNonDurableSend, + final boolean blockOnDurableSend, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int initialMessagePacketSize, @@ -246,9 +246,9 @@ this.producerMaxRate = producerMaxRate; - this.blockOnNonPersistentSend = blockOnNonPersistentSend; + this.blockOnNonDurableSend = blockOnNonDurableSend; - this.blockOnPersistentSend = blockOnPersistentSend; + this.blockOnDurableSend = blockOnDurableSend; this.cacheLargeMessageClient = cacheLargeMessageClient; @@ -1521,8 +1521,8 @@ address, maxRate == -1 ? null : new TokenBucketLimiterImpl(maxRate, false), - autoCommitSends && blockOnNonPersistentSend, - autoCommitSends && blockOnPersistentSend, + autoCommitSends && blockOnNonDurableSend, + autoCommitSends && blockOnDurableSend, autoGroup, groupID == null ? null : new SimpleString(groupID), minLargeMessageSize, Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -45,8 +45,8 @@ final int consumerWindowSize, final int producerMaxRate, final int consumerMaxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend, + final boolean blockOnNonDurableSend, + final boolean blockOnDurableSend, final int initialMessagePacketSize, final String groupID) throws HornetQException; Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -305,8 +305,8 @@ final int consumerWindowSize, final int producerMaxRate, final int consumerMaxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend, + final boolean blockOnNonDurableSend, + final boolean blockOnDurableSend, final int initialMessagePacketSize, final String groupID) throws HornetQException { @@ -413,8 +413,8 @@ confWindowSize, producerWindowSize, producerMaxRate, - blockOnNonPersistentSend, - blockOnPersistentSend, + blockOnNonDurableSend, + blockOnDurableSend, cacheLargeMessageClient, minLargeMessageSize, initialMessagePacketSize, Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -662,7 +662,7 @@ csf.setRetryInterval(retryInterval); csf.setRetryIntervalMultiplier(retryIntervalMultiplier); csf.setReconnectAttempts(reconnectAttempts); - csf.setBlockOnPersistentSend(false); + csf.setBlockOnDurableSend(false); // Must have confirmations enabled so we get send acks Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -409,26 +409,26 @@ sessionFactory.setBlockOnAcknowledge(blockOnAcknowledge); } - public synchronized boolean isBlockOnNonPersistentSend() + public synchronized boolean isBlockOnNonDurableSend() { - return sessionFactory.isBlockOnNonPersistentSend(); + return sessionFactory.isBlockOnNonDurableSend(); } - public synchronized void setBlockOnNonPersistentSend(final boolean blockOnNonPersistentSend) + public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) { checkWrite(); - sessionFactory.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + sessionFactory.setBlockOnNonDurableSend(blockOnNonDurableSend); } - public synchronized boolean isBlockOnPersistentSend() + public synchronized boolean isBlockOnDurableSend() { - return sessionFactory.isBlockOnPersistentSend(); + return sessionFactory.isBlockOnDurableSend(); } - public synchronized void setBlockOnPersistentSend(final boolean blockOnPersistentSend) + public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) { checkWrite(); - sessionFactory.setBlockOnPersistentSend(blockOnPersistentSend); + sessionFactory.setBlockOnDurableSend(blockOnDurableSend); } public synchronized boolean isAutoGroup() Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -150,8 +150,8 @@ int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, - boolean blockOnPersistentSend, - boolean blockOnNonPersistentSend, + boolean blockOnDurableSend, + boolean blockOnNonDurableSend, boolean autoGroup, boolean preAcknowledge, String loadBalancingPolicyClassName, @@ -184,8 +184,8 @@ int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, - boolean blockOnPersistentSend, - boolean blockOnNonPersistentSend, + boolean blockOnDurableSend, + boolean blockOnNonDurableSend, boolean autoGroup, boolean preAcknowledge, String loadBalancingPolicyClassName, Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -95,13 +95,13 @@ void setBlockOnAcknowledge(boolean blockOnAcknowledge); - boolean isBlockOnPersistentSend(); + boolean isBlockOnDurableSend(); - void setBlockOnPersistentSend(boolean blockOnPersistentSend); + void setBlockOnDurableSend(boolean blockOnDurableSend); - boolean isBlockOnNonPersistentSend(); + boolean isBlockOnNonDurableSend(); - void setBlockOnNonPersistentSend(boolean blockOnNonPersistentSend); + void setBlockOnNonDurableSend(boolean blockOnNonDurableSend); boolean isAutoGroup(); Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -70,9 +70,9 @@ private boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - private boolean blockOnPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND; + private boolean blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; - private boolean blockOnNonPersistentSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND; + private boolean blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; private boolean autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; @@ -324,24 +324,24 @@ this.blockOnAcknowledge = blockOnAcknowledge; } - public boolean isBlockOnPersistentSend() + public boolean isBlockOnDurableSend() { - return blockOnPersistentSend; + return blockOnDurableSend; } - public void setBlockOnPersistentSend(final boolean blockOnPersistentSend) + public void setBlockOnDurableSend(final boolean blockOnDurableSend) { - this.blockOnPersistentSend = blockOnPersistentSend; + this.blockOnDurableSend = blockOnDurableSend; } - public boolean isBlockOnNonPersistentSend() + public boolean isBlockOnNonDurableSend() { - return blockOnNonPersistentSend; + return blockOnNonDurableSend; } - public void setBlockOnNonPersistentSend(final boolean blockOnNonPersistentSend) + public void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) { - this.blockOnNonPersistentSend = blockOnNonPersistentSend; + this.blockOnNonDurableSend = blockOnNonDurableSend; } public boolean isAutoGroup() Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -170,12 +170,12 @@ boolean blockOnAcknowledge = XMLConfigurationUtil.getBoolean(e, "block-on-acknowledge", ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - boolean blockOnNonPersistentSend = XMLConfigurationUtil.getBoolean(e, - "block-on-non-persistent-send", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - boolean blockOnPersistentSend = XMLConfigurationUtil.getBoolean(e, - "block-on-persistent-send", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + boolean blockOnNonDurableSend = XMLConfigurationUtil.getBoolean(e, + "block-on-non-durable-send", + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + boolean blockOnDurableSend = XMLConfigurationUtil.getBoolean(e, + "block-on-durable-send", + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); boolean autoGroup = XMLConfigurationUtil.getBoolean(e, "auto-group", ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); @@ -318,8 +318,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, connectionLoadBalancingPolicyClassName, @@ -353,8 +353,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, connectionLoadBalancingPolicyClassName, Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -393,8 +393,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -428,8 +428,8 @@ cf.setProducerWindowSize(producerWindowSize); cf.setProducerMaxRate(producerMaxRate); cf.setBlockOnAcknowledge(blockOnAcknowledge); - cf.setBlockOnPersistentSend(blockOnPersistentSend); - cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + cf.setBlockOnDurableSend(blockOnDurableSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); cf.setAutoGroup(autoGroup); cf.setPreAcknowledge(preAcknowledge); cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName); @@ -465,8 +465,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -502,8 +502,8 @@ cf.setProducerWindowSize(producerWindowSize); cf.setProducerMaxRate(producerMaxRate); cf.setBlockOnAcknowledge(blockOnAcknowledge); - cf.setBlockOnPersistentSend(blockOnPersistentSend); - cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + cf.setBlockOnDurableSend(blockOnDurableSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); cf.setAutoGroup(autoGroup); cf.setPreAcknowledge(preAcknowledge); cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName); @@ -783,8 +783,8 @@ config.getProducerWindowSize(), config.getProducerMaxRate(), config.isBlockOnAcknowledge(), - config.isBlockOnPersistentSend(), - config.isBlockOnNonPersistentSend(), + config.isBlockOnDurableSend(), + config.isBlockOnNonDurableSend(), config.isAutoGroup(), config.isPreAcknowledge(), config.getLoadBalancingPolicyClassName(), @@ -818,8 +818,8 @@ config.getProducerWindowSize(), config.getProducerMaxRate(), config.isBlockOnAcknowledge(), - config.isBlockOnPersistentSend(), - config.isBlockOnNonPersistentSend(), + config.isBlockOnDurableSend(), + config.isBlockOnNonDurableSend(), config.isAutoGroup(), config.isPreAcknowledge(), config.getLoadBalancingPolicyClassName(), Modified: trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/management/ConnectionFactoryControl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -46,9 +46,9 @@ boolean isBlockOnAcknowledge(); - boolean isBlockOnPersistentSend(); + boolean isBlockOnDurableSend(); - boolean isBlockOnNonPersistentSend(); + boolean isBlockOnNonDurableSend(); boolean isPreAcknowledge(); Modified: trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -106,8 +106,8 @@ int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, - boolean blockOnPersistentSend, - boolean blockOnNonPersistentSend, + boolean blockOnDurableSend, + boolean blockOnNonDurableSend, boolean autoGroup, boolean preAcknowledge, String loadBalancingPolicyClassName, @@ -141,8 +141,8 @@ @Parameter(name = "producerWindowSize") int producerWindowSize, @Parameter(name = "producerMaxRate") int producerMaxRate, @Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge, - @Parameter(name = "blockOnPersistentSend") boolean blockOnPersistentSend, - @Parameter(name = "blockOnNonPersistentSend") boolean blockOnNonPersistentSend, + @Parameter(name = "blockOnDurableSend") boolean blockOnDurableSend, + @Parameter(name = "blockOnNonDurableSend") boolean blockOnNonDurableSend, @Parameter(name = "autoGroup") boolean autoGroup, @Parameter(name = "preAcknowledge") boolean preAcknowledge, @Parameter(name = "loadBalancingPolicyClassName") String loadBalancingPolicyClassName, @@ -188,8 +188,8 @@ int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, - boolean blockOnPersistentSend, - boolean blockOnNonPersistentSend, + boolean blockOnDurableSend, + boolean blockOnNonDurableSend, boolean autoGroup, boolean preAcknowledge, String loadBalancingPolicyClassName, @@ -224,8 +224,8 @@ @Parameter(name = "producerWindowSize") int producerWindowSize, @Parameter(name = "producerMaxRate") int producerMaxRate, @Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge, - @Parameter(name = "blockOnPersistentSend") boolean blockOnPersistentSend, - @Parameter(name = "blockOnNonPersistentSend") boolean blockOnNonPersistentSend, + @Parameter(name = "blockOnDurableSend") boolean blockOnDurableSend, + @Parameter(name = "blockOnNonDurableSend") boolean blockOnNonDurableSend, @Parameter(name = "autoGroup") boolean autoGroup, @Parameter(name = "preAcknowledge") boolean preAcknowledge, @Parameter(name = "loadBalancingPolicyClassName") String loadBalancingPolicyClassName, Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSConnectionFactoryControlImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -107,14 +107,14 @@ return cf.isBlockOnAcknowledge(); } - public boolean isBlockOnNonPersistentSend() + public boolean isBlockOnNonDurableSend() { - return cf.isBlockOnNonPersistentSend(); + return cf.isBlockOnNonDurableSend(); } - public boolean isBlockOnPersistentSend() + public boolean isBlockOnDurableSend() { - return cf.isBlockOnPersistentSend(); + return cf.isBlockOnDurableSend(); } public boolean isPreAcknowledge() Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -234,8 +234,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -273,8 +273,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, @@ -311,8 +311,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -352,8 +352,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, @@ -411,8 +411,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -448,8 +448,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, @@ -486,8 +486,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -523,8 +523,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, Modified: trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java =================================================================== --- trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -84,9 +84,9 @@ private Boolean blockOnAcknowledge; - private Boolean blockOnNonPersistentSend; + private Boolean blockOnNonDurableSend; - private Boolean blockOnPersistentSend; + private Boolean blockOnDurableSend; private Boolean autoGroup; @@ -493,44 +493,44 @@ this.blockOnAcknowledge = blockOnAcknowledge; } - public Boolean isBlockOnNonPersistentSend() + public Boolean isBlockOnNonDurableSend() { if (ConnectionFactoryProperties.trace) { - ConnectionFactoryProperties.log.trace("isBlockOnNonPersistentSend()"); + ConnectionFactoryProperties.log.trace("isBlockOnNonDurableSend()"); } hasBeenUpdated = true; - return blockOnNonPersistentSend; + return blockOnNonDurableSend; } - public void setBlockOnNonPersistentSend(final Boolean blockOnNonPersistentSend) + public void setBlockOnNonDurableSend(final Boolean blockOnNonDurableSend) { if (ConnectionFactoryProperties.trace) { - ConnectionFactoryProperties.log.trace("setBlockOnNonPersistentSend(" + blockOnNonPersistentSend + ")"); + ConnectionFactoryProperties.log.trace("setBlockOnNonDurableSend(" + blockOnNonDurableSend + ")"); } hasBeenUpdated = true; - this.blockOnNonPersistentSend = blockOnNonPersistentSend; + this.blockOnNonDurableSend = blockOnNonDurableSend; } - public Boolean isBlockOnPersistentSend() + public Boolean isBlockOnDurableSend() { if (ConnectionFactoryProperties.trace) { - ConnectionFactoryProperties.log.trace("isBlockOnPersistentSend()"); + ConnectionFactoryProperties.log.trace("isBlockOnDurableSend()"); } hasBeenUpdated = true; - return blockOnPersistentSend; + return blockOnDurableSend; } - public void setBlockOnPersistentSend(final Boolean blockOnPersistentSend) + public void setBlockOnDurableSend(final Boolean blockOnDurableSend) { if (ConnectionFactoryProperties.trace) { - ConnectionFactoryProperties.log.trace("setBlockOnPersistentSend(" + blockOnPersistentSend + ")"); + ConnectionFactoryProperties.log.trace("setBlockOnDurableSend(" + blockOnDurableSend + ")"); } hasBeenUpdated = true; - this.blockOnPersistentSend = blockOnPersistentSend; + this.blockOnDurableSend = blockOnDurableSend; } public Boolean isAutoGroup() Modified: trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -598,24 +598,24 @@ mcfProperties.setBlockOnAcknowledge(blockOnAcknowledge); } - public Boolean isBlockOnNonPersistentSend() + public Boolean isBlockOnNonDurableSend() { - return mcfProperties.isBlockOnNonPersistentSend(); + return mcfProperties.isBlockOnNonDurableSend(); } - public void setBlockOnNonPersistentSend(final Boolean blockOnNonPersistentSend) + public void setBlockOnNonDurableSend(final Boolean blockOnNonDurableSend) { - mcfProperties.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + mcfProperties.setBlockOnNonDurableSend(blockOnNonDurableSend); } - public Boolean isBlockOnPersistentSend() + public Boolean isBlockOnDurableSend() { - return mcfProperties.isBlockOnPersistentSend(); + return mcfProperties.isBlockOnDurableSend(); } - public void setBlockOnPersistentSend(final Boolean blockOnPersistentSend) + public void setBlockOnDurableSend(final Boolean blockOnDurableSend) { - mcfProperties.setBlockOnPersistentSend(blockOnPersistentSend); + mcfProperties.setBlockOnDurableSend(blockOnDurableSend); } public Boolean isAutoGroup() Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -753,63 +753,63 @@ } /** - * Get block on non persistent send + * Get block on non durable send * * @return The value */ - public Boolean getBlockOnNonPersistentSend() + public Boolean getBlockOnNonDurableSend() { if (HornetQResourceAdapter.trace) { - HornetQResourceAdapter.log.trace("getBlockOnNonPersistentSend()"); + HornetQResourceAdapter.log.trace("getBlockOnNonDurableSend()"); } - return raProperties.isBlockOnNonPersistentSend(); + return raProperties.isBlockOnNonDurableSend(); } /** - * Set block on non persistent send + * Set block on non durable send * - * @param blockOnNonPersistentSend The value + * @param blockOnNonDurableSend The value */ - public void setBlockOnNonPersistentSend(final Boolean blockOnNonPersistentSend) + public void setBlockOnNonDurableSend(final Boolean blockOnNonDurableSend) { if (HornetQResourceAdapter.trace) { - HornetQResourceAdapter.log.trace("setBlockOnNonPersistentSend(" + blockOnNonPersistentSend + ")"); + HornetQResourceAdapter.log.trace("setBlockOnNonDurableSend(" + blockOnNonDurableSend + ")"); } - raProperties.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + raProperties.setBlockOnNonDurableSend(blockOnNonDurableSend); } /** - * Get block on persistent send + * Get block on durable send * * @return The value */ - public Boolean getBlockOnPersistentSend() + public Boolean getBlockOnDurableSend() { if (HornetQResourceAdapter.trace) { - HornetQResourceAdapter.log.trace("getBlockOnPersistentSend()"); + HornetQResourceAdapter.log.trace("getBlockOnDurableSend()"); } - return raProperties.isBlockOnPersistentSend(); + return raProperties.isBlockOnDurableSend(); } /** - * Set block on persistent send + * Set block on durable send * - * @param blockOnPersistentSend The value + * @param blockOnDurableSend The value */ - public void setBlockOnPersistentSend(final Boolean blockOnPersistentSend) + public void setBlockOnDurableSend(final Boolean blockOnDurableSend) { if (HornetQResourceAdapter.trace) { - HornetQResourceAdapter.log.trace("setBlockOnPersistentSend(" + blockOnPersistentSend + ")"); + HornetQResourceAdapter.log.trace("setBlockOnDurableSend(" + blockOnDurableSend + ")"); } - raProperties.setBlockOnPersistentSend(blockOnPersistentSend); + raProperties.setBlockOnDurableSend(blockOnDurableSend); } /** @@ -1421,17 +1421,17 @@ { cf.setBlockOnAcknowledge(val); } - val = overrideProperties.isBlockOnNonPersistentSend() != null ? overrideProperties.isBlockOnNonPersistentSend() - : raProperties.isBlockOnNonPersistentSend(); + val = overrideProperties.isBlockOnNonDurableSend() != null ? overrideProperties.isBlockOnNonDurableSend() + : raProperties.isBlockOnNonDurableSend(); if (val != null) { - cf.setBlockOnNonPersistentSend(val); + cf.setBlockOnNonDurableSend(val); } - val = overrideProperties.isBlockOnPersistentSend() != null ? overrideProperties.isBlockOnPersistentSend() - : raProperties.isBlockOnPersistentSend(); + val = overrideProperties.isBlockOnDurableSend() != null ? overrideProperties.isBlockOnDurableSend() + : raProperties.isBlockOnDurableSend(); if (val != null) { - cf.setBlockOnPersistentSend(val); + cf.setBlockOnDurableSend(val); } val = overrideProperties.isFailoverOnServerShutdown() != null ? overrideProperties.isFailoverOnServerShutdown() : raProperties.isFailoverOnServerShutdown(); Modified: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml =================================================================== --- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-12-08 16:54:49 UTC (rev 8621) @@ -24,8 +24,8 @@ <dups-ok-batch-size>3456</dups-ok-batch-size> <transaction-batch-size>4567</transaction-batch-size> <block-on-acknowledge>true</block-on-acknowledge> - <block-on-non-persistent-send>false</block-on-non-persistent-send> - <block-on-persistent-send>true</block-on-persistent-send> + <block-on-non-durable-send>false</block-on-non-durable-send> + <block-on-durable-send>true</block-on-durable-send> <auto-group-id>false</auto-group-id> <pre-acknowledge>true</pre-acknowledge> <connection-ttl>2345</connection-ttl> Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -1175,8 +1175,8 @@ public ClientProducer createProducer(final SimpleString address, final int maxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend) throws HornetQException + final boolean blockOnNonDurableSend, + final boolean blockOnDurableSend) throws HornetQException { return null; } @@ -1193,8 +1193,8 @@ public ClientProducer createProducer(final String address, final int maxRate, - final boolean blockOnNonPersistentSend, - final boolean blockOnPersistentSend) throws HornetQException + final boolean blockOnNonDurableSend, + final boolean blockOnDurableSend) throws HornetQException { return null; } Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -306,7 +306,7 @@ ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(false); + sf.setBlockOnNonDurableSend(false); ClientSession session = sf.createSession(false, true, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/BlockingSendTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -60,7 +60,7 @@ System.out.println("sync = " + server.getConfiguration().isJournalSyncNonTransactional()); factory = createFactory(false); - factory.setBlockOnPersistentSend(true); + factory.setBlockOnDurableSend(true); session = factory.createSession(); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -81,7 +81,7 @@ try { messagingService.start(); - cf.setBlockOnNonPersistentSend(false); + cf.setBlockOnNonDurableSend(false); int numMessage = 100; cf.setConsumerWindowSize(numMessage * getMessageEncodeSize(addressA)); ClientSession sendSession = cf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -2537,8 +2537,8 @@ if (sendBlocking) { - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -60,8 +60,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(null, null, false, false, false, false, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -208,8 +208,8 @@ server.start(); sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); session = sf.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/OrderTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -75,8 +75,8 @@ ClientSessionFactory sf = createNettyFactory(); - sf.setBlockOnNonPersistentSend(false); - sf.setBlockOnPersistentSend(false); + sf.setBlockOnNonDurableSend(false); + sf.setBlockOnDurableSend(false); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(true, true, 0); @@ -165,8 +165,8 @@ ClientSessionFactory sf = createNettyFactory(); - sf.setBlockOnNonPersistentSend(false); - sf.setBlockOnPersistentSend(false); + sf.setBlockOnNonDurableSend(false); + sf.setBlockOnDurableSend(false); sf.setBlockOnAcknowledge(false); ClientSession session = sf.createSession(true, true, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -102,8 +102,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -251,8 +251,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -394,8 +394,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -530,8 +530,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, false, true, false, 0); @@ -607,8 +607,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, false, false, false, 0); @@ -701,8 +701,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -842,8 +842,8 @@ { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, !transacted, true, false, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -65,7 +65,7 @@ { sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -89,7 +89,7 @@ public void testConsumerReceiveImmediateWithSessionStop() throws Exception { sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); @@ -122,7 +122,7 @@ private void doConsumerReceiveImmediateWithNoMessages(final boolean browser) throws Exception { sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); @@ -144,7 +144,7 @@ private void doConsumerReceiveImmediate(final boolean browser) throws Exception { sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -36,8 +36,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer = clientSession.createConsumer(queueName); @@ -58,8 +58,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); try { @@ -86,8 +86,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer = clientSession.createConsumer(queueName, "foo=bar"); @@ -108,8 +108,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); try @@ -137,8 +137,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer = clientSession.createConsumer(queueName, null, true); @@ -159,8 +159,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); clientSession.createQueue(queueName, queueName, false); ClientConsumer consumer = clientSession.createConsumer(queueName, null, 100, 100, false); Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -34,14 +34,14 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); ClientProducer producer = clientSession.createProducer(); Assert.assertNull(producer.getAddress()); Assert.assertEquals(cf.getProducerMaxRate(), producer.getMaxRate()); - Assert.assertEquals(cf.isBlockOnNonPersistentSend(), producer.isBlockOnNonPersistentSend()); - Assert.assertEquals(cf.isBlockOnPersistentSend(), producer.isBlockOnPersistentSend()); + Assert.assertEquals(cf.isBlockOnNonDurableSend(), producer.isBlockOnNonDurableSend()); + Assert.assertEquals(cf.isBlockOnDurableSend(), producer.isBlockOnDurableSend()); Assert.assertFalse(producer.isClosed()); clientSession.close(); } @@ -59,14 +59,14 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); ClientProducer producer = clientSession.createProducer("testAddress"); Assert.assertNotNull(producer.getAddress()); Assert.assertEquals(cf.getProducerMaxRate(), producer.getMaxRate()); - Assert.assertEquals(cf.isBlockOnNonPersistentSend(), producer.isBlockOnNonPersistentSend()); - Assert.assertEquals(cf.isBlockOnPersistentSend(), producer.isBlockOnPersistentSend()); + Assert.assertEquals(cf.isBlockOnNonDurableSend(), producer.isBlockOnNonDurableSend()); + Assert.assertEquals(cf.isBlockOnDurableSend(), producer.isBlockOnDurableSend()); Assert.assertFalse(producer.isClosed()); clientSession.close(); } @@ -84,8 +84,8 @@ service.start(); ClientSessionFactory cf = createInVMFactory(); cf.setProducerMaxRate(99); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnNonDurableSend(true); ClientSessionInternal clientSession = (ClientSessionInternal)cf.createSession(false, true, true); clientSession.close(); try Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -133,8 +133,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -193,8 +193,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -243,8 +243,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -293,8 +293,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -343,8 +343,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -389,8 +389,8 @@ int confirmationWindowSize = RandomUtil.randomPositiveInt(); int producerMaxRate = RandomUtil.randomPositiveInt(); boolean blockOnAcknowledge = RandomUtil.randomBoolean(); - boolean blockOnPersistentSend = RandomUtil.randomBoolean(); - boolean blockOnNonPersistentSend = RandomUtil.randomBoolean(); + boolean blockOnDurableSend = RandomUtil.randomBoolean(); + boolean blockOnNonDurableSend = RandomUtil.randomBoolean(); boolean autoGroup = RandomUtil.randomBoolean(); boolean preAcknowledge = RandomUtil.randomBoolean(); String loadBalancingPolicyClassName = RandomUtil.randomString(); @@ -417,8 +417,8 @@ cf.setConfirmationWindowSize(confirmationWindowSize); cf.setProducerMaxRate(producerMaxRate); cf.setBlockOnAcknowledge(blockOnAcknowledge); - cf.setBlockOnPersistentSend(blockOnPersistentSend); - cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + cf.setBlockOnDurableSend(blockOnDurableSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); cf.setAutoGroup(autoGroup); cf.setPreAcknowledge(preAcknowledge); cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName); @@ -445,8 +445,8 @@ Assert.assertEquals(confirmationWindowSize, cf.getConfirmationWindowSize()); Assert.assertEquals(producerMaxRate, cf.getProducerMaxRate()); Assert.assertEquals(blockOnAcknowledge, cf.isBlockOnAcknowledge()); - Assert.assertEquals(blockOnPersistentSend, cf.isBlockOnPersistentSend()); - Assert.assertEquals(blockOnNonPersistentSend, cf.isBlockOnNonPersistentSend()); + Assert.assertEquals(blockOnDurableSend, cf.isBlockOnDurableSend()); + Assert.assertEquals(blockOnNonDurableSend, cf.isBlockOnNonDurableSend()); Assert.assertEquals(autoGroup, cf.isAutoGroup()); Assert.assertEquals(preAcknowledge, cf.isPreAcknowledge()); Assert.assertEquals(loadBalancingPolicyClassName, cf.getConnectionLoadBalancingPolicyClassName()); @@ -481,8 +481,8 @@ int confirmationWindowSize = RandomUtil.randomPositiveInt(); int producerMaxRate = RandomUtil.randomPositiveInt(); boolean blockOnAcknowledge = RandomUtil.randomBoolean(); - boolean blockOnPersistentSend = RandomUtil.randomBoolean(); - boolean blockOnNonPersistentSend = RandomUtil.randomBoolean(); + boolean blockOnDurableSend = RandomUtil.randomBoolean(); + boolean blockOnNonDurableSend = RandomUtil.randomBoolean(); boolean autoGroup = RandomUtil.randomBoolean(); boolean preAcknowledge = RandomUtil.randomBoolean(); String loadBalancingPolicyClassName = RandomUtil.randomString(); @@ -615,7 +615,7 @@ } try { - cf.setBlockOnPersistentSend(blockOnPersistentSend); + cf.setBlockOnDurableSend(blockOnDurableSend); Assert.fail("Should throw exception"); } catch (IllegalStateException e) @@ -624,7 +624,7 @@ } try { - cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); Assert.fail("Should throw exception"); } catch (IllegalStateException e) @@ -753,8 +753,8 @@ cf.getConfirmationWindowSize(); cf.getProducerMaxRate(); cf.isBlockOnAcknowledge(); - cf.isBlockOnPersistentSend(); - cf.isBlockOnNonPersistentSend(); + cf.isBlockOnDurableSend(); + cf.isBlockOnNonDurableSend(); cf.isAutoGroup(); cf.isPreAcknowledge(); cf.getConnectionLoadBalancingPolicyClassName(); @@ -784,8 +784,8 @@ final int confirmationWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -825,8 +825,8 @@ Assert.assertEquals(cf.getConfirmationWindowSize(), confirmationWindowSize); Assert.assertEquals(cf.getProducerMaxRate(), producerMaxRate); Assert.assertEquals(cf.isBlockOnAcknowledge(), blockOnAcknowledge); - Assert.assertEquals(cf.isBlockOnPersistentSend(), blockOnPersistentSend); - Assert.assertEquals(cf.isBlockOnNonPersistentSend(), blockOnNonPersistentSend); + Assert.assertEquals(cf.isBlockOnDurableSend(), blockOnDurableSend); + Assert.assertEquals(cf.isBlockOnNonDurableSend(), blockOnNonDurableSend); Assert.assertEquals(cf.isAutoGroup(), autoGroup); Assert.assertEquals(cf.isPreAcknowledge(), preAcknowledge); Assert.assertEquals(cf.getConnectionLoadBalancingPolicyClassName(), loadBalancingPolicyClassName); Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -551,8 +551,8 @@ { server.start(); ClientSessionFactory cf = createInVMFactory(); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); ClientSession sendSession = cf.createSession(false, true, true); ClientProducer cp = sendSession.createProducer(queueName); ClientSession clientSession = cf.createSession(false, true, false); @@ -622,8 +622,8 @@ { server.start(); ClientSessionFactory cf = createInVMFactory(); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); ClientSession sendSession = cf.createSession(false, true, true); ClientProducer cp = sendSession.createProducer(queueName); ClientSession clientSession = cf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -1104,8 +1104,8 @@ ClientSessionFactory sf = new ClientSessionFactoryImpl(serverTotc); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sfs[node] = sf; } @@ -1152,8 +1152,8 @@ sf.setRetryInterval(100); sf.setRetryIntervalMultiplier(1d); sf.setReconnectAttempts(-1); - sf.setBlockOnNonPersistentSend(blocking); - sf.setBlockOnPersistentSend(blocking); + sf.setBlockOnNonDurableSend(blocking); + sf.setBlockOnDurableSend(blocking); sfs[node] = sf; } Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -134,8 +134,8 @@ sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession createSession = sf.createSession(true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -104,8 +104,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, true); @@ -178,8 +178,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, true); @@ -212,8 +212,8 @@ sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); session = sf.createSession(true, true); @@ -266,8 +266,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(false, false); @@ -339,8 +339,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(false, false); @@ -420,8 +420,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(false, false); @@ -501,8 +501,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(false, false); @@ -590,8 +590,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session1 = sf.createSession(false, false); @@ -673,8 +673,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session1 = sf.createSession(false, false); @@ -768,8 +768,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, false, false); @@ -838,8 +838,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, false, false); @@ -911,8 +911,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, false, false); @@ -985,8 +985,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, false, false); @@ -1074,8 +1074,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session1 = sf.createSession(false, false); @@ -1159,8 +1159,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session1 = sf.createSession(false, false); @@ -1261,8 +1261,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session1 = sf.createSession(false, false); @@ -1392,8 +1392,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); final int numSessions = 10; @@ -1506,8 +1506,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, true); @@ -1586,8 +1586,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, true); @@ -1668,8 +1668,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(true, true, 0); @@ -1761,8 +1761,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(true, true, 0); @@ -1832,8 +1832,8 @@ server0Service.getRemotingService().addInterceptor(new DelayInterceptor()); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); final ClientSession session = sf.createSession(true, true, 0); @@ -1901,8 +1901,8 @@ { final ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); final ClientSession session = sf.createSession(false, false); @@ -2062,8 +2062,8 @@ { ClientSessionFactoryInternal sf = getSessionFactory(); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); final ClientSession session = sf.createSession(false, false); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -80,7 +80,7 @@ public void internalTestPage(final boolean transacted, final boolean failBeforeConsume) throws Exception { ClientSessionFactoryInternal factory = getSessionFactory(); - factory.setBlockOnPersistentSend(true); + factory.setBlockOnDurableSend(true); factory.setBlockOnAcknowledge(true); ClientSession session = factory.createSession(!transacted, !transacted, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -112,8 +112,8 @@ ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnAcknowledge(true); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, true, 0); @@ -315,8 +315,8 @@ ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnAcknowledge(true); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); ClientSession session = sf.createSession(true, true, 0); @@ -366,7 +366,7 @@ sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnDurableSend(true); session = sf.createSession(false, true, true); @@ -462,7 +462,7 @@ sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnDurableSend(true); session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -80,8 +80,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -144,8 +144,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -187,8 +187,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -234,8 +234,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -282,8 +282,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -330,8 +330,8 @@ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -376,8 +376,8 @@ int confirmationWindowSize = RandomUtil.randomPositiveInt(); int producerMaxRate = RandomUtil.randomPositiveInt(); boolean blockOnAcknowledge = RandomUtil.randomBoolean(); - boolean blockOnPersistentSend = RandomUtil.randomBoolean(); - boolean blockOnNonPersistentSend = RandomUtil.randomBoolean(); + boolean blockOnDurableSend = RandomUtil.randomBoolean(); + boolean blockOnNonDurableSend = RandomUtil.randomBoolean(); boolean autoGroup = RandomUtil.randomBoolean(); boolean preAcknowledge = RandomUtil.randomBoolean(); String loadBalancingPolicyClassName = RandomUtil.randomString(); @@ -403,8 +403,8 @@ cf.setConfirmationWindowSize(confirmationWindowSize); cf.setProducerMaxRate(producerMaxRate); cf.setBlockOnAcknowledge(blockOnAcknowledge); - cf.setBlockOnPersistentSend(blockOnPersistentSend); - cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + cf.setBlockOnDurableSend(blockOnDurableSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); cf.setAutoGroup(autoGroup); cf.setPreAcknowledge(preAcknowledge); cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName); @@ -430,8 +430,8 @@ Assert.assertEquals(confirmationWindowSize, cf.getConfirmationWindowSize()); Assert.assertEquals(producerMaxRate, cf.getProducerMaxRate()); Assert.assertEquals(blockOnAcknowledge, cf.isBlockOnAcknowledge()); - Assert.assertEquals(blockOnPersistentSend, cf.isBlockOnPersistentSend()); - Assert.assertEquals(blockOnNonPersistentSend, cf.isBlockOnNonPersistentSend()); + Assert.assertEquals(blockOnDurableSend, cf.isBlockOnDurableSend()); + Assert.assertEquals(blockOnNonDurableSend, cf.isBlockOnNonDurableSend()); Assert.assertEquals(autoGroup, cf.isAutoGroup()); Assert.assertEquals(preAcknowledge, cf.isPreAcknowledge()); Assert.assertEquals(loadBalancingPolicyClassName, cf.getConnectionLoadBalancingPolicyClassName()); @@ -467,8 +467,8 @@ int confirmationWindowSize = RandomUtil.randomPositiveInt(); int producerMaxRate = RandomUtil.randomPositiveInt(); boolean blockOnAcknowledge = RandomUtil.randomBoolean(); - boolean blockOnPersistentSend = RandomUtil.randomBoolean(); - boolean blockOnNonPersistentSend = RandomUtil.randomBoolean(); + boolean blockOnDurableSend = RandomUtil.randomBoolean(); + boolean blockOnNonDurableSend = RandomUtil.randomBoolean(); boolean autoGroup = RandomUtil.randomBoolean(); boolean preAcknowledge = RandomUtil.randomBoolean(); String loadBalancingPolicyClassName = RandomUtil.randomString(); @@ -611,7 +611,7 @@ } try { - cf.setBlockOnPersistentSend(blockOnPersistentSend); + cf.setBlockOnDurableSend(blockOnDurableSend); Assert.fail("Should throw exception"); } catch (IllegalStateException e) @@ -620,7 +620,7 @@ } try { - cf.setBlockOnNonPersistentSend(blockOnNonPersistentSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); Assert.fail("Should throw exception"); } catch (IllegalStateException e) @@ -759,8 +759,8 @@ cf.getConfirmationWindowSize(); cf.getProducerMaxRate(); cf.isBlockOnAcknowledge(); - cf.isBlockOnPersistentSend(); - cf.isBlockOnNonPersistentSend(); + cf.isBlockOnDurableSend(); + cf.isBlockOnNonDurableSend(); cf.isAutoGroup(); cf.isPreAcknowledge(); cf.getConnectionLoadBalancingPolicyClassName(); @@ -792,8 +792,8 @@ final int confirmationWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -835,8 +835,8 @@ Assert.assertEquals(cf.getConfirmationWindowSize(), confirmationWindowSize); Assert.assertEquals(cf.getProducerMaxRate(), producerMaxRate); Assert.assertEquals(cf.isBlockOnAcknowledge(), blockOnAcknowledge); - Assert.assertEquals(cf.isBlockOnPersistentSend(), blockOnPersistentSend); - Assert.assertEquals(cf.isBlockOnNonPersistentSend(), blockOnNonPersistentSend); + Assert.assertEquals(cf.isBlockOnDurableSend(), blockOnDurableSend); + Assert.assertEquals(cf.isBlockOnNonDurableSend(), blockOnNonDurableSend); Assert.assertEquals(cf.isAutoGroup(), autoGroup); Assert.assertEquals(cf.isPreAcknowledge(), preAcknowledge); Assert.assertEquals(cf.getConnectionLoadBalancingPolicyClassName(), loadBalancingPolicyClassName); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -206,8 +206,8 @@ // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); cf.setCacheLargeMessagesClient(true); return cf; @@ -227,8 +227,8 @@ // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); cf.setCacheLargeMessagesClient(true); return cf; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -212,8 +212,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, true, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -258,8 +258,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -82,8 +82,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -241,8 +241,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -87,8 +87,8 @@ new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", backupParams)); - jbcf.setBlockOnPersistentSend(true); - jbcf.setBlockOnNonPersistentSend(true); + jbcf.setBlockOnDurableSend(true); + jbcf.setBlockOnNonDurableSend(true); // Note we set consumer window size to a value so we can verify that consumer credit re-sending // works properly on failover @@ -171,13 +171,13 @@ { HornetQConnectionFactory jbcfLive = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - jbcfLive.setBlockOnNonPersistentSend(true); - jbcfLive.setBlockOnPersistentSend(true); + jbcfLive.setBlockOnNonDurableSend(true); + jbcfLive.setBlockOnDurableSend(true); HornetQConnectionFactory jbcfBackup = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", backupParams)); - jbcfBackup.setBlockOnNonPersistentSend(true); - jbcfBackup.setBlockOnPersistentSend(true); + jbcfBackup.setBlockOnNonDurableSend(true); + jbcfBackup.setBlockOnDurableSend(true); Connection connLive = jbcfLive.createConnection(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -50,7 +50,7 @@ super.setUp(); cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -51,7 +51,7 @@ super.setUp(); cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -70,7 +70,7 @@ jmsServer.start(); jmsServer.createQueue(ExceptionListenerTest.Q_NAME, ExceptionListenerTest.Q_NAME, null, true); cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -158,8 +158,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, true, // this test needs to block on ACK - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -213,8 +213,8 @@ Assert.assertEquals(3456, cf.getDupsOKBatchSize()); Assert.assertEquals(4567, cf.getTransactionBatchSize()); Assert.assertEquals(true, cf.isBlockOnAcknowledge()); - Assert.assertEquals(false, cf.isBlockOnNonPersistentSend()); - Assert.assertEquals(true, cf.isBlockOnPersistentSend()); + Assert.assertEquals(false, cf.isBlockOnNonDurableSend()); + Assert.assertEquals(true, cf.isBlockOnDurableSend()); Assert.assertEquals(false, cf.isAutoGroup()); Assert.assertEquals(true, cf.isPreAcknowledge()); Assert.assertEquals(2345, cf.getConnectionTTL()); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -71,8 +71,8 @@ HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); - jbcf.setBlockOnPersistentSend(true); - jbcf.setBlockOnNonPersistentSend(true); + jbcf.setBlockOnDurableSend(true); + jbcf.setBlockOnNonDurableSend(true); Connection conn = jbcf.createConnection(); @@ -98,8 +98,8 @@ HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); - jbcf.setBlockOnPersistentSend(true); - jbcf.setBlockOnNonPersistentSend(true); + jbcf.setBlockOnDurableSend(true); + jbcf.setBlockOnNonDurableSend(true); Connection conn = jbcf.createConnection(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -867,7 +867,7 @@ { HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnDurableSend(true); return cf.createConnection(); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -463,8 +463,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, @@ -512,8 +512,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -107,8 +107,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -142,8 +142,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, @@ -178,8 +178,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -213,8 +213,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, @@ -398,8 +398,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -434,8 +434,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, @@ -471,8 +471,8 @@ final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, - final boolean blockOnPersistentSend, - final boolean blockOnNonPersistentSend, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, final boolean autoGroup, final boolean preAcknowledge, final String loadBalancingPolicyClassName, @@ -507,8 +507,8 @@ producerWindowSize, producerMaxRate, blockOnAcknowledge, - blockOnPersistentSend, - blockOnNonPersistentSend, + blockOnDurableSend, + blockOnNonDurableSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -53,8 +53,8 @@ { HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory)); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); cf.setBlockOnAcknowledge(true); return cf.createConnection(); @@ -66,8 +66,8 @@ { HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory)); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); cf.setBlockOnAcknowledge(true); cf.setConnectionTTL(connectionTTL); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -153,8 +153,8 @@ if (sendingBlocking) { - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -427,8 +427,8 @@ server.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -315,8 +315,8 @@ server.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -1286,8 +1286,8 @@ server.start(); ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnNonPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -153,8 +153,8 @@ // Making it synchronous, just because we want to stop sending messages as soon as the page-store becomes in // page mode // and we could only guarantee that by setting it to synchronous - sf.setBlockOnNonPersistentSend(true); - sf.setBlockOnPersistentSend(true); + sf.setBlockOnNonDurableSend(true); + sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); ClientSession session = sf.createSession(null, null, false, !transacted, !transacted, false, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -97,8 +97,8 @@ // Making it synchronous, just because we want to stop sending messages as soon as the page-store becomes in // page mode // and we could only guarantee that by setting it to synchronous - sf.setBlockOnNonPersistentSend(blocking); - sf.setBlockOnPersistentSend(blocking); + sf.setBlockOnNonDurableSend(blocking); + sf.setBlockOnDurableSend(blocking); sf.setBlockOnAcknowledge(blocking); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -70,8 +70,8 @@ ClientSessionFactory factory = createInVMFactory(); - factory.setBlockOnPersistentSend(true); - factory.setBlockOnNonPersistentSend(true); + factory.setBlockOnDurableSend(true); + factory.setBlockOnNonDurableSend(true); factory.setMinLargeMessageSize(1024 * 1024); final ClientSession session = factory.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -69,8 +69,8 @@ String queue = RandomUtil.randomString(); ClientSessionFactory csf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true)); - csf.setBlockOnNonPersistentSend(false); - csf.setBlockOnPersistentSend(false); + csf.setBlockOnNonDurableSend(false); + csf.setBlockOnDurableSend(false); ClientSession session = null; if (transactional) { Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -487,7 +487,7 @@ securityRepository.addMatch(SecurityTest.addressA, roles); securityManager.addRole("auser", "arole"); ClientSessionFactory cf = createInVMFactory(); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); ClientProducer cp = session.createProducer(SecurityTest.addressA); @@ -521,7 +521,7 @@ securityRepository.addMatch(SecurityTest.addressA, roles); securityManager.addRole("auser", "arole"); ClientSessionFactory cf = createInVMFactory(); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); session.createQueue(SecurityTest.addressA, SecurityTest.queueA, true); ClientProducer cp = session.createProducer(SecurityTest.addressA); @@ -926,7 +926,7 @@ securityRepository.addMatch(configuration.getManagementAddress().toString(), roles); securityManager.addRole("auser", "arole"); ClientSessionFactory cf = createInVMFactory(); - cf.setBlockOnNonPersistentSend(true); + cf.setBlockOnNonDurableSend(true); ClientSession session = cf.createSession("auser", "pass", false, true, true, false, -1); ClientProducer cp = session.createProducer(configuration.getManagementAddress()); cp.send(session.createClientMessage(false)); @@ -1155,8 +1155,8 @@ ClientSession frankConnection = null; ClientSession samConnection = null; ClientSessionFactory factory = createInVMFactory(); - factory.setBlockOnNonPersistentSend(true); - factory.setBlockOnPersistentSend(true); + factory.setBlockOnNonDurableSend(true); + factory.setBlockOnDurableSend(true); ClientSession adminSession = factory.createSession("all", "all", false, true, true, false, -1); String genericQueueName = "genericQueue"; @@ -1293,8 +1293,8 @@ ClientSession frankConnection = null; ClientSession samConnection = null; ClientSessionFactory factory = createInVMFactory(); - factory.setBlockOnNonPersistentSend(true); - factory.setBlockOnPersistentSend(true); + factory.setBlockOnNonDurableSend(true); + factory.setBlockOnDurableSend(true); ClientSession adminSession = factory.createSession("all", "all", false, true, true, false, -1); String genericQueueName = "genericQueue"; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -434,7 +434,7 @@ server.start(); sf = createInVMFactory(); - sf.setBlockOnPersistentSend(false); + sf.setBlockOnDurableSend(false); sf.setBlockOnAcknowledge(false); ClientSession sess = sf.createSession(); Modified: trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -280,8 +280,8 @@ sf = createInVMFactory(); sf.setBlockOnAcknowledge(false); - sf.setBlockOnNonPersistentSend(false); - sf.setBlockOnPersistentSend(false); + sf.setBlockOnNonDurableSend(false); + sf.setBlockOnDurableSend(false); ClientSession sess = sf.createSession(); Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -188,9 +188,9 @@ sf = createNettyFactory(); - sf.setBlockOnPersistentSend(false); + sf.setBlockOnDurableSend(false); - sf.setBlockOnNonPersistentSend(false); + sf.setBlockOnNonDurableSend(false); sf.setBlockOnAcknowledge(false); Modified: trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -144,7 +144,7 @@ private void addEmptyTransaction(final Xid xid) throws HornetQException, XAException { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(false); + sf.setBlockOnNonDurableSend(false); sf.setBlockOnAcknowledge(false); ClientSession session = sf.createSession(true, false, false); session.start(xid, XAResource.TMNOFLAGS); @@ -157,7 +157,7 @@ private void checkEmptyXID(final Xid xid) throws HornetQException, XAException { ClientSessionFactory sf = createInVMFactory(); - sf.setBlockOnNonPersistentSend(false); + sf.setBlockOnNonDurableSend(false); sf.setBlockOnAcknowledge(false); ClientSession session = sf.createSession(true, false, false); @@ -368,7 +368,7 @@ server.start(); sf = createNettyFactory(); - sf.setBlockOnPersistentSend(false); + sf.setBlockOnDurableSend(false); sf.setBlockOnAcknowledge(false); ClientSession sess = sf.createSession(); Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -68,8 +68,8 @@ ClientSessionFactory factory = createInVMFactory(); factory.setBlockOnAcknowledge(true); - factory.setBlockOnPersistentSend(false); - factory.setBlockOnNonPersistentSend(false); + factory.setBlockOnDurableSend(false); + factory.setBlockOnNonDurableSend(false); ClientSession session = null; try Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -160,8 +160,8 @@ HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); - cf.setBlockOnNonPersistentSend(true); - cf.setBlockOnPersistentSend(true); + cf.setBlockOnNonDurableSend(true); + cf.setBlockOnDurableSend(true); return cf; } @@ -232,8 +232,8 @@ }; // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection failingSourceCF.setReconnectAttempts(0); - failingSourceCF.setBlockOnNonPersistentSend(true); - failingSourceCF.setBlockOnPersistentSend(true); + failingSourceCF.setBlockOnNonDurableSend(true); + failingSourceCF.setBlockOnDurableSend(true); ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); @@ -421,8 +421,8 @@ }; // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection failingSourceCF.setReconnectAttempts(0); - failingSourceCF.setBlockOnNonPersistentSend(true); - failingSourceCF.setBlockOnPersistentSend(true); + failingSourceCF.setBlockOnNonDurableSend(true); + failingSourceCF.setBlockOnDurableSend(true); ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); @@ -481,8 +481,8 @@ }; // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection failingSourceCF.setReconnectAttempts(0); - failingSourceCF.setBlockOnNonPersistentSend(true); - failingSourceCF.setBlockOnPersistentSend(true); + failingSourceCF.setBlockOnNonDurableSend(true); + failingSourceCF.setBlockOnDurableSend(true); ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -91,7 +91,8 @@ Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); Assert.assertEquals(factory.getConfirmationWindowSize(), ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); - Assert.assertEquals(factory.getReconnectAttempts(), ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS); + // by default, reconnect attempts is set to -1 + Assert.assertEquals(-1, factory.getReconnectAttempts()); Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL); Assert.assertEquals(factory.getRetryIntervalMultiplier(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER); @@ -101,9 +102,9 @@ Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonPersistentSend(), - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - Assert.assertEquals(factory.isBlockOnPersistentSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); @@ -144,7 +145,8 @@ Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); Assert.assertEquals(factory.getConfirmationWindowSize(), ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); - Assert.assertEquals(factory.getReconnectAttempts(), ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS); + // by default, reconnect attempts is set to -1 + Assert.assertEquals(-1, factory.getReconnectAttempts()); Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL); Assert.assertEquals(factory.getRetryIntervalMultiplier(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER); @@ -154,9 +156,9 @@ Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonPersistentSend(), - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - Assert.assertEquals(factory.isBlockOnPersistentSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); @@ -169,8 +171,8 @@ ra.setConnectorClassName(InVMConnector.class.getName()); ra.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); ra.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - ra.setBlockOnNonPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - ra.setBlockOnPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + ra.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + ra.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); ra.setCallTimeout(1l); ra.setClientFailureCheckPeriod(2l); ra.setClientID("myid"); @@ -217,9 +219,9 @@ Assert.assertEquals(factory.getTransactionBatchSize(), 18); Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonPersistentSend(), - !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - Assert.assertEquals(factory.isBlockOnPersistentSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), + !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), !ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); @@ -233,8 +235,8 @@ ConnectionFactoryProperties connectionFactoryProperties = new ConnectionFactoryProperties(); connectionFactoryProperties.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); connectionFactoryProperties.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - connectionFactoryProperties.setBlockOnNonPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - connectionFactoryProperties.setBlockOnPersistentSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + connectionFactoryProperties.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + connectionFactoryProperties.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); connectionFactoryProperties.setCallTimeout(1l); connectionFactoryProperties.setClientFailureCheckPeriod(2l); connectionFactoryProperties.setClientID("myid"); @@ -281,9 +283,9 @@ Assert.assertEquals(factory.getTransactionBatchSize(), 18); Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonPersistentSend(), - !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND); - Assert.assertEquals(factory.isBlockOnPersistentSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), + !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), !ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-12-08 15:37:42 UTC (rev 8620) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-12-08 16:54:49 UTC (rev 8621) @@ -191,8 +191,8 @@ ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, + ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,