Author: timfox Date: 2009-11-11 12:05:22 -0500 (Wed, 11 Nov 2009) New Revision: 8263 Modified: trunk/src/config/common/schema/hornetq-jms.xsd 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/JMSServerControl.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.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/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: fixed ranges for producer-windows-size consumer-window-size etc Modified: trunk/src/config/common/schema/hornetq-jms.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-jms.xsd 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/config/common/schema/hornetq-jms.xsd 2009-11-11 17:05:22 UTC (rev 8263) @@ -57,6 +57,9 @@ <xsd:element name="confirmation-window-size" type="xsd:int" maxOccurs="1" minOccurs="0"> </xsd:element> + <xsd:element name="producer-window-size" type="xsd:int" + maxOccurs="1" minOccurs="0"> + </xsd:element> <xsd:element name="producer-max-rate" type="xsd:int" maxOccurs="1" minOccurs="0"> </xsd:element> Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -362,6 +362,17 @@ sessionFactory.setProducerMaxRate(producerMaxRate); } + public synchronized int getProducerWindowSize() + { + return sessionFactory.getProducerWindowSize(); + } + + public synchronized void setProducerWindowSize(int producerWindowSize) + { + checkWrite(); + sessionFactory.setProducerWindowSize(producerWindowSize); + } + /** * @param cacheLargeMessagesClient */ @@ -550,9 +561,9 @@ final int type) throws JMSException { readOnly = true; - - //Note that each JMS connection gets it's own copy of the connection factory - //This means there is one underlying remoting connection per jms connection (if not load balanced) + + // Note that each JMS connection gets it's own copy of the connection factory + // This means there is one underlying remoting connection per jms connection (if not load balanced) ClientSessionFactory factory = sessionFactory.copy(); HornetQConnection connection = new HornetQConnection(username, Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -147,6 +147,7 @@ int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -179,6 +180,7 @@ int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -82,7 +82,11 @@ int getConfirmationWindowSize(); void setConfirmationWindowSize(int confirmationWindowSize); + + int getProducerWindowSize(); + void setProducerWindowSize(int producerWindowSize); + int getProducerMaxRate(); void setProducerMaxRate(int producerMaxRate); Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -64,6 +64,8 @@ private int confirmationWindowSize = ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; + private int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + private int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; private boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; @@ -288,7 +290,17 @@ { this.producerMaxRate = producerMaxRate; } + + public int getProducerWindowSize() + { + return producerWindowSize; + } + public void setProducerWindowSize(int producerWindowSize) + { + this.producerWindowSize = producerWindowSize; + } + public boolean isBlockOnAcknowledge() { return blockOnAcknowledge; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -130,7 +130,8 @@ String clientID = getString(e, "client-id", null, Validators.NO_CHECK); int dupsOKBatchSize = getInteger(e, "dups-ok-batch-size", ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, GT_ZERO); int transactionBatchSize = getInteger(e, "transaction-batch-size", ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, GT_ZERO); - int consumerWindowSize = getInteger(e, "consumer-window-size", ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, GE_ZERO); + int consumerWindowSize = getInteger(e, "consumer-window-size", ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, MINUS_ONE_OR_GE_ZERO); + int producerWindowSize = getInteger(e, "producer-window-size", ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, MINUS_ONE_OR_GT_ZERO); int consumerMaxRate = getInteger(e, "consumer-max-rate", ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, MINUS_ONE_OR_GT_ZERO); int confirmationWindowSize = getInteger(e, "confirmation-window-size", ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, MINUS_ONE_OR_GT_ZERO); int producerMaxRate = getInteger(e, "producer-max-rate", ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, MINUS_ONE_OR_GT_ZERO); @@ -241,6 +242,7 @@ consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -274,6 +276,7 @@ consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -100,8 +100,8 @@ public JMSServerManagerImpl(final HornetQServer server) throws Exception { this.server = server; - - this.configFileName = null; + + configFileName = null; } public JMSServerManagerImpl(final HornetQServer server, final String configFileName) throws Exception @@ -115,9 +115,9 @@ { this.server = server; - this.configFileName = null; + configFileName = null; - this.config = configuration; + config = configuration; } // ActivateCallback implementation ------------------------------------- @@ -132,7 +132,7 @@ { jmsManagementService.registerJMSServer(this); - // start the JMS deployer only if the configuration is not done using the JMSConfiguration object + // start the JMS deployer only if the configuration is not done using the JMSConfiguration object if (config == null) { jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration()); @@ -145,11 +145,11 @@ jmsDeployer.start(); deploymentManager.start(); - } + } else { deploy(); - } + } } catch (Exception e) { @@ -165,16 +165,16 @@ { return; } - + if (!contextSet) { context = new InitialContext(); } deploymentManager = new FileDeploymentManager(server.getConfiguration().getFileDeployerScanPeriod()); - + server.registerActivateCallback(this); - + server.start(); started = true; @@ -219,7 +219,7 @@ jmsManagementService.unregisterJMSServer(); jmsManagementService.stop(); - + server.stop(); started = false; @@ -240,8 +240,8 @@ public synchronized void setContext(final Context context) { this.context = context; - - this.contextSet = true; + + contextSet = true; } public synchronized String getVersion() @@ -254,7 +254,7 @@ public synchronized boolean createQueue(final String queueName, final String jndiBinding, final String selectorString, - boolean durable) throws Exception + final boolean durable) throws Exception { checkInitialised(); HornetQQueue jBossQueue = new HornetQQueue(queueName); @@ -268,9 +268,9 @@ } server.getHornetQServerControl().deployQueue(jBossQueue.getAddress(), - jBossQueue.getAddress(), - coreFilterString, - durable); + jBossQueue.getAddress(), + coreFilterString, + durable); boolean added = bindToJndi(jndiBinding, jBossQueue); @@ -292,9 +292,9 @@ // does not exist - otherwise we would not be able to distinguish from a non existent topic and one with no // subscriptions - core has no notion of a topic server.getHornetQServerControl().deployQueue(jBossTopic.getAddress(), - jBossTopic.getAddress(), - REJECT_FILTER, - true); + jBossTopic.getAddress(), + REJECT_FILTER, + true); boolean added = bindToJndi(jndiBinding, jBossTopic); if (added) { @@ -314,10 +314,10 @@ } if (context != null) { - Iterator<String> iter = jndiBindings.iterator(); + Iterator<String> iter = jndiBindings.iterator(); while (iter.hasNext()) { - String jndiBinding = (String)iter.next(); + String jndiBinding = iter.next(); context.unbind(jndiBinding); iter.remove(); } @@ -349,9 +349,9 @@ return true; } - public synchronized void createConnectionFactory(String name, - List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -363,10 +363,10 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - String clientID, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + final String clientID, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -379,35 +379,36 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - String clientID, - long clientFailureCheckPeriod, - long connectionTTL, - long callTimeout, - boolean cacheLargeMessagesClient, - int minLargeMessageSize, - int consumerWindowSize, - int consumerMaxRate, - int confirmationWindowSize, - int producerMaxRate, - boolean blockOnAcknowledge, - boolean blockOnPersistentSend, - boolean blockOnNonPersistentSend, - boolean autoGroup, - boolean preAcknowledge, - String loadBalancingPolicyClassName, - int transactionBatchSize, - int dupsOKBatchSize, - boolean useGlobalPools, - int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, - long retryInterval, - double retryIntervalMultiplier, - long maxRetryInterval, - int reconnectAttempts, - boolean failoverOnServerShutdown, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + final String clientID, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long callTimeout, + final boolean cacheLargeMessagesClient, + final int minLargeMessageSize, + final int consumerWindowSize, + final int consumerMaxRate, + final int confirmationWindowSize, + final int producerWindowSize, + final int producerMaxRate, + final boolean blockOnAcknowledge, + final boolean blockOnPersistentSend, + final boolean blockOnNonPersistentSend, + final boolean autoGroup, + final boolean preAcknowledge, + final String loadBalancingPolicyClassName, + final int transactionBatchSize, + final int dupsOKBatchSize, + final boolean useGlobalPools, + final int scheduledThreadPoolMaxSize, + final int threadPoolMaxSize, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -417,12 +418,13 @@ cf.setClientID(clientID); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); - cf.setCallTimeout(callTimeout); + cf.setCallTimeout(callTimeout); cf.setCacheLargeMessagesClient(cacheLargeMessagesClient); cf.setMinLargeMessageSize(minLargeMessageSize); cf.setConsumerWindowSize(consumerWindowSize); cf.setConsumerMaxRate(consumerMaxRate); cf.setConfirmationWindowSize(confirmationWindowSize); + cf.setProducerWindowSize(producerWindowSize); cf.setProducerMaxRate(producerMaxRate); cf.setBlockOnAcknowledge(blockOnAcknowledge); cf.setBlockOnPersistentSend(blockOnPersistentSend); @@ -445,38 +447,39 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - String discoveryAddress, - int discoveryPort, - String clientID, - long discoveryRefreshTimeout, - long clientFailureCheckPeriod, - long connectionTTL, - long callTimeout, - boolean cacheLargeMessagesClient, - int minLargeMessageSize, - int consumerWindowSize, - int consumerMaxRate, - int confirmationWindowSize, - int producerMaxRate, - boolean blockOnAcknowledge, - boolean blockOnPersistentSend, - boolean blockOnNonPersistentSend, - boolean autoGroup, - boolean preAcknowledge, - String loadBalancingPolicyClassName, - int transactionBatchSize, - int dupsOKBatchSize, - long initialWaitTimeout, - boolean useGlobalPools, - int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, - long retryInterval, - double retryIntervalMultiplier, - long maxRetryInterval, - int reconnectAttempts, - boolean failoverOnServerShutdown, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final String discoveryAddress, + final int discoveryPort, + final String clientID, + final long discoveryRefreshTimeout, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long callTimeout, + final boolean cacheLargeMessagesClient, + final int minLargeMessageSize, + final int consumerWindowSize, + final int consumerMaxRate, + final int confirmationWindowSize, + final int producerWindowSize, + final int producerMaxRate, + final boolean blockOnAcknowledge, + final boolean blockOnPersistentSend, + final boolean blockOnNonPersistentSend, + final boolean autoGroup, + final boolean preAcknowledge, + final String loadBalancingPolicyClassName, + final int transactionBatchSize, + final int dupsOKBatchSize, + final long initialWaitTimeout, + final boolean useGlobalPools, + final int scheduledThreadPoolMaxSize, + final int threadPoolMaxSize, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -487,12 +490,13 @@ cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); - cf.setCallTimeout(callTimeout); + cf.setCallTimeout(callTimeout); cf.setCacheLargeMessagesClient(cacheLargeMessagesClient); cf.setMinLargeMessageSize(minLargeMessageSize); cf.setConsumerWindowSize(consumerWindowSize); cf.setConsumerMaxRate(consumerMaxRate); cf.setConfirmationWindowSize(confirmationWindowSize); + cf.setProducerWindowSize(producerWindowSize); cf.setProducerMaxRate(producerMaxRate); cf.setBlockOnAcknowledge(blockOnAcknowledge); cf.setBlockOnPersistentSend(blockOnPersistentSend); @@ -505,7 +509,7 @@ cf.setDiscoveryInitialWaitTimeout(initialWaitTimeout); cf.setUseGlobalPools(useGlobalPools); cf.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); - cf.setThreadPoolMaxSize(threadPoolMaxSize); + cf.setThreadPoolMaxSize(threadPoolMaxSize); cf.setRetryInterval(retryInterval); cf.setRetryIntervalMultiplier(retryIntervalMultiplier); cf.setMaxRetryInterval(maxRetryInterval); @@ -516,10 +520,10 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - String discoveryAddress, - int discoveryPort, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final String discoveryAddress, + final int discoveryPort, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -531,11 +535,11 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - String discoveryAddress, - int discoveryPort, - String clientID, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final String discoveryAddress, + final int discoveryPort, + final String clientID, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -548,9 +552,9 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - TransportConfiguration liveTC, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -562,10 +566,10 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - TransportConfiguration liveTC, - String clientID, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final String clientID, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -578,10 +582,10 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - TransportConfiguration liveTC, - TransportConfiguration backupTC, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final TransportConfiguration backupTC, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -593,11 +597,11 @@ bindConnectionFactory(cf, name, jndiBindings); } - public synchronized void createConnectionFactory(String name, - TransportConfiguration liveTC, - TransportConfiguration backupTC, - String clientID, - List<String> jndiBindings) throws Exception + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final TransportConfiguration backupTC, + final String clientID, + final List<String> jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -718,7 +722,7 @@ try { context.lookup(jndiName); - + log.warn("Binding for " + jndiName + " already exists"); return false; } @@ -726,11 +730,11 @@ { // OK } - + Context c = org.hornetq.utils.JNDIUtil.createContext(context, parentContext); - + c.rebind(jndiNameInContext, objectToBind); - } + } return true; } @@ -749,7 +753,7 @@ { return; } - + if (config.getContext() != null) { setContext(config.getContext()); @@ -767,12 +771,13 @@ config.getDiscoveryRefreshTimeout(), config.getClientFailureCheckPeriod(), config.getConnectionTTL(), - config.getCallTimeout(), + config.getCallTimeout(), config.isCacheLargeMessagesClient(), config.getMinLargeMessageSize(), config.getConsumerWindowSize(), config.getConsumerMaxRate(), config.getConfirmationWindowSize(), + config.getProducerWindowSize(), config.getProducerMaxRate(), config.isBlockOnAcknowledge(), config.isBlockOnPersistentSend(), @@ -785,7 +790,7 @@ config.getInitialWaitTimeout(), config.isUseGlobalPools(), config.getScheduledThreadPoolMaxSize(), - config.getThreadPoolMaxSize(), + config.getThreadPoolMaxSize(), config.getRetryInterval(), config.getRetryIntervalMultiplier(), config.getMaxRetryInterval(), @@ -800,12 +805,13 @@ config.getClientID(), config.getClientFailureCheckPeriod(), config.getConnectionTTL(), - config.getCallTimeout(), + config.getCallTimeout(), config.isCacheLargeMessagesClient(), config.getMinLargeMessageSize(), config.getConsumerWindowSize(), config.getConsumerMaxRate(), config.getConfirmationWindowSize(), + config.getProducerWindowSize(), config.getProducerMaxRate(), config.isBlockOnAcknowledge(), config.isBlockOnPersistentSend(), @@ -817,7 +823,7 @@ config.getDupsOKBatchSize(), config.isUseGlobalPools(), config.getScheduledThreadPoolMaxSize(), - config.getThreadPoolMaxSize(), + config.getThreadPoolMaxSize(), config.getRetryInterval(), config.getRetryIntervalMultiplier(), config.getMaxRetryInterval(), Modified: trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/management/JMSServerControl.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -37,11 +37,11 @@ String getVersion(); String[] getTopicNames(); - + String[] getQueueNames(); - + String[] getConnectionFactoryNames(); - + // Operations ---------------------------------------------------- @Operation(desc = "Create a JMS Queue", impact = ACTION) @@ -98,12 +98,13 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -115,7 +116,7 @@ int dupsOKBatchSize, boolean useGlobalPools, int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, + int threadPoolMaxSize, long retryInterval, double retryIntervalMultiplier, long maxRetryInterval, @@ -131,12 +132,13 @@ @Parameter(name = "clientID") String clientID, @Parameter(name = "clientFailureCheckPeriod") long clientFailureCheckPeriod, @Parameter(name = "connectionTTL") long connectionTTL, - @Parameter(name = "callTimeout") long callTimeout, + @Parameter(name = "callTimeout") long callTimeout, @Parameter(name = "cacheLargemessageClient") boolean cacheLargeMessageClient, @Parameter(name = "minLargeMessageSize") int minLargeMessageSize, @Parameter(name = "consumerWindowSize") int consumerWindowSize, @Parameter(name = "consumerMaxRate") int consumerMaxRate, @Parameter(name = "confirmationWindowSize") int confirmationWindowSize, + @Parameter(name = "producerWindowSize") int producerWindowSize, @Parameter(name = "producerMaxRate") int producerMaxRate, @Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge, @Parameter(name = "blockOnPersistentSend") boolean blockOnPersistentSend, @@ -148,7 +150,7 @@ @Parameter(name = "dupsOKBatchSize") int dupsOKBatchSize, @Parameter(name = "useGlobalPools") boolean useGlobalPools, @Parameter(name = "scheduledThreadPoolMaxSize") int scheduledThreadPoolMaxSize, - @Parameter(name = "threadPoolMaxSize") int threadPoolMaxSize, + @Parameter(name = "threadPoolMaxSize") int threadPoolMaxSize, @Parameter(name = "retryInterval") long retryInterval, @Parameter(name = "retryIntervalMultiplier") double retryIntervalMultiplier, @Parameter(name = "maxRetryInterval") long maxRetryInterval, @@ -176,12 +178,13 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -194,7 +197,7 @@ long initialWaitTimeout, boolean useGlobalPools, int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, + int threadPoolMaxSize, long retryInterval, double retryIntervalMultiplier, long maxRetryInterval, @@ -210,12 +213,13 @@ @Parameter(name = "discoveryRefreshTimeout") long discoveryRefreshTimeout, @Parameter(name = "clientFailureCheckPeriod") long clientFailureCheckPeriod, @Parameter(name = "connectionTTL") long connectionTTL, - @Parameter(name = "callTimeout") long callTimeout, + @Parameter(name = "callTimeout") long callTimeout, @Parameter(name = "cacheLargemessageClient") boolean cacheLargeMessageClient, @Parameter(name = "minLargeMessageSize") int minLargeMessageSize, @Parameter(name = "consumerWindowSize") int consumerWindowSize, @Parameter(name = "consumerMaxRate") int consumerMaxRate, @Parameter(name = "confirmationWindowSize") int confirmationWindowSize, + @Parameter(name = "producerWindowSize") int producerWindowSize, @Parameter(name = "producerMaxRate") int producerMaxRate, @Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge, @Parameter(name = "blockOnPersistentSend") boolean blockOnPersistentSend, @@ -228,7 +232,7 @@ @Parameter(name = "initialWaitTimeout") long initialWaitTimeout, @Parameter(name = "useGlobalPools") boolean useGlobalPools, @Parameter(name = "scheduledThreadPoolMaxSize") int scheduledThreadPoolMaxSize, - @Parameter(name = "threadPoolMaxSize") int threadPoolMaxSize, + @Parameter(name = "threadPoolMaxSize") int threadPoolMaxSize, @Parameter(name = "retryInterval") long retryInterval, @Parameter(name = "retryIntervalMultiplier") double retryIntervalMultiplier, @Parameter(name = "maxRetryInterval") long maxRetryInterval, Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -225,12 +225,13 @@ final String clientID, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, final int consumerMaxRate, final int confirmationWindowSize, + final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, final boolean blockOnPersistentSend, @@ -242,7 +243,7 @@ final int dupsOKBatchSize, final boolean useGlobalPools, final int scheduledThreadPoolMaxSize, - final int threadPoolMaxSize, + final int threadPoolMaxSize, final long retryInterval, final double retryIntervalMultiplier, final long maxRetryInterval, @@ -262,12 +263,13 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -279,7 +281,7 @@ dupsOKBatchSize, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -298,12 +300,13 @@ final String clientID, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, final int consumerMaxRate, final int confirmationWindowSize, + final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, final boolean blockOnPersistentSend, @@ -315,7 +318,7 @@ final int dupsOKBatchSize, final boolean useGlobalPools, final int scheduledThreadPoolMaxSize, - final int threadPoolMaxSize, + final int threadPoolMaxSize, final long retryInterval, final double retryIntervalMultiplier, final long maxRetryInterval, @@ -337,12 +340,13 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -354,7 +358,7 @@ dupsOKBatchSize, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -394,12 +398,13 @@ final long discoveryRefreshTimeout, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, final int consumerMaxRate, final int confirmationWindowSize, + final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, final boolean blockOnPersistentSend, @@ -412,7 +417,7 @@ final long initialWaitTimeout, final boolean useGlobalPools, final int scheduledThreadPoolMaxSize, - final int threadPoolMaxSize, + final int threadPoolMaxSize, final long retryInterval, final double retryIntervalMultiplier, final long maxRetryInterval, @@ -429,12 +434,13 @@ discoveryRefreshTimeout, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -447,7 +453,7 @@ initialWaitTimeout, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -465,12 +471,13 @@ final long discoveryRefreshTimeout, final long clientFailureCheckPeriod, final long connectionTTL, - final long callTimeout, + final long callTimeout, final boolean cacheLargeMessageClient, final int minLargeMessageSize, final int consumerWindowSize, final int consumerMaxRate, final int confirmationWindowSize, + final int producerWindowSize, final int producerMaxRate, final boolean blockOnAcknowledge, final boolean blockOnPersistentSend, @@ -483,7 +490,7 @@ final long initialWaitTimeout, final boolean useGlobalPools, final int scheduledThreadPoolMaxSize, - final int threadPoolMaxSize, + final int threadPoolMaxSize, final long retryInterval, final double retryIntervalMultiplier, final long maxRetryInterval, @@ -500,12 +507,13 @@ discoveryRefreshTimeout, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -518,7 +526,7 @@ initialWaitTimeout, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -685,7 +693,7 @@ } return names; } - + public String[] getTopicNames() { Object[] topicControls = server.getHornetQServer().getManagementService().getResources(TopicControl.class); @@ -697,10 +705,12 @@ } return names; } - + public String[] getConnectionFactoryNames() { - Object[] cfControls = server.getHornetQServer().getManagementService().getResources(ConnectionFactoryControl.class); + Object[] cfControls = server.getHornetQServer() + .getManagementService() + .getResources(ConnectionFactoryControl.class); String[] names = new String[cfControls.length]; for (int i = 0; i < cfControls.length; i++) { @@ -709,7 +719,7 @@ } return names; } - + // NotificationEmitter implementation ---------------------------- public void removeNotificationListener(final NotificationListener listener, Modified: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml =================================================================== --- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest.xml 2009-11-11 17:05:22 UTC (rev 8263) @@ -15,6 +15,7 @@ <consumer-window-size>12345</consumer-window-size> <consumer-max-rate>6789</consumer-max-rate> <confirmation-window-size>123456</confirmation-window-size> + <producer-window-size>7712652</producer-window-size> <producer-max-rate>789</producer-max-rate> <min-large-message-size>12</min-large-message-size> <client-id>TestClientID</client-id> Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -28,6 +28,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; @@ -43,6 +44,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.utils.Pair; @@ -97,6 +99,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, true, true, Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -28,6 +28,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; @@ -40,6 +41,7 @@ import javax.naming.InitialContext; +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.utils.Pair; @@ -93,6 +95,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, true, true, Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -27,6 +27,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; @@ -47,6 +48,7 @@ import javax.management.ObjectName; import javax.naming.InitialContext; +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.ObjectNameBuilder; @@ -322,7 +324,8 @@ prefetchSize, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, - DEFAULT_PRODUCER_MAX_RATE, + DEFAULT_PRODUCER_WINDOW_SIZE, + DEFAULT_PRODUCER_MAX_RATE, blockOnAcknowledge, true, true, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -22,6 +22,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; @@ -38,6 +39,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -155,6 +157,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, false, false, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -28,6 +28,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; @@ -229,6 +230,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, DEFAULT_BLOCK_ON_ACKNOWLEDGE, DEFAULT_BLOCK_ON_PERSISTENT_SEND, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ResendTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -28,6 +28,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; @@ -269,6 +270,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, DEFAULT_BLOCK_ON_ACKNOWLEDGE, DEFAULT_BLOCK_ON_PERSISTENT_SEND, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -29,6 +29,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; @@ -99,6 +100,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, DEFAULT_BLOCK_ON_ACKNOWLEDGE, DEFAULT_BLOCK_ON_PERSISTENT_SEND, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -28,6 +28,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; @@ -168,6 +169,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, true, // this test needs to block on ACK DEFAULT_BLOCK_ON_PERSISTENT_SEND, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -195,6 +195,7 @@ assertEquals(12345, cf.getConsumerWindowSize()); assertEquals(6789, cf.getConsumerMaxRate()); assertEquals(123456, cf.getConfirmationWindowSize()); + assertEquals(7712652, cf.getProducerWindowSize()); assertEquals(789, cf.getProducerMaxRate()); assertEquals(12, cf.getMinLargeMessageSize()); assertEquals("TestClientID", cf.getClientID()); 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-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -13,6 +13,7 @@ package org.hornetq.tests.integration.jms.server.management; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.tests.util.RandomUtil.randomString; import java.util.Map; @@ -434,6 +435,7 @@ ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, + ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, @@ -479,6 +481,7 @@ ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, + ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND, 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-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -51,11 +51,11 @@ String[] names = new String[res.length]; for (int i = 0; i < res.length; i++) { - names[i] = res[i].toString(); + names[i] = res[i].toString(); } return names; } - + // Constructors -------------------------------------------------- // JMSServerControlTest overrides -------------------------------- @@ -75,9 +75,9 @@ protected void tearDown() throws Exception { connection.close(); - + connection = null; - + session = null; super.tearDown(); @@ -87,7 +87,7 @@ protected JMSServerControl createManagementControl() throws Exception { HornetQQueue managementQueue = new HornetQQueue(DEFAULT_MANAGEMENT_ADDRESS.toString(), - DEFAULT_MANAGEMENT_ADDRESS.toString()); + DEFAULT_MANAGEMENT_ADDRESS.toString()); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_SERVER); return new JMSServerControl() @@ -99,12 +99,13 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -117,7 +118,7 @@ long initialWaitTimeout, boolean useGlobalPools, int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, + int threadPoolMaxSize, long retryInterval, double retryIntervalMultiplier, long maxRetryInterval, @@ -132,12 +133,13 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -150,7 +152,7 @@ initialWaitTimeout, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -166,12 +168,13 @@ long discoveryRefreshTimeout, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -184,7 +187,7 @@ long initialWaitTimeout, boolean useGlobalPools, int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, + int threadPoolMaxSize, long retryInterval, double retryIntervalMultiplier, long maxRetryInterval, @@ -199,12 +202,13 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -217,7 +221,7 @@ initialWaitTimeout, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -382,12 +386,13 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -399,7 +404,7 @@ int dupsOKBatchSize, boolean useGlobalPools, int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, + int threadPoolMaxSize, long retryInterval, double retryIntervalMultiplier, long maxRetryInterval, @@ -416,12 +421,13 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -432,7 +438,7 @@ transactionBatchSize, dupsOKBatchSize, useGlobalPools, - scheduledThreadPoolMaxSize, + scheduledThreadPoolMaxSize, threadPoolMaxSize, retryInterval, retryIntervalMultiplier, @@ -451,12 +457,13 @@ String clientID, long clientFailureCheckPeriod, long connectionTTL, - long callTimeout, + long callTimeout, boolean cacheLargeMessageClient, int minLargeMessageSize, int consumerWindowSize, int consumerMaxRate, int confirmationWindowSize, + int producerWindowSize, int producerMaxRate, boolean blockOnAcknowledge, boolean blockOnPersistentSend, @@ -468,7 +475,7 @@ int dupsOKBatchSize, boolean useGlobalPools, int scheduledThreadPoolMaxSize, - int threadPoolMaxSize, + int threadPoolMaxSize, long retryInterval, double retryIntervalMultiplier, long maxRetryInterval, @@ -485,12 +492,13 @@ clientID, clientFailureCheckPeriod, connectionTTL, - callTimeout, + callTimeout, cacheLargeMessageClient, minLargeMessageSize, consumerWindowSize, consumerMaxRate, confirmationWindowSize, + producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, @@ -502,7 +510,7 @@ dupsOKBatchSize, useGlobalPools, scheduledThreadPoolMaxSize, - threadPoolMaxSize, + threadPoolMaxSize, retryInterval, retryIntervalMultiplier, maxRetryInterval, @@ -585,7 +593,7 @@ { return (Boolean)proxy.retrieveAttributeValue("started"); } - + public String[] getQueueNames() { return toStringArray((Object[])proxy.retrieveAttributeValue("queueNames")); @@ -620,7 +628,7 @@ { return (String[])proxy.invokeOperation("listSessions", connectionID); } - + }; } // Public -------------------------------------------------------- Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-11-11 14:55:56 UTC (rev 8262) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-11-11 17:05:22 UTC (rev 8263) @@ -20,6 +20,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_PERSISTENT_SEND; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; @@ -28,7 +29,7 @@ import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; -import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; +import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; import static org.hornetq.core.client.impl.ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; @@ -207,6 +208,7 @@ DEFAULT_CONSUMER_WINDOW_SIZE, DEFAULT_CONSUMER_MAX_RATE, DEFAULT_CONFIRMATION_WINDOW_SIZE, + DEFAULT_PRODUCER_WINDOW_SIZE, DEFAULT_PRODUCER_MAX_RATE, DEFAULT_BLOCK_ON_ACKNOWLEDGE, DEFAULT_BLOCK_ON_PERSISTENT_SEND,