[jboss-cvs] JBoss Messaging SVN: r3845 - in trunk: src/main/org/jboss/messaging/core/client/impl and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 5 10:07:24 EST 2008
Author: jmesnil
Date: 2008-03-05 10:07:24 -0500 (Wed, 05 Mar 2008)
New Revision: 3845
Added:
trunk/src/main/org/jboss/messaging/core/remoting/RemotingConfiguration.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationImpl.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaServiceTest.java
Removed:
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfiguration.java
Modified:
trunk/src/etc/server/default/deploy/jbm-beans.xml
trunk/src/etc/server/default/deploy/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.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/src/main/org/jboss/messaging/core/server/Configuration.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/src/org/jboss/messaging/core/config/impl/test/unit/ConfigurationTest.java
trunk/tests/src/org/jboss/messaging/core/integration/test/ProducerFlowControlTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/invm/test/unit/INVMSessionTest.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/MinaSessionTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.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/ConnectorRegistryTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/RemotingConfigurationValidatorTest.java
trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java
trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java
trunk/tests/src/org/jboss/test/messaging/tools/ConfigurationHelper.java
Log:
* remoting configuration clean up
- created interface RemotingConfiguration and subclass RemotingConfigurationImpl
- let general Configuration implement RemotingConfiguration (WIP)
- enabled INVM transport for MinaService (for invm-only communication)
Modified: trunk/src/etc/server/default/deploy/jbm-beans.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jbm-beans.xml 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/etc/server/default/deploy/jbm-beans.xml 2008-03-05 15:07:24 UTC (rev 3845)
@@ -60,7 +60,7 @@
<bean name="RemotingService" class="org.jboss.messaging.core.remoting.impl.mina.MinaService">
<constructor>
<parameter>
- <inject bean="Configuration" property="remotingConfiguration"/>
+ <inject bean="Configuration"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/etc/server/default/deploy/jbm-configuration.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jbm-configuration.xml 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/etc/server/default/deploy/jbm-configuration.xml 2008-03-05 15:07:24 UTC (rev 3845)
@@ -21,6 +21,8 @@
<scheduled-executor-max-pool-size>30</scheduled-executor-max-pool-size>
+ <!-- one of: TCP, INVM -->
+ <!-- INVM: the server is accessible only by clients in the same VM (no sockets are opened) -->
<remoting-transport>TCP</remoting-transport>
<remoting-bind-address>5400</remoting-bind-address>
@@ -28,7 +30,8 @@
<!-- timeout in seconds -->
<remoting-timeout>5</remoting-timeout>
- <!-- true to disable invm communication when the client and the server are in the same JVM -->
+ <!-- true to disable invm communication when the client and the server are in the same JVM. -->
+ <!-- it is not allowed to disable invm communication when the remoting-transport is set to INVM -->
<remoting-disable-invm>false</remoting-disable-invm>
<!-- if ssl is enabled, all remoting-ssl-* properties must be set -->
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -28,8 +28,8 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
import org.jboss.messaging.core.version.Version;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -30,7 +30,7 @@
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -21,10 +21,14 @@
*/
package org.jboss.messaging.core.config.impl;
+import static org.jboss.messaging.core.remoting.TransportType.TCP;
+
+import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.server.Configuration;
import org.jboss.messaging.util.XMLUtil;
import org.w3c.dom.Element;
@@ -35,7 +39,7 @@
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
-public class FileConfiguration extends Configuration
+public class FileConfiguration extends Configuration implements Serializable
{
private static final long serialVersionUID = -4766689627675039596L;
@@ -62,24 +66,28 @@
scheduledThreadPoolMaxSize = getInteger(e, "scheduled-executor-max-pool-size", scheduledThreadPoolMaxSize);
- remotingTransport = TransportType.valueOf(getString(e, "remoting-transport", remotingTransport.name()));
+ TransportType remotingTransport = TransportType.valueOf(getString(e, "remoting-transport", TCP.name()));
- remotingBindAddress = getInteger(e, "remoting-bind-address", remotingBindAddress);
+ int remotingPort = getInteger(e, "remoting-bind-address", 5400);
- remotingTimeout = getInteger(e, "remoting-timeout", remotingTimeout);
+ RemotingConfigurationImpl remotingConf = new RemotingConfigurationImpl(remotingTransport, "localhost", remotingPort);
- remotingDisableInvm = getBoolean(e, "remoting-disable-invm", remotingDisableInvm);
+ remotingConf.setTimeout(getInteger(e, "remoting-timeout", 5));
- remotingEnableSSL = getBoolean(e, "remoting-enable-ssl", remotingEnableSSL);
+ remotingConf.setInvmDisabled(getBoolean(e, "remoting-disable-invm", false));
- remotingSSLKeyStorePath = getString(e, "remoting-ssl-keystore-path", remotingSSLKeyStorePath);
+ remotingConf.setSSLEnabled(getBoolean(e, "remoting-enable-ssl", false));
- remotingSSLKeyStorePassword = getString(e, "remoting-ssl-keystore-password", remotingSSLKeyStorePassword);
+ remotingConf.setKeyStorePath(getString(e, "remoting-ssl-keystore-path", null));
- remotingSSLTrustStorePath = getString(e, "remoting-ssl-truststore-path", remotingSSLTrustStorePath);
+ remotingConf.setKeyStorePassword(getString(e, "remoting-ssl-keystore-password", null));
- remotingSSLTrustStorePassword = getString(e, "remoting-ssl-truststore-password", remotingSSLTrustStorePassword);
+ remotingConf.setTrustStorePath(getString(e, "remoting-ssl-truststore-path", null));
+
+ remotingConf.setTrustStorePassword(getString(e, "remoting-ssl-truststore-password", null));
+ this.remotingConfig = remotingConf;
+
NodeList defaultInterceptors = e.getElementsByTagName("default-interceptors-config");
ArrayList<String> interceptorList = new ArrayList<String>();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -154,7 +154,7 @@
int producerWindowSize, int producerMaxRate)
{
return new ClientConnectionFactoryImpl(messagingServer.getConfiguration().getMessagingServerID(),
- messagingServer.getConfiguration().getRemotingConfiguration(),
+ messagingServer.getConfiguration(),
messagingServer.getVersion(),
messagingServer.getConfiguration().isStrictTck() || strictTck,
prefetchSize,
Modified: trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -6,7 +6,7 @@
*/
package org.jboss.messaging.core.remoting;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
Added: trunk/src/main/org/jboss/messaging/core/remoting/RemotingConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingConfiguration.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingConfiguration.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public interface RemotingConfiguration
+{
+ TransportType getTransport();
+
+ String getHost();
+
+ int getPort();
+
+ int getKeepAliveInterval();
+
+ int getKeepAliveTimeout();
+
+ int getTimeout();
+
+ String getKeyStorePath();
+
+ String getKeyStorePassword();
+
+ String getTrustStorePath();
+
+ String getTrustStorePassword();
+
+ boolean isInvmDisabled();
+
+ boolean isSSLEnabled();
+
+ String getURI();
+}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingService.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -7,7 +7,6 @@
package org.jboss.messaging.core.remoting;
import org.jboss.messaging.core.client.FailureListener;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.server.MessagingComponent;
/**
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -16,6 +16,7 @@
import org.jboss.messaging.core.remoting.ConnectorRegistry;
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
@@ -97,8 +98,7 @@
if (localDispatchers.containsKey(remotingConfig))
{
PacketDispatcher localDispatcher = localDispatchers.get(remotingConfig);
- NIOConnector connector = new INVMConnector(remotingConfig.getHost(), remotingConfig
- .getPort(), dispatcher, localDispatcher);
+ NIOConnector connector = new INVMConnector(dispatcher, localDispatcher);
if (log.isDebugEnabled())
log.debug("Created " + connector + " to connect to "
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfiguration.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfiguration.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -1,260 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl;
-
-import java.io.Serializable;
-
-import org.jboss.messaging.core.remoting.TransportType;
-
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class RemotingConfiguration implements Serializable
-{
- // Constants -----------------------------------------------------
-
- private static final long serialVersionUID = 94076009399661407L;
-
- public static final int DEFAULT_KEEP_ALIVE_INTERVAL = 10; // in seconds
- public static final int DEFAULT_KEEP_ALIVE_TIMEOUT = 5; // in seconds
- public static final int DEFAULT_REQRES_TIMEOUT = 5; // in seconds
- public static final boolean DEFAULT_INVM_DISABLED = false;
- public static final boolean DEFAULT_SSL_ENABLED = false;
-
- // Attributes ----------------------------------------------------
-
- private TransportType transport;
- private String host;
- private int port;
-
- private int timeout = DEFAULT_REQRES_TIMEOUT;
- private int keepAliveInterval = DEFAULT_KEEP_ALIVE_INTERVAL;
- private int keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
- private boolean invmDisabled = DEFAULT_INVM_DISABLED;
- private boolean sslEnabled = DEFAULT_SSL_ENABLED;
- private String keyStorePath;
- private String keyStorePassword;
- private String trustStorePath;
- private String trustStorePassword;
-
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // for serialization only
- protected RemotingConfiguration()
- {
- }
-
- public RemotingConfiguration(TransportType transport, String host, int port)
- {
- assert transport != null;
- assert host != null;
-
- this.transport = transport;
- this.host = host;
- this.port = port;
- }
-
- public RemotingConfiguration(RemotingConfiguration other)
- {
- assert other != null;
-
- this.transport = other.transport;
- this.host = other.host;
- this.port = other.port;
-
- this.timeout = other.timeout;
- this.keepAliveInterval = other.keepAliveInterval;
- this.keepAliveTimeout = other.keepAliveTimeout;
- this.invmDisabled = other.invmDisabled;
- this.sslEnabled = other.sslEnabled;
- this.keyStorePath = other.keyStorePath;
- this.keyStorePassword = other.keyStorePassword;
- this.trustStorePath = other.trustStorePath;
- this.trustStorePassword = other.trustStorePassword;
- }
-
- // Public --------------------------------------------------------
-
- public TransportType getTransport()
- {
- return transport;
- }
-
- public String getHost()
- {
- return host;
- }
-
- public int getPort()
- {
- return port;
- }
-
- public void setKeepAliveInterval(int keepAliveInterval)
- {
- this.keepAliveInterval = keepAliveInterval;
- }
-
- public int getKeepAliveInterval()
- {
- return keepAliveInterval ;
- }
-
- public void setKeepAliveTimeout(int keepAliveTimeout)
- {
- this.keepAliveTimeout = keepAliveTimeout;
- }
-
- public int getKeepAliveTimeout()
- {
- return keepAliveTimeout;
- }
-
- public void setTimeout(int timeout)
- {
- this.timeout = timeout;
- }
-
- public int getTimeout()
- {
- return timeout;
- }
-
- public void setInvmDisabled(boolean disabled)
- {
- this.invmDisabled = disabled;
- }
-
- public boolean isInvmDisabled()
- {
- return invmDisabled;
- }
-
- public void setSSLEnabled(boolean sslEnabled)
- {
- this.sslEnabled = sslEnabled;
- }
-
- public boolean isSSLEnabled()
- {
- return sslEnabled;
- }
-
- public String getKeyStorePath()
- {
- return keyStorePath;
- }
-
- public void setKeyStorePath(String keyStorePath)
- {
- this.keyStorePath = keyStorePath;
- }
-
- public String getKeyStorePassword()
- {
- return keyStorePassword;
- }
-
- public void setKeyStorePassword(String keyStorePassword)
- {
- this.keyStorePassword = keyStorePassword;
- }
-
- public String getTrustStorePath()
- {
- return trustStorePath;
- }
-
- public void setTrustStorePath(String trustStorePath)
- {
- this.trustStorePath = trustStorePath;
- }
-
- public String getTrustStorePassword()
- {
- return trustStorePassword;
- }
-
- public void setTrustStorePassword(String trustStorePassword)
- {
- this.trustStorePassword = trustStorePassword;
- }
-
- public String getURI()
- {
- StringBuffer buff = new StringBuffer();
- buff.append(transport + "://" + host + ":" + port);
- buff.append("?").append("timeout=").append(timeout);
- buff.append("&").append("keepAliveInterval=").append(keepAliveInterval);
- buff.append("&").append("keepAliveTimeout=").append(keepAliveTimeout);
- buff.append("&").append("invmDisabled=").append(invmDisabled);
- buff.append("&").append("sslEnabled=").append(sslEnabled);
- buff.append("&").append("keyStorePath=").append(keyStorePath);
- buff.append("&").append("trustStorePath=").append(trustStorePath);
- return buff.toString();
- }
-
- @Override
- public String toString()
- {
- return "RemotingConfiguration[uri=" + getURI() + "]";
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((host == null) ? 0 : host.hashCode());
- result = prime * result + port;
- result = prime * result
- + ((transport == null) ? 0 : transport.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- final RemotingConfiguration other = (RemotingConfiguration) obj;
- if (host == null)
- {
- if (other.host != null)
- return false;
- } else if (!host.equals(other.host))
- return false;
- if (port != other.port)
- return false;
- if (transport == null)
- {
- if (other.transport != null)
- return false;
- } else if (!transport.equals(other.transport))
- return false;
- return true;
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Copied: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationImpl.java (from rev 3844, trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfiguration.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationImpl.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -0,0 +1,281 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl;
+
+import java.io.Serializable;
+
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.TransportType;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public class RemotingConfigurationImpl implements Serializable,
+ RemotingConfiguration
+{
+ // Constants -----------------------------------------------------
+
+ private static final long serialVersionUID = 94076009399661407L;
+
+ public static final int DEFAULT_KEEP_ALIVE_INTERVAL = 10; // in seconds
+ public static final int DEFAULT_KEEP_ALIVE_TIMEOUT = 5; // in seconds
+ public static final int DEFAULT_REQRES_TIMEOUT = 5; // in seconds
+ public static final boolean DEFAULT_INVM_DISABLED = false;
+ public static final boolean DEFAULT_SSL_ENABLED = false;
+
+ // Attributes ----------------------------------------------------
+
+ private TransportType transport;
+ private String host;
+ private int port;
+
+ private int timeout = DEFAULT_REQRES_TIMEOUT;
+ private int keepAliveInterval = DEFAULT_KEEP_ALIVE_INTERVAL;
+ private int keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+ private boolean invmDisabled = DEFAULT_INVM_DISABLED;
+ private boolean sslEnabled = DEFAULT_SSL_ENABLED;
+ private String keyStorePath;
+ private String keyStorePassword;
+ private String trustStorePath;
+ private String trustStorePassword;
+
+ // Static --------------------------------------------------------
+
+ /**
+ * Creates a RemotingConfiguration for the special case where the
+ * RemotingService must be accessed only within the JVM (i.e. the
+ * service does not open any socket).
+ */
+ public static RemotingConfiguration newINVMConfiguration()
+ {
+ RemotingConfigurationImpl conf = new RemotingConfigurationImpl();
+ conf.transport = TransportType.INVM;
+ return conf;
+ }
+
+ // Constructors --------------------------------------------------
+
+ // for serialization only
+ protected RemotingConfigurationImpl()
+ {
+ }
+
+ public RemotingConfigurationImpl(TransportType transport, String host,
+ int port)
+ {
+ assert transport != null;
+ assert host != null;
+
+ this.transport = transport;
+ this.host = host;
+ this.port = port;
+ }
+
+ public RemotingConfigurationImpl(RemotingConfiguration other)
+ {
+ assert other != null;
+
+ this.transport = other.getTransport();
+ this.host = other.getHost();
+ this.port = other.getPort();
+
+ this.timeout = other.getTimeout();
+ this.keepAliveInterval = other.getKeepAliveInterval();
+ this.keepAliveTimeout = other.getKeepAliveTimeout();
+ this.invmDisabled = other.isInvmDisabled();
+ this.sslEnabled = other.isSSLEnabled();
+ this.keyStorePath = other.getKeyStorePath();
+ this.keyStorePassword = other.getKeyStorePassword();
+ this.trustStorePath = other.getTrustStorePath();
+ this.trustStorePassword = other.getTrustStorePassword();
+ }
+
+ // RemotingConfiguration implementation --------------------------
+
+ public TransportType getTransport()
+ {
+ return transport;
+ }
+
+ public String getHost()
+ {
+ return host;
+ }
+
+ public int getPort()
+ {
+ return port;
+ }
+
+ public int getKeepAliveInterval()
+ {
+ return keepAliveInterval;
+ }
+
+ public int getKeepAliveTimeout()
+ {
+ return keepAliveTimeout;
+ }
+
+ public int getTimeout()
+ {
+ return timeout;
+ }
+
+ public boolean isInvmDisabled()
+ {
+ return invmDisabled;
+ }
+
+ public boolean isSSLEnabled()
+ {
+ return sslEnabled;
+ }
+
+ public String getKeyStorePath()
+ {
+ return keyStorePath;
+ }
+
+ public String getKeyStorePassword()
+ {
+ return keyStorePassword;
+ }
+
+ public String getTrustStorePath()
+ {
+ return trustStorePath;
+ }
+
+ public String getTrustStorePassword()
+ {
+ return trustStorePassword;
+ }
+
+ // Public --------------------------------------------------------
+
+ // FIXME required only for tests
+ public void setPort(int port)
+ {
+ this.port = port;
+ }
+
+ public void setKeepAliveInterval(int keepAliveInterval)
+ {
+ this.keepAliveInterval = keepAliveInterval;
+ }
+
+ public void setKeepAliveTimeout(int keepAliveTimeout)
+ {
+ this.keepAliveTimeout = keepAliveTimeout;
+ }
+
+ public void setTimeout(int timeout)
+ {
+ this.timeout = timeout;
+ }
+
+ public void setTrustStorePassword(String trustStorePassword)
+ {
+ this.trustStorePassword = trustStorePassword;
+ }
+
+ public void setInvmDisabled(boolean disabled)
+ {
+ this.invmDisabled = disabled;
+ }
+
+ public void setSSLEnabled(boolean sslEnabled)
+ {
+ this.sslEnabled = sslEnabled;
+ }
+
+ public void setKeyStorePath(String keyStorePath)
+ {
+ this.keyStorePath = keyStorePath;
+ }
+
+ public void setKeyStorePassword(String keyStorePassword)
+ {
+ this.keyStorePassword = keyStorePassword;
+ }
+
+ public void setTrustStorePath(String trustStorePath)
+ {
+ this.trustStorePath = trustStorePath;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((host == null) ? 0 : host.hashCode());
+ result = prime * result + port;
+ result = prime * result
+ + ((transport == null) ? 0 : transport.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ final RemotingConfigurationImpl other = (RemotingConfigurationImpl) obj;
+ if (host == null)
+ {
+ if (other.host != null)
+ return false;
+ } else if (!host.equals(other.host))
+ return false;
+ if (port != other.port)
+ return false;
+ if (transport == null)
+ {
+ if (other.transport != null)
+ return false;
+ } else if (!transport.equals(other.transport))
+ return false;
+ return true;
+ }
+
+ public String getURI()
+ {
+ StringBuffer buff = new StringBuffer();
+ buff.append(transport + "://" + host + ":" + port);
+ buff.append("?").append("timeout=").append(timeout);
+ buff.append("&").append("keepAliveInterval=").append(keepAliveInterval);
+ buff.append("&").append("keepAliveTimeout=").append(keepAliveTimeout);
+ buff.append("&").append("invmDisabled=").append(invmDisabled);
+ buff.append("&").append("sslEnabled=").append(sslEnabled);
+ buff.append("&").append("keyStorePath=").append(keyStorePath);
+ buff.append("&").append("trustStorePath=").append(trustStorePath);
+ return buff.toString();
+ }
+
+ @Override
+ public String toString()
+ {
+ return "RemotingConfiguration[uri=" + getURI() + "]";
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConfigurationValidator.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -9,6 +9,7 @@
import static org.jboss.messaging.core.remoting.TransportType.INVM;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -45,9 +46,10 @@
throw new IllegalStateException(
"It is not allowed to enable SSL when the transport is set to invm.");
}
- if (configuration.getPort() < 0)
+ if (configuration.getTransport() != INVM
+ && configuration.getPort() <= 0)
{
- throw new IllegalStateException("Remoting port can not be negative");
+ throw new IllegalStateException("Remoting port can not be negative when transport is not INVM");
}
if (log.isDebugEnabled())
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -27,10 +27,6 @@
// Attributes ----------------------------------------------------
- private String host;
-
- private int port;
-
private INVMSession session;
private PacketDispatcher clientDispatcher;
@@ -40,13 +36,11 @@
// Constructors --------------------------------------------------
- public INVMConnector(String host, int port, PacketDispatcher clientDispatcher, PacketDispatcher serverDispatcher)
+ public INVMConnector(PacketDispatcher clientDispatcher, PacketDispatcher serverDispatcher)
{
- assert host != null;
+ assert clientDispatcher != null;
assert serverDispatcher != null;
- this.host = host;
- this.port = port;
this.clientDispatcher = clientDispatcher;
this.serverDispatcher = serverDispatcher;
}
@@ -77,7 +71,7 @@
public String getServerURI()
{
- return INVM + "://" + host + ":" + port;
+ return INVM + "://localhost";
}
public void addFailureListener(FailureListener listener)
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -36,8 +36,8 @@
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.RemotingException;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
@@ -136,7 +136,7 @@
this.session = future.getSession();
AbstractPacket packet = new Ping(Long.toString(session.getId()));
session.write(packet);
-
+
return new MinaSession(session);
}
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -7,6 +7,7 @@
package org.jboss.messaging.core.remoting.impl.mina;
import static org.jboss.messaging.core.remoting.ConnectorRegistrySingleton.REGISTRY;
+import static org.jboss.messaging.core.remoting.TransportType.INVM;
import static org.jboss.messaging.core.remoting.impl.RemotingConfigurationValidator.validate;
import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addCodecFilter;
import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addExecutorFilter;
@@ -33,10 +34,10 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Interceptor;
import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.RemotingException;
import org.jboss.messaging.core.remoting.RemotingService;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -122,7 +123,9 @@
if (log.isDebugEnabled())
log.debug("Start MinaService with configuration:" + remotingConfig);
- if (acceptor == null)
+ // if INVM transport is set, we bypass MINA setup
+ if (remotingConfig.getTransport() != INVM
+ && acceptor == null)
{
acceptor = new NioSocketAcceptor();
DefaultIoFilterChainBuilder filterChain = acceptor.getFilterChain();
Modified: trunk/src/main/org/jboss/messaging/core/server/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/Configuration.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/server/Configuration.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -21,22 +21,24 @@
*/
package org.jboss.messaging.core.server;
-import static org.jboss.messaging.core.remoting.TransportType.TCP;
-
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.TransportType;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
/**
* @author <a href="mailto:ataylor at redhat.com>Andy Taylor</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*/
-public class Configuration
+public class Configuration implements RemotingConfiguration, Serializable
{
+ private static final long serialVersionUID = 4077088945050267843L;
+
private static final String REMOTING_DISABLE_INVM_SYSPROP_KEY = "jbm.remoting.disable.invm";
public static final String REMOTING_ENABLE_SSL_SYSPROP_KEY = "jbm.remoting.enable.ssl";
@@ -61,24 +63,8 @@
protected long securityInvalidationInterval = 10000;
- protected TransportType remotingTransport = TCP;
+ protected RemotingConfigurationImpl remotingConfig;
- protected int remotingBindAddress;
-
- protected int remotingTimeout;
-
- protected boolean remotingDisableInvm = false;
-
- protected boolean remotingEnableSSL = false;
-
- protected String remotingSSLKeyStorePath = null;
-
- protected String remotingSSLKeyStorePassword = null;
-
- protected String remotingSSLTrustStorePath = null;
-
- protected String remotingSSLTrustStorePassword = null;
-
public void addPropertyChangeListener(PropertyChangeListener listener)
{
if (propertyChangeSupport == null)
@@ -179,55 +165,131 @@
{
return this.securityInvalidationInterval;
}
+
+ public String getHost()
+ {
+ return remotingConfig.getHost();
+ }
+
+ // FIXME required only for tests
+ public void setPort(int port)
+ {
+ remotingConfig.setPort(port);
+ }
- public int getRemotingBindAddress()
+ public int getPort()
{
- return remotingBindAddress;
+ return remotingConfig.getPort();
}
- public void setRemotingBindAddress(Integer remotingBindAddress)
+ public TransportType getTransport()
{
- this.remotingBindAddress = remotingBindAddress;
+ return remotingConfig.getTransport();
}
- /**
- * If the system property <code>jbm.remoting.disable.invm</code> is set, its boolean value is used
- * regardless of the value of the property <code>remoting-disable-invm</code> in <code>jbm-configuration.xml</code>
- */
- public RemotingConfiguration getRemotingConfiguration()
+ public boolean isInvmDisabled()
{
- RemotingConfiguration configuration = new RemotingConfiguration(remotingTransport, "localhost", remotingBindAddress);
-
- configuration.setTimeout(remotingTimeout);
-
if (System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY) != null)
{
- configuration.setInvmDisabled(Boolean.parseBoolean(System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY)));
+ return Boolean.parseBoolean(System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY));
}
else
{
- configuration.setInvmDisabled(remotingDisableInvm);
+ return remotingConfig.isInvmDisabled();
}
-
+ }
+
+ public boolean isSSLEnabled()
+ {
if (System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY) != null)
{
- configuration.setSSLEnabled(Boolean.parseBoolean(System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY)));
+ return Boolean.parseBoolean(System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY));
}
else
{
- configuration.setSSLEnabled(remotingEnableSSL);
+ return remotingConfig.isSSLEnabled();
}
-
- configuration.setKeyStorePath(remotingSSLKeyStorePath);
-
- configuration.setKeyStorePassword(remotingSSLKeyStorePassword);
-
- configuration.setTrustStorePath(remotingSSLTrustStorePath);
-
- configuration.setTrustStorePassword(remotingSSLTrustStorePassword);
-
- return configuration;
}
+ public int getKeepAliveInterval()
+ {
+ return remotingConfig.getKeepAliveInterval();
+ }
+
+ public int getKeepAliveTimeout()
+ {
+ return remotingConfig.getKeepAliveTimeout();
+ }
+
+ public String getKeyStorePassword()
+ {
+ return remotingConfig.getKeyStorePassword();
+ }
+
+ public String getKeyStorePath()
+ {
+ return remotingConfig.getKeyStorePath();
+ }
+
+ public int getTimeout()
+ {
+ return remotingConfig.getTimeout();
+ }
+
+ public String getTrustStorePassword()
+ {
+ return remotingConfig.getTrustStorePassword();
+ }
+
+ public String getTrustStorePath()
+ {
+ return remotingConfig.getTrustStorePath();
+ }
+
+ public String getURI()
+ {
+ return remotingConfig.getURI();
+ }
+
+
+
+// /**
+// * If the system property <code>jbm.remoting.disable.invm</code> is set, its boolean value is used
+// * regardless of the value of the property <code>remoting-disable-invm</code> in <code>jbm-configuration.xml</code>
+// */
+// public RemotingConfiguration getRemotingConfiguration()
+// {
+// RemotingConfigurationImpl configuration = new RemotingConfigurationImpl(remotingTransport, "localhost", remotingBindAddress);
+//
+// configuration.setTimeout(remotingTimeout);
+//
+// if (System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY) != null)
+// {
+// configuration.setInvmDisabled(Boolean.parseBoolean(System.getProperty(REMOTING_DISABLE_INVM_SYSPROP_KEY)));
+// }
+// else
+// {
+// configuration.setInvmDisabled(remotingDisableInvm);
+// }
+//
+// if (System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY) != null)
+// {
+// configuration.setSSLEnabled(Boolean.parseBoolean(System.getProperty(REMOTING_ENABLE_SSL_SYSPROP_KEY)));
+// }
+// else
+// {
+// configuration.setSSLEnabled(remotingEnableSSL);
+// }
+//
+// configuration.setKeyStorePath(remotingSSLKeyStorePath);
+//
+// configuration.setKeyStorePassword(remotingSSLKeyStorePassword);
+//
+// configuration.setTrustStorePath(remotingSSLTrustStorePath);
+//
+// configuration.setTrustStorePassword(remotingSSLTrustStorePassword);
+//
+// return configuration;
+// }
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -26,11 +26,11 @@
import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.deployers.Deployer;
+import org.jboss.messaging.core.deployers.DeploymentManager;
+import org.jboss.messaging.core.deployers.impl.FileDeploymentManager;
import org.jboss.messaging.core.deployers.impl.QueueSettingsDeployer;
import org.jboss.messaging.core.deployers.impl.SecurityDeployer;
-import org.jboss.messaging.core.deployers.impl.FileDeploymentManager;
-import org.jboss.messaging.core.deployers.DeploymentManager;
-import org.jboss.messaging.core.deployers.Deployer;
import org.jboss.messaging.core.memory.MemoryManager;
import org.jboss.messaging.core.memory.impl.SimpleMemoryManager;
import org.jboss.messaging.core.persistence.PersistenceManager;
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.postoffice.impl.PostOfficeImpl;
import org.jboss.messaging.core.remoting.Interceptor;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.RemotingService;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
import org.jboss.messaging.core.security.Role;
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/config/impl/test/unit/ConfigurationTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.config.impl.FileConfiguration;
import org.jboss.messaging.core.remoting.TransportType;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
@@ -79,14 +78,22 @@
assertEquals("failed to set clustered", Boolean.TRUE, configuration.isClustered());
}
- public void testSetRemoteBindAddress() throws Exception
+ public void testSetTransport() throws Exception
{
- RemotingConfiguration remotingConfig = configuration.getRemotingConfiguration();
- assertEquals(TransportType.TCP, remotingConfig.getTransport());
- assertEquals(10000, remotingConfig.getPort());
- assertEquals(100, remotingConfig.getTimeout());
+ assertEquals(TransportType.TCP, configuration.getTransport());
}
+ public void testSetRemotingPort() throws Exception
+ {
+ assertEquals(10000, configuration.getPort());
+
+ }
+
+ public void testSetRemotingTimeout() throws Exception
+ {
+ assertEquals(100, configuration.getTimeout());
+ }
+
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/ProducerFlowControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/integration/test/ProducerFlowControlTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/integration/test/ProducerFlowControlTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -34,7 +34,7 @@
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.remoting.TransportType;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.core.settings.impl.QueueSettings;
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/SessionTestBase.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -21,6 +21,7 @@
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.mina.integration.test.ReversePacketHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/invm/test/unit/INVMSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/invm/test/unit/INVMSessionTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/invm/test/unit/INVMSessionTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -11,8 +11,9 @@
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.NIOConnector;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.SessionTestBase;
import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
@@ -41,13 +42,13 @@
@Override
protected NIOConnector createNIOConnector(PacketDispatcher dispatcher)
{
- return new INVMConnector("localhost", PORT, dispatcher, serverDispatcher);
+ return new INVMConnector(dispatcher, serverDispatcher);
}
@Override
protected RemotingConfiguration createRemotingConfiguration()
{
- return new RemotingConfiguration(INVM, "localhost", PORT);
+ return new RemotingConfigurationImpl(INVM, "localhost", PORT);
}
@Override
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -28,7 +28,7 @@
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.RemotingException;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.mina.ClientKeepAliveFactory;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
@@ -58,7 +58,7 @@
@Override
protected void setUp() throws Exception
{
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP, "localhost", PORT);
remotingConfig.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
remotingConfig.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
service = new MinaService(remotingConfig);
Added: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaServiceTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaServiceTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaServiceTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -0,0 +1,83 @@
+package org.jboss.messaging.core.remoting.impl.mina.integration.test;
+
+import static org.jboss.messaging.core.remoting.TransportType.TCP;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.remoting.NIOConnector;
+import org.jboss.messaging.core.remoting.NIOSession;
+import org.jboss.messaging.core.remoting.RemotingService;
+import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
+import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
+import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
+import org.jboss.messaging.core.remoting.impl.mina.MinaService;
+
+public class MinaServiceTest extends TestCase
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------t------------------------
+
+ private RemotingService invmService;
+
+ public void testINVMConnector_OK() throws Exception
+ {
+ NIOConnector connector = new INVMConnector(new PacketDispatcherImpl(), invmService.getDispatcher());
+ NIOSession session = connector.connect();
+
+ assertTrue(session.isConnected());
+ assertTrue(connector.disconnect());
+ assertFalse(session.isConnected());
+ }
+
+ public void testMinaConnector_Failure() throws Exception
+ {
+ NIOConnector connector = new MinaConnector(new RemotingConfigurationImpl(
+ TCP, "localhost", 9000), new PacketDispatcherImpl());
+
+ try
+ {
+ connector.connect();
+ fail("MINA service started in invm: can not connect to it through TCP");
+ } catch (IOException e)
+ {
+
+ }
+ }
+
+ // TestCase overrides --------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ invmService = new MinaService(RemotingConfigurationImpl.newINVMConfiguration());
+ invmService.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ invmService.stop();
+
+ super.tearDown();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaSessionTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -12,7 +12,7 @@
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.NIOConnector;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.SessionTestBase;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
@@ -65,9 +65,9 @@
}
@Override
- protected RemotingConfiguration createRemotingConfiguration()
+ protected RemotingConfigurationImpl createRemotingConfiguration()
{
- return new RemotingConfiguration(TCP, "localhost", PORT);
+ return new RemotingConfigurationImpl(TCP, "localhost", PORT);
}
@Override
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -21,7 +21,7 @@
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.RemotingException;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.messaging.core.remoting.impl.mina.ServerKeepAliveFactory;
@@ -80,7 +80,7 @@
}
};
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP,
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP,
"localhost", PORT);
remotingConfig.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
remotingConfig.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
@@ -135,7 +135,7 @@
}
};
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP,
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP,
"localhost", PORT);
remotingConfig.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
remotingConfig.setKeepAliveTimeout(KEEP_ALIVE_TIMEOUT);
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/stress/PacketStressTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -20,7 +20,7 @@
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
@@ -55,7 +55,7 @@
@Override
protected void setUp() throws Exception
{
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP, "localhost", PORT);
service = new MinaService(remotingConfig);
service.start();
connector = new MinaConnector(remotingConfig, new PacketDispatcherImpl());
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSL.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -34,7 +34,7 @@
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
@@ -71,7 +71,7 @@
String keyStorePath = args[1];
String keyStorePassword = args[2];
- RemotingConfiguration remotingConf = new RemotingConfiguration(TCP,
+ RemotingConfigurationImpl remotingConf = new RemotingConfigurationImpl(TCP,
"localhost", CoreClientOverSSLTest.SSL_PORT);
remotingConf.setSSLEnabled(sslEnabled);
remotingConf.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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/ssl/integration/CoreClientOverSSLTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -32,7 +32,7 @@
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.test.messaging.jms.SerializedClientSupport;
@@ -117,7 +117,7 @@
@Override
protected void setUp() throws Exception
{
- RemotingConfiguration remotingConf = new RemotingConfiguration(TCP,
+ RemotingConfigurationImpl remotingConf = new RemotingConfigurationImpl(TCP,
"localhost", SSL_PORT);
remotingConf.setSSLEnabled(true);
remotingConf.setKeyStorePath("messaging.keystore");
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ConnectorRegistryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ConnectorRegistryTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/ConnectorRegistryTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -16,7 +16,7 @@
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.ConnectorRegistryImpl;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -56,7 +56,7 @@
public void testRemotingConfigurationRegistration() throws Exception
{
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP, "localhost", PORT);
assertTrue(registry.register(remotingConfig, dispatcher));
assertFalse(registry.register(remotingConfig, dispatcher));
@@ -70,8 +70,8 @@
public void testRegistrationForTwoRemotingConfigurations() throws Exception
{
- RemotingConfiguration remotingConfig_1 = new RemotingConfiguration(TCP, "localhost", PORT);
- RemotingConfiguration remotingConfig_2 = new RemotingConfiguration(TCP, "localhost", PORT + 1);
+ RemotingConfigurationImpl remotingConfig_1 = new RemotingConfigurationImpl(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig_2 = new RemotingConfigurationImpl(TCP, "localhost", PORT + 1);
PacketDispatcher dispatcher_1 = new PacketDispatcherImpl();
PacketDispatcher dispatcher_2 = new PacketDispatcherImpl();
@@ -84,7 +84,7 @@
public void testINVMConnectorFromTCPRemotingConfiguration() throws Exception
{
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP, "localhost", PORT);
// remotingConfig is registered -> client and server are in the same vm
assertTrue(registry.register(remotingConfig, dispatcher));
@@ -101,7 +101,7 @@
public void testTCPConnectorFromTCPRemotingConfiguration() throws Exception
{
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP, "localhost", PORT);
// remotingConfig is not registered -> client and server are not in the same vm
@@ -115,7 +115,7 @@
public void testConnectorCount() throws Exception
{
- RemotingConfiguration remotingConfig = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig = new RemotingConfigurationImpl(TCP, "localhost", PORT);
assertEquals(0, registry.getConnectorCount(remotingConfig));
NIOConnector connector1 = registry.getConnector(remotingConfig, dispatcher);
@@ -141,8 +141,8 @@
public void testConnectorCount_2() throws Exception
{
- RemotingConfiguration remotingConfig1 = new RemotingConfiguration(TCP, "localhost", PORT);
- RemotingConfiguration remotingConfig2 = new RemotingConfiguration(TCP, "127.0.0.1", PORT);
+ RemotingConfigurationImpl remotingConfig1 = new RemotingConfigurationImpl(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig2 = new RemotingConfigurationImpl(TCP, "127.0.0.1", PORT);
assertNotSame(remotingConfig1, remotingConfig2);
@@ -167,8 +167,8 @@
*/
public void testRemotingConfigurationEquality() throws Exception
{
- RemotingConfiguration remotingConfig1 = new RemotingConfiguration(TCP, "localhost", PORT);
- RemotingConfiguration remotingConfig2 = new RemotingConfiguration(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig1 = new RemotingConfigurationImpl(TCP, "localhost", PORT);
+ RemotingConfigurationImpl remotingConfig2 = new RemotingConfigurationImpl(TCP, "localhost", PORT);
assertNotSame(remotingConfig1, remotingConfig2);
assertEquals(remotingConfig1, remotingConfig2);
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-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/test/unit/RemotingConfigurationValidatorTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -11,7 +11,8 @@
import static org.jboss.messaging.core.remoting.impl.RemotingConfigurationValidator.validate;
import junit.framework.TestCase;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -31,9 +32,16 @@
// Public --------------------------------------------------------
+ public void testINVMConfiguration()
+ {
+ RemotingConfiguration conf = RemotingConfigurationImpl.newINVMConfiguration();
+
+ validate(conf);
+ }
+
public void testNegativePort()
{
- RemotingConfiguration conf = new RemotingConfiguration(TCP, "localhost", -1);
+ RemotingConfiguration conf = new RemotingConfigurationImpl(TCP, "localhost", -1);
try
{
@@ -47,7 +55,7 @@
public void test_DisableINVM_With_INVMTransport()
{
- RemotingConfiguration conf = new RemotingConfiguration(INVM, "localhost", 9000);
+ RemotingConfigurationImpl conf = new RemotingConfigurationImpl(INVM, "localhost", 9000);
conf.setInvmDisabled(true);
try
@@ -62,7 +70,7 @@
public void test_EnableSSL_With_INVMTransport()
{
- RemotingConfiguration conf = new RemotingConfiguration(INVM, "localhost", 9000);
+ RemotingConfigurationImpl conf = new RemotingConfigurationImpl(INVM, "localhost", 9000);
conf.setSSLEnabled(true);
try
Modified: trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -37,7 +37,7 @@
import javax.transaction.TransactionManager;
import org.jboss.messaging.core.management.MessagingServerManagement;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.ConnectionManager;
import org.jboss.messaging.core.server.MessagingServer;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -107,6 +107,7 @@
MessageConsumer consumer = sess.createConsumer(queue);
TextMessage messageFromClient = (TextMessage) consumer.receive(5000);
+ assertNotNull("no message received", messageFromClient);
assertEquals(MESSAGE_TEXT_FROM_CLIENT, messageFromClient.getText());
// 1 local connection to the server
Modified: trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -34,7 +34,8 @@
import org.jboss.messaging.core.client.FailureListener;
import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.RemotingConfiguration;
+import org.jboss.messaging.core.remoting.impl.RemotingConfigurationImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.test.messaging.jms.JMSTestCase;
@@ -75,7 +76,7 @@
minaService.stop();
RemotingConfiguration oldRemotingConfig = minaService
.getRemotingConfiguration();
- RemotingConfiguration newRemotingConfig = new RemotingConfiguration(
+ RemotingConfigurationImpl newRemotingConfig = new RemotingConfigurationImpl(
oldRemotingConfig);
newRemotingConfig.setInvmDisabled(true);
newRemotingConfig.setKeepAliveInterval(KEEP_ALIVE_INTERVAL);
@@ -151,15 +152,7 @@
{
QueueConnection conn = getConnectionFactory().createQueueConnection();
- final CountDownLatch exceptionLatch = new CountDownLatch(2);
- conn.setExceptionListener(new ExceptionListener()
- {
- public void onException(JMSException e)
- {
- log.warn("got expected exception on the client");
- exceptionLatch.countDown();
- }
- });
+ final CountDownLatch exceptionLatch = new CountDownLatch(1);
FailureListener listener = new FailureListenerWithLatch(exceptionLatch);
minaService.addFailureListener(listener);
@@ -169,9 +162,9 @@
networkFailureFilter.messageSentDropsPacket = true;
networkFailureFilter.messageReceivedDropsPacket = true;
- boolean gotExceptionsOnTheServerAndTheClient = exceptionLatch.await(
+ boolean gotExceptionOnTheServer = exceptionLatch.await(
KEEP_ALIVE_INTERVAL + KEEP_ALIVE_TIMEOUT + 3, SECONDS);
- assertTrue(gotExceptionsOnTheServerAndTheClient);
+ assertTrue(gotExceptionOnTheServer);
assertActiveConnectionsOnTheServer(0);
try
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ConfigurationHelper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ConfigurationHelper.java 2008-03-04 16:54:35 UTC (rev 3844)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ConfigurationHelper.java 2008-03-05 15:07:24 UTC (rev 3845)
@@ -71,7 +71,7 @@
HashMap<String, Object> configuration = configs.get(config.getServerID());
Configuration actualConfiguration = (Configuration) kernelControllerContext.getKernel().getRegistry().getEntry("Configuration").getTarget();
actualConfiguration.setMessagingServerID(config.getServerID());
- actualConfiguration.setRemotingBindAddress(actualConfiguration.getRemotingBindAddress() + config.getServerID());
+ actualConfiguration.setPort(actualConfiguration.getPort() + config.getServerID());
alterConfig(actualConfiguration, configuration);
}
More information about the jboss-cvs-commits
mailing list