[jboss-cvs] JBoss Messaging SVN: r4472 - in trunk: src/main/org/jboss/messaging/core/client/impl and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 14 04:35:52 EDT 2008
Author: timfox
Date: 2008-06-14 04:35:52 -0400 (Sat, 14 Jun 2008)
New Revision: 4472
Modified:
trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java
Log:
More tests
Modified: trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -32,9 +32,9 @@
*/
public interface ConnectionParams extends Serializable
{
- long getBlockingCallTimeout();
+ long getCallTimeout();
- void setBlockingCallTimeout(long timeout);
+ void setCallTimeout(long timeout);
long getPingInterval();
@@ -44,9 +44,9 @@
void setPingTimeout(long pingTimeout);
- boolean isInvmDisabled();
+ boolean isInVMDisabled();
- void setInvmDisabled(boolean invmDisabled);
+ void setInVMDisabled(boolean invmDisabled);
boolean isTcpNoDelay();
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -35,7 +35,7 @@
public static final int DEFAULT_PING_TIMEOUT = 5000; // ms
- public static final int DEFAULT_BLOCKING_CALL_TIMEOUT = 5000; // in ms
+ public static final int DEFAULT_CALL_TIMEOUT = 5000; // in ms
public static final boolean DEFAULT_INVM_DISABLED = false;
@@ -47,15 +47,15 @@
public static final boolean DEFAULT_SSL_ENABLED = false;
- public static final String REMOTING_SSL_KEYSTORE_PATH_PROPERTY_NAME = "remoting.ssl.keystore.path";
+ public static final String SSL_KEYSTORE_PATH_PROPERTY_NAME = "remoting.ssl.keystore.path";
- public static final String REMOTING_SSL_KEYSTORE_PASSWORD_PROPERTY_NAME = "remoting.ssl.keystore.password";
+ public static final String SSL_KEYSTORE_PASSWORD_PROPERTY_NAME = "remoting.ssl.keystore.password";
- public static final String REMOTING_SSL_TRUSTSTORE_PATH_PROPERTY_NAME = "remoting.ssl.truststore.path";
+ public static final String SSL_TRUSTSTORE_PATH_PROPERTY_NAME = "remoting.ssl.truststore.path";
- public static final String REMOTING_SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME = "remoting.ssl.truststore.password";
+ public static final String SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME = "remoting.ssl.truststore.password";
- public static final String REMOTING_ENABLE_SSL_PROPERTY_NAME = "remoting.enable.ssl";
+ public static final String ENABLE_SSL_PROPERTY_NAME = "remoting.enable.ssl";
@@ -63,7 +63,7 @@
// Attributes -------------------------------------------------------------------------------------
- private long blockingCallTimeout = DEFAULT_BLOCKING_CALL_TIMEOUT;
+ private long callTimeout = DEFAULT_CALL_TIMEOUT;
private long pingInterval = DEFAULT_PING_INTERVAL;
@@ -87,14 +87,14 @@
private String trustStorePassword;
- public long getBlockingCallTimeout()
+ public long getCallTimeout()
{
- return blockingCallTimeout;
+ return callTimeout;
}
- public void setBlockingCallTimeout(final long timeout)
+ public void setCallTimeout(final long timeout)
{
- this.blockingCallTimeout = timeout;
+ this.callTimeout = timeout;
}
public long getPingInterval()
@@ -117,12 +117,12 @@
this.pingTimeout = pingTimeout;
}
- public boolean isInvmDisabled()
+ public boolean isInVMDisabled()
{
return invmDisabled;
}
- public void setInvmDisabled(final boolean invmDisabled)
+ public void setInVMDisabled(final boolean invmDisabled)
{
this.invmDisabled = invmDisabled;
}
@@ -159,7 +159,7 @@
public boolean isSSLEnabled()
{
- String sslEnabledProperty = System.getProperty(REMOTING_ENABLE_SSL_PROPERTY_NAME);
+ String sslEnabledProperty = System.getProperty(ENABLE_SSL_PROPERTY_NAME);
return sslEnabledProperty == null ? sslEnabled : sslEnabledProperty.equalsIgnoreCase("true");
}
@@ -171,7 +171,7 @@
public String getKeyStorePath()
{
- String sslKeystorePath = System.getProperty(REMOTING_SSL_KEYSTORE_PATH_PROPERTY_NAME);
+ String sslKeystorePath = System.getProperty(SSL_KEYSTORE_PATH_PROPERTY_NAME);
return sslKeystorePath == null ? keyStorePath : sslKeystorePath;
}
@@ -183,7 +183,7 @@
public String getKeyStorePassword()
{
- String keyStorePass = System.getProperty(REMOTING_SSL_KEYSTORE_PASSWORD_PROPERTY_NAME);
+ String keyStorePass = System.getProperty(SSL_KEYSTORE_PASSWORD_PROPERTY_NAME);
return keyStorePass == null ? keyStorePassword : keyStorePass;
}
@@ -195,7 +195,7 @@
public String getTrustStorePath()
{
- String sslTruststorePath = System.getProperty(REMOTING_SSL_TRUSTSTORE_PATH_PROPERTY_NAME);
+ String sslTruststorePath = System.getProperty(SSL_TRUSTSTORE_PATH_PROPERTY_NAME);
return sslTruststorePath == null ? trustStorePath : sslTruststorePath;
}
@@ -207,7 +207,7 @@
public String getTrustStorePassword()
{
- String trustStorePass = System.getProperty(REMOTING_SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME);
+ String trustStorePass = System.getProperty(SSL_TRUSTSTORE_PASSWORD_PROPERTY_NAME);
return trustStorePass == null ? trustStorePassword : trustStorePass;
}
@@ -220,10 +220,10 @@
public String getURI()
{
StringBuffer buff = new StringBuffer();
- buff.append("?").append("blockingCallTimeout=").append(blockingCallTimeout);
+ buff.append("?").append("callTimeout=").append(callTimeout);
buff.append("&").append("pingInterval=").append(pingInterval);
buff.append("&").append("pingTimeout=").append(pingTimeout);
- buff.append("&").append("invmDisabled=").append(invmDisabled);
+ buff.append("&").append("inVMDisabled=").append(invmDisabled);
buff.append("&").append("tcpNoDelay=").append(tcpNoDelay);
buff.append("&").append("tcpReceiveBufferSize=").append(tcpReceiveBufferSize);
buff.append("&").append("tcpSendBufferSize=").append(tcpSendBufferSize);
@@ -247,10 +247,10 @@
ConnectionParams cp = (ConnectionParams)other;
- return cp.getBlockingCallTimeout() == blockingCallTimeout &&
+ return cp.getCallTimeout() == callTimeout &&
cp.getPingTimeout() == this.pingTimeout &&
cp.getPingInterval() == this.pingInterval &&
- cp.isInvmDisabled() == this.isInvmDisabled() &&
+ cp.isInVMDisabled() == this.isInVMDisabled() &&
cp.isTcpNoDelay() == this.isTcpNoDelay() &&
cp.getTcpReceiveBufferSize() == this.getTcpReceiveBufferSize() &&
cp.getTcpSendBufferSize() == this.getTcpSendBufferSize() &&
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -85,7 +85,7 @@
port = getInteger(e, "remoting-bind-address", port);
- int blockingCallTimeout = getInteger(e, "remoting-call-timeout", ConnectionParamsImpl.DEFAULT_BLOCKING_CALL_TIMEOUT);
+ int callTimeout = getInteger(e, "remoting-call-timeout", ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
boolean invmDisabled = getBoolean(e, "remoting-disable-invm", ConnectionParamsImpl.DEFAULT_INVM_DISABLED);
@@ -109,9 +109,9 @@
trustStorePassword = getString(e, "remoting-ssl-truststore-password", null);
- defaultConnectionParams.setBlockingCallTimeout(blockingCallTimeout);
+ defaultConnectionParams.setCallTimeout(callTimeout);
- defaultConnectionParams.setInvmDisabled(invmDisabled);
+ defaultConnectionParams.setInVMDisabled(invmDisabled);
defaultConnectionParams.setTcpNoDelay(tcpNoDelay);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -160,7 +160,7 @@
throw new MessagingException(MessagingException.INTERNAL_ERROR);
}
- Packet response = handler.waitForResponse(connectionParams.getBlockingCallTimeout());
+ Packet response = handler.waitForResponse(connectionParams.getCallTimeout());
if (response == null)
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -84,7 +84,7 @@
{
Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
ConnectionParams connectionParams = new ConnectionParamsImpl();
- connectionParams.setBlockingCallTimeout(500000);
+ connectionParams.setCallTimeout(500000);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(location, connectionParams);
ClientConnection conn = cf.createConnection();
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/remoting/impl/MeasureBase.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -153,7 +153,7 @@
{
ConnectionParamsImpl param = new ConnectionParamsImpl();
param.setTcpNoDelay(true);
- param.setBlockingCallTimeout(50000);
+ param.setCallTimeout(50000);
return param;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java 2008-06-14 08:35:15 UTC (rev 4471)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConnectionTest.java 2008-06-14 08:35:52 UTC (rev 4472)
@@ -209,7 +209,7 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = new ConnectionParamsImpl();
- connectionParams.setBlockingCallTimeout(1000);
+ connectionParams.setCallTimeout(1000);
DummyDispatcher dispatcher = new DummyDispatcher();
DummySession nioSession = new DummySession(dispatcher, 0, null, false);
PacketHandler handler = null;
@@ -251,7 +251,7 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = new ConnectionParamsImpl();
- connectionParams.setBlockingCallTimeout(1000);
+ connectionParams.setCallTimeout(1000);
DummyDispatcher dispatcher = new DummyDispatcher();
DummySession nioSession = new DummySession(dispatcher, 2000, null, false);
PacketHandler handler = null;
@@ -300,7 +300,7 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = new ConnectionParamsImpl();
- connectionParams.setBlockingCallTimeout(1000);
+ connectionParams.setCallTimeout(1000);
DummyDispatcher dispatcher = new DummyDispatcher();
DummySession nioSession = new DummySession(dispatcher, 0, new Exception(), false);
PacketHandler handler = null;
@@ -350,7 +350,7 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = new ConnectionParamsImpl();
- connectionParams.setBlockingCallTimeout(1000);
+ connectionParams.setCallTimeout(1000);
DummyDispatcher dispatcher = new DummyDispatcher();
DummySession nioSession = new DummySession(dispatcher, 0, null, true);
PacketHandler handler = null;
@@ -388,7 +388,7 @@
});
Location location = EasyMock.createNiceMock(Location.class);
ConnectionParams connectionParams = new ConnectionParamsImpl();
- connectionParams.setBlockingCallTimeout(1000);
+ connectionParams.setCallTimeout(1000);
DummyDispatcher dispatcher = new DummyDispatcher();
DummySession nioSession = new DummySession(dispatcher, 0, new Exception(), true);
PacketHandler handler = null;
More information about the jboss-cvs-commits
mailing list