[jboss-cvs] JBoss Messaging SVN: r4474 - in trunk: src/main/org/jboss/messaging/core/client/impl and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 14 07:01:06 EDT 2008
Author: timfox
Date: 2008-06-14 07:01:05 -0400 (Sat, 14 Jun 2008)
New Revision: 4474
Added:
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
Removed:
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
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/AcceptorFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/config/ConfigurationTest-config.xml
trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LocationImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java
Log:
More tests
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/config/jbm-configuration.xml 2008-06-14 11:01:05 UTC (rev 4474)
@@ -10,7 +10,11 @@
<max-pool-size>30</max-pool-size>
<require-destinations>true</require-destinations>
-
+
+ <security-enabled>true</security-enabled>
+
+ <security-invalidation-interval>10000</security-invalidation-interval>
+
<!-- Remoting configuration -->
<!-- one of: TCP, INVM -->
@@ -20,6 +24,8 @@
<remoting-bind-address>5400</remoting-bind-address>
<remoting-host>localhost</remoting-host>
+
+ <remoting-port>5400</remoting-port>
<!-- call timeout in milliseconds -->
<remoting-call-timeout>5000</remoting-call-timeout>
@@ -49,14 +55,7 @@
<!--How long to wait for a returning pong after sending a ping message to a client/server.-->
<!-- If no pong is received after this time resources are cleaned up-->
<remoting-ping-timeout>5000</remoting-ping-timeout>
-
- <remoting-writequeue-block-timeout>10000</remoting-writequeue-block-timeout>
-
- <remoting-writequeue-minbytes>0</remoting-writequeue-minbytes>
-
- <!-- Effectively disable this since we're using producer and consumer flow control -->
- <remoting-writequeue-maxbytes>100000000</remoting-writequeue-maxbytes>
-
+
<!-- if ssl is enabled, all remoting-ssl-* properties must be set -->
<remoting-enable-ssl>false</remoting-enable-ssl>
@@ -107,9 +106,7 @@
<journal-aio-timeout>60000</journal-aio-timeout>
<journal-task-period>5000</journal-task-period>
-
- <security-enabled>true</security-enabled>
-
+
</configuration>
</deployment>
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -37,7 +37,7 @@
private String host;
- private int port = ConfigurationImpl.DEFAULT_REMOTING_PORT;
+ private int port = ConfigurationImpl.DEFAULT_PORT;
private int serverID;
@@ -61,7 +61,7 @@
public LocationImpl(final TransportType transport, final String host)
{
- this(transport, host, ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ this(transport, host, ConfigurationImpl.DEFAULT_PORT);
}
public String getLocation()
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -40,7 +40,7 @@
{
// General attributes -------------------------------------------------------------------
- List<String> getDefaultInterceptors();
+ List<String> getInterceptorClassNames();
boolean isClustered();
@@ -108,16 +108,6 @@
void setSSLEnabled(boolean enabled);
- boolean isInVMDisabled();
-
- void setInVMDisabled(boolean disabled);
-
- /**
- * The server ID is used only when the messaging server
- * is started in INVM transport.
- */
- // int getServerID();
-
// Journal related attributes
String getBindingsDirectory();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -54,7 +54,7 @@
public static final TransportType DEFAULT_TRANSPORT = TransportType.TCP;
- public static final int DEFAULT_REMOTING_PORT = 5400;
+ public static final int DEFAULT_PORT = 5400;
public static final long DEFAULT_SECURITY_INVALIDATION_INTERVAL = 10000;
@@ -62,8 +62,6 @@
public static final boolean DEFAULT_SECURITY_ENABLED = true;
- public static final boolean DEFAULT_INVM_DISABLED = false;
-
public static final boolean DEFAULT_SSL_ENABLED = false;
public static final String DEFAULT_KEYSTORE_PATH = "messaging.keystore";
@@ -105,7 +103,7 @@
// Attributes -----------------------------------------------------------------------------
- protected List<String> defaultInterceptors = new ArrayList<String>();
+ protected List<String> interceptorClassNames = new ArrayList<String>();
protected boolean clustered = DEFAULT_CLUSTERED;
@@ -155,10 +153,8 @@
protected String host = DEFAULT_HOST;
- protected int port = DEFAULT_REMOTING_PORT;
+ protected int port = DEFAULT_PORT;
- protected boolean inVMDisabled = DEFAULT_INVM_DISABLED;
-
protected final ConnectionParams defaultConnectionParams = new ConnectionParamsImpl();
protected boolean sslEnabled = DEFAULT_SSL_ENABLED;
@@ -172,9 +168,9 @@
protected String trustStorePassword = DEFAULT_TRUSTSTORE_PASSWORD;
- public List<String> getDefaultInterceptors()
+ public List<String> getInterceptorClassNames()
{
- return defaultInterceptors;
+ return interceptorClassNames;
}
public boolean isClustered()
@@ -319,23 +315,6 @@
this.trustStorePassword = password;
}
- public boolean isInVMDisabled()
- {
- if (System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY) != null)
- {
- return Boolean.parseBoolean(System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY));
- }
- else
- {
- return inVMDisabled;
- }
- }
-
- public void setInVMDisabled(boolean disabled)
- {
- this.inVMDisabled = disabled;
- }
-
public boolean isSSLEnabled()
{
if (System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY) != null)
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:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -28,6 +28,7 @@
import java.util.ArrayList;
import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.util.XMLUtil;
@@ -43,6 +44,8 @@
public class FileConfiguration extends ConfigurationImpl implements Serializable
{
private static final long serialVersionUID = -4766689627675039596L;
+
+ private static final Logger log = Logger.getLogger(FileConfiguration.class);
// Constants ------------------------------------------------------------------------
@@ -74,6 +77,8 @@
securityEnabled = getBoolean(e, "security-enabled", securityEnabled);
+ securityInvalidationInterval = getLong(e, "security-invalidation-interval", securityInvalidationInterval);
+
transport = TransportType.valueOf(getString(e, "remoting-transport", TransportType.TCP.toString()));
// Remoting config
@@ -83,11 +88,11 @@
if (System.getProperty("java.rmi.server.hostname") == null)
System.setProperty("java.rmi.server.hostname", host);
- port = getInteger(e, "remoting-bind-address", port);
+ port = getInteger(e, "remoting-port", port);
int callTimeout = getInteger(e, "remoting-call-timeout", ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
- boolean invmDisabled = getBoolean(e, "remoting-disable-invm", ConnectionParamsImpl.DEFAULT_INVM_DISABLED);
+ boolean inVMDisabled = getBoolean(e, "remoting-disable-invm", ConnectionParamsImpl.DEFAULT_INVM_DISABLED);
boolean tcpNoDelay = getBoolean(e, "remoting-tcp-nodelay", ConnectionParamsImpl.DEFAULT_TCP_NODELAY);
@@ -111,7 +116,7 @@
defaultConnectionParams.setCallTimeout(callTimeout);
- defaultConnectionParams.setInVMDisabled(invmDisabled);
+ defaultConnectionParams.setInVMDisabled(inVMDisabled);
defaultConnectionParams.setTcpNoDelay(tcpNoDelay);
@@ -186,7 +191,7 @@
}
}
}
- this.defaultInterceptors = interceptorList;
+ this.interceptorClassNames = interceptorList;
}
public String getConfigurationUrl()
@@ -205,8 +210,10 @@
{
NodeList nl = e.getElementsByTagName(name);
if (nl.getLength() > 0)
- {
- return Boolean.valueOf(nl.item(0).getTextContent().trim());
+ {
+ boolean b = Boolean.valueOf(nl.item(0).getTextContent().trim());
+ log.info(name + ": found boolean: " + b);
+ return b;
}
return def;
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/AcceptorFactoryImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -42,7 +42,7 @@
if (TransportType.TCP.equals(configuration.getTransport()))
{
acceptors.add(new MinaAcceptor());
- if (!configuration.isInVMDisabled())
+ if (!configuration.getConnectionParams().isInVMDisabled())
{
acceptors.add(new INVMAcceptor());
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -30,7 +30,7 @@
public static void validate(Configuration configuration)
{
if (configuration.getTransport() == INVM
- && configuration.isInVMDisabled())
+ && configuration.getConnectionParams().isInVMDisabled())
{
throw new IllegalStateException(
"It is not allowed to disable invm communication when the transport is set to invm.");
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -190,7 +190,7 @@
serverPacketHandler = new MessagingServerPacketHandler(this);
getRemotingService().getDispatcher().register(serverPacketHandler);
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for (String interceptorClass : configuration.getDefaultInterceptors())
+ for (String interceptorClass : configuration.getInterceptorClassNames())
{
try
{
Modified: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/config/ConfigurationTest-config.xml 2008-06-14 11:01:05 UTC (rev 4474)
@@ -1,62 +1,39 @@
<deployment>
<configuration>
- <server-peer-id>10</server-peer-id>
- <default-queue-jndi-context>/queuetest</default-queue-jndi-context>
- <default-topic-jndi-context>/topictest</default-topic-jndi-context>
- <security-domain>java:/jaas/messagingtest</security-domain>
- <default-interceptors-config>
- <interceptor class="org.jboss.tst"/>
- <interceptor class="org.jboss.tst2"/>
- </default-interceptors-config>
- <default-security-config>
- <role name="guest1" read="true" write="true" create="true"/>
- <role name="guest2" read="true" write="true" create="false"/>
- <role name="guest3" read="true" write="false" create="false"/>
- <role name="guest4" read="false" write="false" create="false"/>
- </default-security-config>
- <default-dlq>DLQtest</default-dlq>
- <default-max-delivery-attempts>100</default-max-delivery-attempts>
- <default-expiry-queue>ExpiryQueuetest</default-expiry-queue>
- <default-redelivery-delay>10</default-redelivery-delay>
- <message-counter-sample-period>50000</message-counter-sample-period>
- <failover-start-timeout>600000</failover-start-timeout>
- <failover-complete-timeout>900000</failover-complete-timeout>
- <default-message-counter-history-day-limit>21</default-message-counter-history-day-limit>
- <cluster-pull-connection-factory-name>jboss.messaging.connectionfactory:service=ClusterPullConnectionFactorytest
- </cluster-pull-connection-factory-name>
- <use-xa-for-message-pull>false</use-xa-for-message-pull>
- <default-preserve-ordering>true</default-preserve-ordering>
- <recover-deliveries-timeout>600000</recover-deliveries-timeout>
- <sucker-password>suckaaa</sucker-password>
- <strict-tck>true</strict-tck>
- <post-office-name>JMS post office</post-office-name>
<clustered>true</clustered>
- <group-name>MessagingPostOfficetest</group-name>
- <state-timeout>10000</state-timeout>
- <cast-timeout>10000</cast-timeout>
- <control-channel-name>udp-synctest</control-channel-name>
- <data-channel-name>udptest</data-channel-name>
- <channel-partition-name>JMStest</channel-partition-name>
-
- <remoting-transport>TCP</remoting-transport>
- <remoting-bind-address>10000</remoting-bind-address>
- <remoting-host>localhost</remoting-host>
- <remoting-timeout>100</remoting-timeout>
+ <scheduled-max-pool-size>12345</scheduled-max-pool-size>
+ <max-pool-size>54321</max-pool-size>
+ <require-destinations>false</require-destinations>
+ <security-enabled>false</security-enabled>
+ <security-invalidation-interval>5423</security-invalidation-interval>
+ <remoting-transport>HTTP</remoting-transport>
+ <remoting-bind-address>5431</remoting-bind-address>
+ <remoting-host>blahhost</remoting-host>
+ <remoting-port>6540</remoting-port>
+ <remoting-call-timeout>7654</remoting-call-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-tcp-send-buffer-size>1024</remoting-tcp-send-buffer-size>
+ <remoting-tcp-nodelay>false</remoting-tcp-nodelay>
+ <remoting-tcp-receive-buffer-size>987654</remoting-tcp-receive-buffer-size>
+ <remoting-tcp-send-buffer-size>2345676</remoting-tcp-send-buffer-size>
+ <remoting-ping-interval>123123</remoting-ping-interval>
+ <remoting-ping-timeout>321321</remoting-ping-timeout>->
<remoting-enable-ssl>true</remoting-enable-ssl>
- <remoting-keep-alive-interval>1234</remoting-keep-alive-interval>
- <remoting-keep-alive-timeout>5678</remoting-keep-alive-timeout>
- <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>
-
- <journal-max-aio>123</journal-max-aio>
- <journal-aio-timeout>123</journal-aio-timeout>
-
+ <remoting-ssl-keystore-path>blahstore</remoting-ssl-keystore-path>
+ <remoting-ssl-keystore-password>wibble123</remoting-ssl-keystore-password>
+ <remoting-ssl-truststore-path>blahtruststore</remoting-ssl-truststore-path>
+ <remoting-ssl-truststore-password>eek123</remoting-ssl-truststore-password>
+ <bindings-directory>somedir</bindings-directory>
+ <create-bindings-dir>false</create-bindings-dir>
+ <journal-directory>somedir2</journal-directory>
+ <create-journal-dir>false</create-journal-dir>
+ <journal-type>NIO</journal-type>
+ <journal-sync-transactional>false</journal-sync-transactional>
+ <journal-sync-non-transactional>true</journal-sync-non-transactional>
+ <journal-file-size>12345678</journal-file-size>
+ <journal-min-files>100</journal-min-files>
+ <journal-max-aio>56546</journal-max-aio>
+ <journal-aio-timeout>432323</journal-aio-timeout>
+ <journal-task-period>6544</journal-task-period>
</configuration>
</deployment>
\ No newline at end of file
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:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -55,7 +55,7 @@
public void testCoreClient() throws Exception
{
- Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_PORT);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(location);
ClientConnection conn = cf.createConnection();
@@ -82,7 +82,7 @@
public void testCoreClientMultipleConnections() throws Exception
{
- Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_PORT);
ConnectionParams connectionParams = new ConnectionParamsImpl();
connectionParams.setCallTimeout(500000);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(location, connectionParams);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -154,13 +154,13 @@
{
super.setUp();
- ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration("localhost", ConfigurationImpl.DEFAULT_PORT);
config.getConnectionParams().setPingInterval(2000);
config.getConnectionParams().setPingTimeout(1000);
server = new MessagingServerImpl(config);
server.start();
- cf = new ClientConnectionFactoryImpl(new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT));
+ cf = new ClientConnectionFactoryImpl(new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_PORT));
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -101,11 +101,11 @@
protected void setUp() throws Exception
{
ConfigurationImpl config = ConfigurationHelper.newTCPConfiguration(
- "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ "localhost", ConfigurationImpl.DEFAULT_PORT);
server = new MessagingServerImpl(config);
server.start();
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT));
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_PORT));
connection = cf.createConnection(null, null);
ClientSession session = connection.createClientSession(false, true, true, -1, false, false);
session.createQueue(QUEUE, QUEUE, null, false, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -73,7 +73,7 @@
int numberOfConnections = Integer.parseInt(args[0]);
- Location location = new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location location = new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_PORT);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(location);
ClientConnection conn = cf.createConnection();
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -60,7 +60,7 @@
{
try
{
- Location config = new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location config = new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_PORT);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(config);
ClientConnection conn = cf.createConnection(null, null);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -66,7 +66,7 @@
DummyInterceptor interceptorA = null;
DummyInterceptorB interceptorB = null;
- Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_PORT);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(location);
ClientConnection conn = null;
@@ -174,7 +174,7 @@
interceptor.sendException=false;
- Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location location = new LocationImpl(TransportType.TCP, "localhost", ConfigurationImpl.DEFAULT_PORT);
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(location);
conn = cf.createConnection();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/impl/JMSServerManagerimplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -21,28 +21,25 @@
*/
package org.jboss.messaging.tests.integration.jms.server.impl;
-import junit.framework.TestCase;
-import org.jboss.messaging.jms.server.JMSServerManager;
-import org.jboss.messaging.jms.server.ConnectionInfo;
-import org.jboss.messaging.jms.server.SubscriptionInfo;
-import org.jboss.messaging.jms.server.MessageStatistics;
-import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
-import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.core.server.impl.MessagingServerImpl;
-import org.jboss.messaging.core.management.impl.MessagingServerManagementImpl;
import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import org.jboss.messaging.core.security.JBMUpdateableSecurityManager;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import javax.jms.*;
-import javax.naming.NameNotFoundException;
-import javax.naming.InitialContext;
-import java.util.Hashtable;
-import java.util.Set;
import java.util.ArrayList;
-import java.util.List;
+import java.util.Hashtable;
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.management.impl.MessagingServerManagementImpl;
+import org.jboss.messaging.core.server.MessagingServer;
+import org.jboss.messaging.core.server.impl.MessagingServerImpl;
+import org.jboss.messaging.jms.client.JBossConnectionFactory;
+import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
+
/**
* JMSServerManagerImpl tests
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
@@ -58,7 +55,7 @@
jmsServerManager = new JMSServerManagerImpl();
MessagingServerManagementImpl messagingServerManagement = new MessagingServerManagementImpl();
ConfigurationImpl conf = new ConfigurationImpl();
- conf.setInVMDisabled(false);
+ conf.getConnectionParams().setInVMDisabled(false);
conf.setTransport(INVM);
messagingServer = new MessagingServerImpl(conf);
messagingServer.start();
Added: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.unit.core.client.impl;
+
+import org.jboss.messaging.core.client.ConnectionParams;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
+import org.jboss.messaging.tests.util.RandomUtil;
+import org.jboss.messaging.tests.util.UnitTestCase;
+
+/**
+ *
+ * A ConnectionParamsImplTest
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class ConnectionParamsImplTest extends UnitTestCase
+{
+
+ public void testDefaults()
+ {
+ ConnectionParams cp = new ConnectionParamsImpl();
+
+ assertEquals(ConnectionParamsImpl.DEFAULT_INVM_DISABLED, cp.isInVMDisabled());
+ assertEquals(ConnectionParamsImpl.DEFAULT_SSL_ENABLED, cp.isSSLEnabled());
+ assertEquals(ConnectionParamsImpl.DEFAULT_TCP_NODELAY, cp.isTcpNoDelay());
+ assertEquals(ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT, cp.getCallTimeout());
+ assertEquals(ConnectionParamsImpl.DEFAULT_PING_INTERVAL, cp.getPingInterval());
+ assertEquals(ConnectionParamsImpl.DEFAULT_PING_TIMEOUT, cp.getPingTimeout());
+ assertEquals(ConnectionParamsImpl.DEFAULT_TCP_RECEIVE_BUFFER_SIZE, cp.getTcpReceiveBufferSize());
+ assertEquals(ConnectionParamsImpl.DEFAULT_TCP_SEND_BUFFER_SIZE, cp.getTcpSendBufferSize());
+ assertEquals(null, cp.getKeyStorePath());
+ assertEquals(null, cp.getKeyStorePassword());
+ assertEquals(null, cp.getTrustStorePath());
+ assertEquals(null, cp.getTrustStorePassword());
+ }
+
+ public void testURI()
+ {
+ ConnectionParams cp = new ConnectionParamsImpl();
+
+ StringBuffer buff = new StringBuffer();
+ buff.append("?").append("callTimeout=").append(ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
+ buff.append("&").append("pingInterval=").append(ConnectionParamsImpl.DEFAULT_PING_INTERVAL);
+ buff.append("&").append("pingTimeout=").append(ConnectionParamsImpl.DEFAULT_PING_TIMEOUT);
+ buff.append("&").append("inVMDisabled=").append(ConnectionParamsImpl.DEFAULT_INVM_DISABLED);
+ buff.append("&").append("tcpNoDelay=").append(ConnectionParamsImpl.DEFAULT_TCP_NODELAY);
+ buff.append("&").append("tcpReceiveBufferSize=").append(ConnectionParamsImpl.DEFAULT_TCP_RECEIVE_BUFFER_SIZE);
+ buff.append("&").append("tcpSendBufferSize=").append(ConnectionParamsImpl.DEFAULT_TCP_SEND_BUFFER_SIZE);
+ buff.append("&").append("sslEnabled=").append(ConnectionParamsImpl.DEFAULT_SSL_ENABLED);
+ buff.append("&").append("keyStorePath=").append((String)null);
+ buff.append("&").append("trustStorePath=").append((String)null);
+
+ assertEquals(buff.toString(), cp.getURI());
+ }
+
+ public void testSetAndGetAttributes()
+ {
+ for (int j = 0; j < 100; j++)
+ {
+ ConnectionParams cp = new ConnectionParamsImpl();
+
+ boolean b = RandomUtil.randomBoolean();
+ cp.setInVMDisabled(b);
+ assertEquals(b, cp.isInVMDisabled());
+
+ b = RandomUtil.randomBoolean();
+ cp.setSSLEnabled(b);
+ assertEquals(b, cp.isSSLEnabled());
+
+ b = RandomUtil.randomBoolean();
+ cp.setTcpNoDelay(b);
+ assertEquals(b, cp.isTcpNoDelay());
+
+ int i = RandomUtil.randomInt();
+ cp.setCallTimeout(i);
+ assertEquals(i, cp.getCallTimeout());
+
+ long l = RandomUtil.randomLong();
+ cp.setPingInterval(l);
+ assertEquals(l, cp.getPingInterval());
+
+ l = RandomUtil.randomLong();
+ cp.setPingTimeout(l);
+ assertEquals(l, cp.getPingTimeout());
+
+ i = RandomUtil.randomInt();
+ cp.setTcpReceiveBufferSize(i);
+ assertEquals(i, cp.getTcpReceiveBufferSize());
+
+ i = RandomUtil.randomInt();
+ cp.setTcpSendBufferSize(i);
+ assertEquals(i, cp.getTcpSendBufferSize());
+
+ String s = RandomUtil.randomString();
+ cp.setKeyStorePath(s);
+ assertEquals(s, cp.getKeyStorePath());
+
+ s = RandomUtil.randomString();
+ cp.setKeyStorePassword(s);
+ assertEquals(s, cp.getKeyStorePassword());
+
+ s = RandomUtil.randomString();
+ cp.setTrustStorePath(s);
+ assertEquals(s, cp.getTrustStorePath());
+
+ s = RandomUtil.randomString();
+ cp.setTrustStorePassword(s);
+ assertEquals(s, cp.getTrustStorePassword());
+ }
+ }
+
+ // Private -----------------------------------------------------------------------------------------------------------
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LocationImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LocationImplTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LocationImplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -115,7 +115,7 @@
Location location = new LocationImpl(transport, host);
assertEquals(transport, location.getTransport());
assertEquals(host, location.getHost());
- assertEquals(ConfigurationImpl.DEFAULT_REMOTING_PORT, location.getPort());
+ assertEquals(ConfigurationImpl.DEFAULT_PORT, location.getPort());
}
// Inner classes -------------------------------------------------
Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.messaging.tests.unit.core.config.impl;
-
-import junit.framework.TestCase;
-import org.jboss.messaging.core.config.impl.FileConfiguration;
-import org.jboss.messaging.core.remoting.TransportType;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-/**
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- */
-public class ConfigurationTest extends TestCase
-{
- private FileConfiguration configuration;
-
- protected void setUp() throws Exception
- {
- configuration = new FileConfiguration();
- configuration.setConfigurationUrl("ConfigurationTest-config.xml");
- configuration.start();
- }
-
- protected void tearDown() throws Exception
- {
- configuration = null;
- }
-
- public void testSetClustered() throws Exception
- {
- assertEquals("failed to set clustered", Boolean.TRUE.booleanValue(), configuration.isClustered());
- }
-
- public void testSetTransport() throws Exception
- {
- assertEquals(TransportType.TCP, configuration.getTransport());
- }
-
- public void testRemotingHost() throws Exception
- {
- assertEquals("localhost", configuration.getHost());
- }
-
- public void testSetRemotingPort() throws Exception
- {
- assertEquals(10000, configuration.getPort());
-
- }
-
-
- 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());
- assertEquals("org.jboss.tst", configuration.getDefaultInterceptors().get(0));
- assertEquals("org.jboss.tst2", configuration.getDefaultInterceptors().get(1));
- }
-
- public void testMaxAIO() throws Exception
- {
- assertEquals(123, configuration.getJournalMaxAIO());
- }
-
- public void testAIOTimeout() throws Exception
- {
- assertEquals(123, configuration.getJournalAIOTimeout());
- }
-
- //config is supposed to be immutable??
-// public void testPropertyChangeListener() throws Exception
-// {
-// MyListener listener = new MyListener();
-// configuration.addPropertyChangeListener(listener);
-// listener.setCalled(false);
-// configuration.setMessageCounterSamplePeriod(1000000);
-// assertTrue("property change listener not fired", listener.isCalled());
-// }
-
- class MyListener implements PropertyChangeListener
- {
- boolean called = false;
-
- public boolean isCalled()
- {
- return called;
- }
-
- public void setCalled(boolean called)
- {
- this.called = called;
- }
-
- public void propertyChange(PropertyChangeEvent evt)
- {
- called = true;
- }
- }
-}
Added: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/FileConfigurationTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.unit.core.config.impl;
+
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.FileConfiguration;
+import org.jboss.messaging.core.remoting.TransportType;
+
+/**
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ * @author <a href="tim.fox at jboss.com">Tim Fox</a>
+ */
+public class FileConfigurationTest extends ConfigurationImplTest
+{
+ public void testDefaults()
+ {
+ //Check they match the values from the test file
+ assertEquals(true, conf.isClustered());
+ assertEquals(12345, conf.getScheduledThreadPoolMaxSize());
+ assertEquals(54321, conf.getThreadPoolMaxSize());
+ assertEquals("blahhost", conf.getHost());
+ assertEquals(TransportType.HTTP, conf.getTransport());
+ assertEquals(6540, conf.getPort());
+ assertEquals(5423, conf.getSecurityInvalidationInterval());
+ assertEquals(false, conf.isRequireDestinations());
+ assertEquals(false, conf.isSecurityEnabled());
+ assertEquals(true, conf.isSSLEnabled());
+ assertEquals("blahstore", conf.getKeyStorePath());
+ assertEquals("wibble123", conf.getKeyStorePassword());
+ assertEquals("blahtruststore", conf.getTrustStorePath());
+ assertEquals("eek123", conf.getTrustStorePassword());
+ assertEquals("somedir", conf.getBindingsDirectory());
+ assertEquals(false, conf.isCreateBindingsDir());
+ assertEquals("somedir2", conf.getJournalDirectory());
+ assertEquals(false, conf.isCreateJournalDir());
+ assertEquals("NIO", conf.getJournalType().toString());
+ assertEquals(false, conf.isJournalSyncTransactional());
+ assertEquals(true, conf.isJournalSyncNonTransactional());
+ assertEquals(12345678, conf.getJournalFileSize());
+ assertEquals(100, conf.getJournalMinFiles());
+ assertEquals(56546, conf.getJournalMaxAIO());
+ assertEquals(432323, conf.getJournalAIOTimeout());
+ assertEquals(6544, conf.getJournalTaskPeriod());
+ }
+
+ public void testSetGetConfigurationURL()
+ {
+ final String file = "ghuuhhu";
+
+ FileConfiguration fc = new FileConfiguration();
+
+ fc.setConfigurationUrl(file);
+
+ assertEquals(file, fc.getConfigurationUrl());
+
+ }
+
+ // Protected ---------------------------------------------------------------------------------------------
+
+ protected Configuration createConfiguration() throws Exception
+ {
+ FileConfiguration fc = new FileConfiguration();
+
+ fc.setConfigurationUrl("ConfigurationTest-config.xml");
+
+ fc.start();
+
+ return fc;
+ }
+
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/AcceptorFactoryImplTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -41,7 +41,7 @@
AcceptorFactoryImpl acceptorFactory = new AcceptorFactoryImpl();
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(TransportType.TCP);
- config.setInVMDisabled(false);
+ config.getConnectionParams().setInVMDisabled(false);
List<Acceptor> acceptors = acceptorFactory.createAcceptors(config);
assertEquals(2, acceptors.size());
assertEquals(MinaAcceptor.class, acceptors.get(0).getClass());
@@ -53,7 +53,7 @@
AcceptorFactoryImpl acceptorFactory = new AcceptorFactoryImpl();
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(TransportType.TCP);
- config.setInVMDisabled(true);
+ config.getConnectionParams().setInVMDisabled(true);
List<Acceptor> acceptors = acceptorFactory.createAcceptors(config);
assertEquals(1, acceptors.size());
assertEquals(MinaAcceptor.class, acceptors.get(0).getClass());
@@ -64,7 +64,7 @@
AcceptorFactoryImpl acceptorFactory = new AcceptorFactoryImpl();
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(TransportType.INVM);
- config.setInVMDisabled(false);
+ config.getConnectionParams().setInVMDisabled(false);
List<Acceptor> acceptors = acceptorFactory.createAcceptors(config);
assertEquals(1, acceptors.size());
assertEquals(INVMAcceptor.class, acceptors.get(0).getClass());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/RemotingConfigurationValidatorTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -124,7 +124,7 @@
{
ConfigurationImpl config = new ConfigurationImpl();
config.setTransport(INVM);
- config.setInVMDisabled(true);
+ config.getConnectionParams().setInVMDisabled(true);
try
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java 2008-06-14 08:50:39 UTC (rev 4473)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/network/ClientNetworkFailureTest.java 2008-06-14 11:01:05 UTC (rev 4474)
@@ -75,7 +75,7 @@
{
super.setUp();
ConfigurationImpl newConfig = new ConfigurationImpl();
- newConfig.setInVMDisabled(true);
+ newConfig.getConnectionParams().setInVMDisabled(true);
newConfig.setHost("localhost");
newConfig.setPort(5400);
newConfig.setTransport(TransportType.TCP);
More information about the jboss-cvs-commits
mailing list