[jboss-cvs] JBoss Messaging SVN: r4016 - in trunk: src/etc/server/default/deploy and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 7 11:01:53 EDT 2008
Author: jmesnil
Date: 2008-04-07 11:01:53 -0400 (Mon, 07 Apr 2008)
New Revision: 4016
Modified:
trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java
trunk/src/etc/server/default/deploy/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
trunk/tests/etc/ConfigurationTest-config.xml
trunk/tests/src/org/jboss/messaging/core/config/impl/test/unit/ConfigurationTest.java
trunk/tests/src/org/jboss/messaging/core/integration/test/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/ConfigurationHelper.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSL.java
trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSLTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/RemotingConfigurationValidatorTest.java
trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java
Log:
* JBMESSAGING-1272 - Configurable TCP window size & no delay
- both attributes are configurable in jbm-configuration.xml
* clean up of Configuration interface (exposed only getters methods, setters methods used in the tests are call on ConfigurationImpl)
Modified: trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java
===================================================================
--- trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/docs/examples/embedded/src/org/jboss/example/embedded/EmbeddedExample.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -29,7 +29,6 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.impl.MessageImpl;
@@ -44,7 +43,7 @@
{
public static void main(String args[]) throws Exception
{
- Configuration conf = new ConfigurationImpl();
+ ConfigurationImpl conf = new ConfigurationImpl();
conf.setTransport(TCP);
conf.setHost("localhost");
conf.setPort(5400);
Modified: trunk/src/etc/server/default/deploy/jbm-configuration.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jbm-configuration.xml 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/etc/server/default/deploy/jbm-configuration.xml 2008-04-07 15:01:53 UTC (rev 4016)
@@ -40,6 +40,15 @@
<!-- it is not allowed to disable invm communication when the remoting-transport is set to INVM -->
<remoting-disable-invm>false</remoting-disable-invm>
+ <!-- Enable/Disable Nagle's Algorithm (resp. true/false) -->
+ <!-- This setting is taken into account only when remoting-transport is set to TCP -->
+ <remoting-tcp-nodelay>false</remoting-tcp-nodelay>
+
+ <!-- Set the TCP Receive Buffer size (SO_RCVBUF). -->
+ <!-- Set it to -1 if you want to use the value hinted by the Operating System -->
+ <!-- This setting is taken into account only when remoting-transport is set to TCP -->
+ <remoting-tcp-receive-buffer-size>-1</remoting-tcp-receive-buffer-size>
+
<!-- if ssl is enabled, all remoting-ssl-* properties must be set -->
<remoting-enable-ssl>false</remoting-enable-ssl>
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -36,122 +36,73 @@
public interface Configuration
{
- public int getMessagingServerID();
+ int getMessagingServerID();
- public String getSecurityDomain();
+ String getSecurityDomain();
- public List<String> getDefaultInterceptors();
+ List<String> getDefaultInterceptors();
- public long getMessageCounterSamplePeriod();
+ long getMessageCounterSamplePeriod();
-// public void setMessageCounterSamplePeriod(long messageCounterSamplePeriod);
+ Integer getDefaultMessageCounterHistoryDayLimit();
- public Integer getDefaultMessageCounterHistoryDayLimit();
+ Boolean isStrictTck();
-// public void setDefaultMessageCounterHistoryDayLimit(Integer defaultMessageCounterHistoryDayLimit);
+ Boolean isClustered();
- public Boolean isStrictTck();
+ Integer getScheduledThreadPoolMaxSize();
- // public void setStrictTck(Boolean strictTck);
+ long getSecurityInvalidationInterval();
- public Boolean isClustered();
+ TransportType getTransport();
- public Integer getScheduledThreadPoolMaxSize();
+ String getHost();
-// public void setScheduledThreadPoolMaxSize(int size);
+ int getPort();
-// public void setClustered(Boolean clustered);
+ String getLocation();
- public long getSecurityInvalidationInterval();
+ boolean isTcpNoDelay();
+
+ int getTcpReceiveBufferSize();
- public TransportType getTransport();
+ int getKeepAliveInterval();
- public void setTransport(TransportType transport);
+ int getKeepAliveTimeout();
- public String getHost();
+ int getTimeout();
- public void setHost(String host);
+ String getKeyStorePath();
- public int getPort();
+ String getKeyStorePassword();
- public void setPort(int port);
+ String getTrustStorePath();
- public String getLocation();
+ String getTrustStorePassword();
- public int getKeepAliveInterval();
+ boolean isInvmDisabled();
- public void setKeepAliveInterval(int keepAliveInterval);
+ boolean isSSLEnabled();
- public int getKeepAliveTimeout();
+ String getURI();
- public void setKeepAliveTimeout(int keepAliveTimeout);
+ String getBindingsDirectory();
- public int getTimeout();
+ String getJournalDirectory();
- public String getKeyStorePath();
+ JournalType getJournalType();
- public void setKeyStorePath(String keyStorePath);
+ boolean isJournalSync();
- public String getKeyStorePassword();
+ int getJournalFileSize();
- public void setKeyStorePassword(String keyStorePassword);
+ int getJournalMinFiles();
- public String getTrustStorePath();
+ long getJournalTaskPeriod();
- public void setTrustStorePath(String trustStorePath);
+ boolean isCreateBindingsDir();
- public String getTrustStorePassword();
+ boolean isCreateJournalDir();
- public void setTrustStorePassword(String trustStorePassword);
-
- public boolean isInvmDisabled();
-
- public void setInvmDisabled(boolean invmDisabled);
-
- public boolean isSSLEnabled();
-
- public void setSSLEnabled(boolean sslEnabled);
-
- public String getURI();
-
- public String getBindingsDirectory();
-
-// public void setBindingsDirectory(String bindingsDirectory);
-
- public String getJournalDirectory();
-
-// public void setJournalDirectory(String journalDirectory);
-
- public JournalType getJournalType();
-
-// public void setJournalType(JournalType journalType);
-
- public boolean isJournalSync();
-
- // public void setJournalSync(boolean journalSync);
-
- public int getJournalFileSize();
-
- // public void setJournalFileSize(int journalFileSize);
-
- public int getJournalMinFiles();
-
-// public void setJournalMinFiles(int journalMinFiles);
-
- public long getJournalTaskPeriod();
-
-// public void setJournalTaskPeriod(long journalTaskPeriod);
-
- public boolean isCreateBindingsDir();
-
- // public void setCreateBindingsDir(boolean createBindingsDir);
-
- public boolean isCreateJournalDir();
-
-// public void setCreateJournalDir(boolean createJournalDir);
-
- public boolean isRequireDestinations();
-
-// public void setRequireDestinations(boolean requireDestinations);
-
+ boolean isRequireDestinations();
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -102,12 +102,15 @@
protected int keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
protected boolean invmDisabled = DEFAULT_INVM_DISABLED;
protected boolean invmDisabledModified = false;
+ protected boolean tcpNoDelay;
+ protected int tcpReceiveBufferSize = -1;
protected boolean sslEnabled = DEFAULT_SSL_ENABLED;
protected boolean sslEnabledModified = false;
protected String keyStorePath;
protected String keyStorePassword;
protected String trustStorePath;
protected String trustStorePassword;
+
public void addPropertyChangeListener(PropertyChangeListener listener)
{
@@ -128,11 +131,6 @@
this.messagingServerID = id;
}
- public void setSecurityDomain(String securityDomain) throws Exception
- {
- this.securityDomain = securityDomain;
- }
-
public String getSecurityDomain()
{
return securityDomain;
@@ -165,16 +163,6 @@
return defaultMessageCounterHistoryDayLimit;
}
- public void setDefaultMessageCounterHistoryDayLimit(Integer defaultMessageCounterHistoryDayLimit)
- {
- if (defaultMessageCounterHistoryDayLimit < -1)
- {
- defaultMessageCounterHistoryDayLimit = -1;
- }
-
- this.defaultMessageCounterHistoryDayLimit = defaultMessageCounterHistoryDayLimit;
- }
-
public Boolean isStrictTck()
{
return strictTck || "true".equalsIgnoreCase(System.getProperty("jboss.messaging.stricttck"));
@@ -194,17 +182,7 @@
{
return scheduledThreadPoolMaxSize;
}
-
- public void setScheduledThreadPoolMaxSize(int size)
- {
- this.scheduledThreadPoolMaxSize = size;
- }
-
- public void setClustered(Boolean clustered)
- {
- this.clustered = clustered;
- }
-
+
public long getSecurityInvalidationInterval()
{
return this.securityInvalidationInterval;
@@ -215,7 +193,6 @@
return transport;
}
-
public void setTransport(TransportType transport)
{
this.transport = transport;
@@ -349,6 +326,21 @@
this.sslEnabledModified = true;
}
+ public boolean isTcpNoDelay()
+ {
+ return this.tcpNoDelay;
+ }
+
+ public int getTcpReceiveBufferSize()
+ {
+ return this.tcpReceiveBufferSize;
+ }
+
+ public void setTcpReceiveBufferSize(int size)
+ {
+ this.tcpReceiveBufferSize = size;
+ }
+
public String getURI()
{
StringBuffer buff = new StringBuffer();
@@ -357,6 +349,8 @@
buff.append("&").append("keepAliveInterval=").append(keepAliveInterval);
buff.append("&").append("keepAliveTimeout=").append(keepAliveTimeout);
buff.append("&").append("invmDisabled=").append(invmDisabled);
+ buff.append("&").append("tcpNoDelay=").append(tcpNoDelay);
+ buff.append("&").append("tcpReceiveBufferSize=").append(tcpReceiveBufferSize);
buff.append("&").append("sslEnabled=").append(sslEnabled);
buff.append("&").append("keyStorePath=").append(keyStorePath);
buff.append("&").append("trustStorePath=").append(trustStorePath);
@@ -368,99 +362,49 @@
return bindingsDirectory;
}
- public void setBindingsDirectory(String bindingsDirectory)
- {
- this.bindingsDirectory = bindingsDirectory;
- }
-
public String getJournalDirectory()
{
return journalDirectory;
}
- public void setJournalDirectory(String journalDirectory)
- {
- this.journalDirectory = journalDirectory;
- }
-
public JournalType getJournalType()
{
return journalType;
}
- public void setJournalType(JournalType journalType)
- {
- this.journalType = journalType;
- }
-
public boolean isJournalSync()
{
return journalSync;
}
- public void setJournalSync(boolean journalSync)
- {
- this.journalSync = journalSync;
- }
-
public int getJournalFileSize()
{
return journalFileSize;
}
- public void setJournalFileSize(int journalFileSize)
- {
- this.journalFileSize = journalFileSize;
- }
-
public int getJournalMinFiles()
{
return journalMinFiles;
}
- public void setJournalMinFiles(int journalMinFiles)
- {
- this.journalMinFiles = journalMinFiles;
- }
-
public long getJournalTaskPeriod()
{
return journalTaskPeriod;
}
- public void setJournalTaskPeriod(long journalTaskPeriod)
- {
- this.journalTaskPeriod = journalTaskPeriod;
- }
-
public boolean isCreateBindingsDir()
{
return createBindingsDir;
}
- public void setCreateBindingsDir(boolean createBindingsDir)
- {
- this.createBindingsDir = createBindingsDir;
- }
-
public boolean isCreateJournalDir()
{
return createJournalDir;
}
- public void setCreateJournalDir(boolean createJournalDir)
- {
- this.createJournalDir = createJournalDir;
- }
-
public boolean isRequireDestinations()
{
return requireDestinations;
}
-
- public void setRequireDestinations(boolean requireDestinations)
- {
- this.requireDestinations = requireDestinations;
- }
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -79,6 +79,10 @@
invmDisabled = getBoolean(e, "remoting-disable-invm", false);
+ tcpNoDelay = getBoolean(e, "remoting-tcp-nodelay", false);
+
+ tcpReceiveBufferSize = getInteger(e, "remoting-tcp-receive-buffer-size", -1);
+
sslEnabled = getBoolean(e, "remoting-enable-ssl", false);
keyStorePath = getString(e, "remoting-ssl-keystore-path", null);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -51,6 +51,13 @@
{
throw new IllegalStateException("Remoting port can not be negative when transport is not INVM");
}
+
+ if (configuration.getTcpReceiveBufferSize() != -1 && configuration.getTcpReceiveBufferSize() <= 0)
+ {
+ String message = "Invalid value for TCP receive buffer size: " + configuration.getTcpReceiveBufferSize();
+ message += ". Value must be either -1 (not specified) or greater than 0";
+ throw new IllegalStateException(message);
+ }
if (log.isDebugEnabled())
log.debug("configuration is valid.");
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -113,6 +113,11 @@
blockingScheduler = addBlockingRequestResponseFilter(filterChain);
addKeepAliveFilter(filterChain, keepAliveFactory, configuration.getKeepAliveInterval(),
configuration.getKeepAliveTimeout(), this);
+ connector.getSessionConfig().setTcpNoDelay(configuration.isTcpNoDelay());
+ if (configuration.getTcpReceiveBufferSize() != -1)
+ {
+ connector.getSessionConfig().setReceiveBufferSize(configuration.getTcpReceiveBufferSize());
+ }
connector.getSessionConfig().setKeepAlive(true);
connector.getSessionConfig().setReuseAddress(true);
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -148,6 +148,11 @@
// Bind
acceptor.setDefaultLocalAddress(new InetSocketAddress(config.getHost(), config.getPort()));
+ acceptor.getSessionConfig().setTcpNoDelay(config.isTcpNoDelay());
+ if (config.getTcpReceiveBufferSize() != -1)
+ {
+ acceptor.getSessionConfig().setReceiveBufferSize(config.getTcpReceiveBufferSize());
+ }
acceptor.setReuseAddress(true);
acceptor.getSessionConfig().setReuseAddress(true);
acceptor.getSessionConfig().setKeepAlive(true);
Modified: trunk/tests/etc/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/etc/ConfigurationTest-config.xml 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/etc/ConfigurationTest-config.xml 2008-04-07 15:01:53 UTC (rev 4016)
@@ -38,9 +38,18 @@
<data-channel-name>udptest</data-channel-name>
<channel-partition-name>JMStest</channel-partition-name>
- <remoting-transport>TCP</remoting-transport>
+ <remoting-transport>TCP</remoting-transport>
<remoting-bind-address>10000</remoting-bind-address>
+ <remoting-host>localhost</remoting-host>
<remoting-timeout>100</remoting-timeout>
+ <remoting-disable-invm>true</remoting-disable-invm>
+ <remoting-tcp-nodelay>true</remoting-tcp-nodelay>
+ <remoting-tcp-receive-buffer-size>8192</remoting-tcp-receive-buffer-size>
+ <remoting-enable-ssl>true</remoting-enable-ssl>
+ <remoting-ssl-keystore-path>messaging.keystore</remoting-ssl-keystore-path>
+ <remoting-ssl-keystore-password>secureexample keystore</remoting-ssl-keystore-password>
+ <remoting-ssl-truststore-path>messaging.truststore</remoting-ssl-truststore-path>
+ <remoting-ssl-truststore-password>secureexample truststore</remoting-ssl-truststore-password>
</configuration>
Modified: trunk/tests/src/org/jboss/messaging/core/config/impl/test/unit/ConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/config/impl/test/unit/ConfigurationTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/config/impl/test/unit/ConfigurationTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -83,6 +83,11 @@
assertEquals(TransportType.TCP, configuration.getTransport());
}
+ public void testRemotingHost() throws Exception
+ {
+ assertEquals("localhost", configuration.getHost());
+ }
+
public void testSetRemotingPort() throws Exception
{
assertEquals(10000, configuration.getPort());
@@ -94,6 +99,41 @@
assertEquals(100, configuration.getTimeout());
}
+ public void testRemotingTcpNodelay() throws Exception
+ {
+ assertEquals(true, configuration.isTcpNoDelay());
+ }
+
+ public void testRemotingTcpReceiveBufferSize() throws Exception
+ {
+ assertEquals(8192, configuration.getTcpReceiveBufferSize());
+ }
+
+ public void testRemotingEnableSSL() throws Exception
+ {
+ assertEquals(true, configuration.isSSLEnabled());
+ }
+
+ public void testRemotingSSLKeyStorePath() throws Exception
+ {
+ assertEquals("messaging.keystore", configuration.getKeyStorePath());
+ }
+
+ public void testRemotingSSLKeyStorePassword() throws Exception
+ {
+ assertEquals("secureexample keystore", configuration.getKeyStorePassword());
+ }
+
+ public void testRemotingSSLTrustStorePath() throws Exception
+ {
+ assertEquals("messaging.truststore", configuration.getTrustStorePath());
+ }
+
+ public void testRemotingSSLTrustStorePassword() throws Exception
+ {
+ assertEquals("secureexample truststore", configuration.getTrustStorePassword());
+ }
+
public void testSetInterceptorsList() throws Exception
{
assertEquals("Didn't get the correct number of elements on interceptors", 2, configuration.getDefaultInterceptors().size());
Modified: trunk/tests/src/org/jboss/messaging/core/integration/test/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/integration/test/CoreClientTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/integration/test/CoreClientTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -9,7 +9,6 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.impl.MessageImpl;
@@ -22,7 +21,8 @@
private final String QUEUE = "CoreClientTestQueue";
// Attributes ----------------------------------------------------
- private Configuration conf;
+
+ private ConfigurationImpl conf;
private MessagingServerImpl invmServer;
// Static --------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/ConfigurationHelper.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/ConfigurationHelper.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/ConfigurationHelper.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -1,6 +1,5 @@
package org.jboss.messaging.core.remoting.impl;
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.TransportType;
@@ -16,9 +15,9 @@
// Public --------------------------------------------------------
- public static Configuration newConfiguration(TransportType transport, String localhost, int port)
+ public static ConfigurationImpl newConfiguration(TransportType transport, String localhost, int port)
{
- Configuration config = new ConfigurationImpl();
+ ConfigurationImpl config = new ConfigurationImpl();
if (transport == TransportType.INVM)
config.setInvmDisabled(false);
config.setTransport(transport);
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.client.FailureListener;
-import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
import org.jboss.messaging.core.remoting.NIOSession;
@@ -59,7 +59,7 @@
@Override
protected void setUp() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
config.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
config.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
service = new MinaService(config);
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -18,6 +18,7 @@
import org.jboss.messaging.core.client.FailureListener;
import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.RemotingException;
@@ -81,7 +82,7 @@
}
};
- Configuration config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
"localhost", PORT);
config.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
config.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
@@ -136,7 +137,7 @@
}
};
- Configuration config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
"localhost", PORT);
config.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
config.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSL.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSL.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSL.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -32,7 +32,7 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
-import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.remoting.impl.ConfigurationHelper;
@@ -72,7 +72,7 @@
String keyStorePath = args[1];
String keyStorePassword = args[2];
- Configuration config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
"localhost", CoreClientOverSSLTest.SSL_PORT);
config.setSSLEnabled(sslEnabled);
config.setKeyStorePath(keyStorePath);
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSLTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSLTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -30,7 +30,7 @@
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
-import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.impl.ConfigurationHelper;
@@ -118,7 +118,7 @@
@Override
protected void setUp() throws Exception
{
- Configuration config = ConfigurationHelper.newConfiguration(TCP,
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
"localhost", SSL_PORT);
config.setSSLEnabled(true);
config.setKeyStorePath("messaging.keystore");
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/RemotingConfigurationValidatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/RemotingConfigurationValidatorTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/RemotingConfigurationValidatorTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -12,6 +12,7 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.ConfigurationHelper;
/**
@@ -53,9 +54,44 @@
}
}
+ public void test_TcpReceiveBufferSize_to_0()
+ {
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ config.setTcpReceiveBufferSize(0);
+ try
+ {
+ validate(config);
+ fail("can not set tcp receive buffer size to 0");
+ } catch (Exception e)
+ {
+
+ }
+ }
+
+ public void test_TcpReceiveBufferSize_to_minusOne()
+ {
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ config.setTcpReceiveBufferSize(-1);
+ validate(config);
+ }
+
+ public void test_TcpReceiveBufferSize_to_NegativeNumber()
+ {
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP, "localhost", 9000);
+ config.setTcpReceiveBufferSize(-2);
+ try
+ {
+ validate(config);
+ fail("can not set tcp receive buffer size to a negative number other than -1");
+ } catch (Exception e)
+ {
+
+ }
+ }
+
public void test_DisableINVM_With_INVMTransport()
{
- Configuration config = ConfigurationHelper.newConfiguration(INVM, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(INVM, "localhost", 9000);
config.setInvmDisabled(true);
try
@@ -70,7 +106,7 @@
public void test_EnableSSL_With_INVMTransport()
{
- Configuration config = ConfigurationHelper.newConfiguration(INVM, "localhost", 9000);
+ ConfigurationImpl config = ConfigurationHelper.newConfiguration(INVM, "localhost", 9000);
config.setSSLEnabled(true);
try
Modified: trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java 2008-04-07 14:23:57 UTC (rev 4015)
+++ trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java 2008-04-07 15:01:53 UTC (rev 4016)
@@ -34,6 +34,7 @@
import org.jboss.messaging.core.client.FailureListener;
import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.test.messaging.jms.JMSTestCase;
@@ -75,7 +76,7 @@
minaService.stop();
Configuration oldConfig = minaService
.getConfiguration();
- Configuration newConfig = oldConfig;
+ ConfigurationImpl newConfig = (ConfigurationImpl)oldConfig;
newConfig.setInvmDisabled(true);
newConfig.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
newConfig.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
More information about the jboss-cvs-commits
mailing list