[jboss-cvs] JBoss Messaging SVN: r4079 - in trunk: src/main/org/jboss/messaging/core/client and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 18 05:30:15 EDT 2008
Author: ataylor
Date: 2008-04-18 05:30:15 -0400 (Fri, 18 Apr 2008)
New Revision: 4079
Added:
trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
trunk/src/main/org/jboss/messaging/core/client/Location.java
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
Modified:
trunk/docs/examples/jms/src/org/jboss/jms/example/QueueExample.java
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/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.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/impl/ConnectorRegistryImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
trunk/tests/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/core/remoting/mina/ClientKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java
trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/network/ClientNetworkFailureTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java
Log:
removed server configuration from being used by the client. Location and ConnectionParams are now used.
Modified: trunk/docs/examples/jms/src/org/jboss/jms/example/QueueExample.java
===================================================================
--- trunk/docs/examples/jms/src/org/jboss/jms/example/QueueExample.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/docs/examples/jms/src/org/jboss/jms/example/QueueExample.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -26,6 +26,7 @@
import javax.jms.*;
import java.util.ResourceBundle;
import java.util.Properties;
+import java.io.IOException;
/**
* A simple JMS Queue example that creates a producer and consumer on a queue and sends a message.
@@ -46,12 +47,47 @@
connection = cf.createConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = session.createProducer(queue);
- Message message = session.createTextMessage("This is a text message!");
- producer.send(message);
- MessageConsumer messageConsumer = session.createConsumer(queue);
+
+
+ MessageConsumer messageConsumer = session.createConsumer(queue, "MYHEADER='one'");
+ messageConsumer.setMessageListener(new MessageListener()
+ {
+ public void onMessage(Message message)
+ {
+ System.out.println("ml1");
+ }
+ });
+
+ MessageConsumer messageConsumer2 = session.createConsumer(queue,"MYHEADER='two'");
+ messageConsumer2.setMessageListener(new MessageListener()
+ {
+ public void onMessage(Message message)
+ {
+ System.out.println("ml2");
+ }
+ });
+ for(int i = 0; i < 10; i++)
+ {
+ Message message = session.createTextMessage("This is a text message " + i);
+ if(i == 0 || i==2 || i==4 || i==6 || i==8 )
+ {
+ message.setStringProperty("MYHEADER", "one");
+ }
+ else
+ {
+ message.setStringProperty("MYHEADER", "two");
+ }
+ producer.send(message);
+ }
connection.start();
- TextMessage message2 = (TextMessage) messageConsumer.receive(5000);
- System.out.println("message = " + message2.getText());
+ try
+ {
+ System.in.read();
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
}
catch (NamingException e)
{
Added: trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -0,0 +1,75 @@
+package org.jboss.messaging.core.client;
+
+import java.io.Serializable;
+
+/**
+ * A set of connection params used by the client connection.
+ *
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public interface ConnectionParams extends Serializable
+{
+ int DEFAULT_KEEP_ALIVE_INTERVAL = 10; // in seconds
+ int DEFAULT_KEEP_ALIVE_TIMEOUT = 5; // in seconds
+ int DEFAULT_REQRES_TIMEOUT = 5; // in seconds
+ boolean DEFAULT_INVM_DISABLED = false;
+ boolean DEFAULT_SSL_ENABLED = false;
+
+ int getTimeout();
+
+ void setTimeout(int timeout);
+
+ int getKeepAliveInterval();
+
+ void setKeepAliveInterval(int keepAliveInterval);
+
+ int getKeepAliveTimeout();
+
+ void setKeepAliveTimeout(int keepAliveTimeout);
+
+ boolean isInvmDisabled();
+
+ void setInvmDisabled(boolean invmDisabled);
+
+ boolean isInvmDisabledModified();
+
+ void setInvmDisabledModified(boolean invmDisabledModified);
+
+ boolean isTcpNoDelay();
+
+ void setTcpNoDelay(boolean tcpNoDelay);
+
+ int getTcpReceiveBufferSize();
+
+ void setTcpReceiveBufferSize(int tcpReceiveBufferSize);
+
+ int getTcpSendBufferSize();
+
+ void setTcpSendBufferSize(int tcpSendBufferSize);
+
+ boolean isSSLEnabled();
+
+ void setSSLEnabled(boolean sslEnabled);
+
+ boolean isSSLEnabledModified();
+
+ void setSSLEnabledModified(boolean sslEnabledModified);
+
+ String getKeyStorePath();
+
+ void setKeyStorePath(String keyStorePath);
+
+ String getKeyStorePassword();
+
+ void setKeyStorePassword(String keyStorePassword);
+
+ String getTrustStorePath();
+
+ void setTrustStorePath(String trustStorePath);
+
+ String getTrustStorePassword();
+
+ void setTrustStorePassword(String trustStorePassword);
+
+ String getURI();
+}
Added: trunk/src/main/org/jboss/messaging/core/client/Location.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/Location.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/client/Location.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -0,0 +1,23 @@
+package org.jboss.messaging.core.client;
+
+import org.jboss.messaging.core.remoting.TransportType;
+
+import java.io.Serializable;
+
+/**
+ * The location of a JBM server and the type of transport to use. Used by clients when creating a connection factory
+ *
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public interface Location extends Serializable
+{
+ int DEFAULT_REMOTING_PORT = 5400;
+
+ String getLocation();
+
+ TransportType getTransport();
+
+ String getHost();
+
+ int getPort();
+}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -25,7 +25,8 @@
import org.jboss.messaging.core.client.ClientConnection;
import org.jboss.messaging.core.client.ClientConnectionFactory;
-import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
@@ -61,7 +62,9 @@
// Attributes -----------------------------------------------------------------------------------
- private final Configuration config;
+ private final Location location;
+
+ private final ConnectionParams connectionParams;
private final PacketDispatcher dispatcher;
@@ -82,32 +85,48 @@
// Constructors ---------------------------------------------------------------------------------
- public ClientConnectionFactoryImpl(final int serverID, final Configuration config, final boolean strictTck,
+ public ClientConnectionFactoryImpl(final int serverID, final Location location, final ConnectionParams connectionParams,
+ final boolean strictTck,
final int defaultConsumerWindowSize, final int defaultConsumerMaxRate,
final int defaultProducerWindowSize, final int defaultProducerMaxRate)
{
this.serverID = serverID;
- this.config = config;
+ this.location = location;
this.strictTck = strictTck;
this.defaultConsumerWindowSize = defaultConsumerWindowSize;
this.defaultConsumerMaxRate = defaultConsumerMaxRate;
this.defaultProducerWindowSize = defaultProducerWindowSize;
this.defaultProducerMaxRate = defaultProducerMaxRate;
this.dispatcher = new PacketDispatcherImpl(null);
+ this.connectionParams = connectionParams;
}
- public ClientConnectionFactoryImpl(final int serverID, final Configuration config)
+ public ClientConnectionFactoryImpl(final int serverID, final Location location)
{
this.serverID = serverID;
- this.config = config;
+ this.location = location;
this.strictTck = false;
this.defaultConsumerWindowSize = 1000;
this.defaultConsumerMaxRate = -1;
this.defaultProducerWindowSize = 1000;
this.defaultProducerMaxRate = -1;
this.dispatcher = new PacketDispatcherImpl(null);
+ connectionParams = new ConnectionParamsImpl();
}
+ public ClientConnectionFactoryImpl(final int serverID, final Location location, final ConnectionParams connectionParams)
+ {
+ this.serverID = serverID;
+ this.location = location;
+ this.strictTck = false;
+ this.defaultConsumerWindowSize = 1000;
+ this.defaultConsumerMaxRate = -1;
+ this.defaultProducerWindowSize = 1000;
+ this.defaultProducerMaxRate = -1;
+ this.dispatcher = new PacketDispatcherImpl(null);
+ this.connectionParams = connectionParams;
+ }
+
public ClientConnection createConnection() throws MessagingException
{
return createConnection(null, null);
@@ -120,7 +139,7 @@
RemotingConnection remotingConnection = null;
try
{
- remotingConnection = new RemotingConnectionImpl(config, dispatcher);
+ remotingConnection = new RemotingConnectionImpl(location, connectionParams, dispatcher);
remotingConnection.start();
@@ -131,12 +150,10 @@
CreateConnectionResponse response =
(CreateConnectionResponse)remotingConnection.send(0, request);
-
- ClientConnectionImpl connection =
- new ClientConnectionImpl(response.getConnectionTargetID(), serverID, strictTck, remotingConnection,
- defaultConsumerWindowSize, defaultConsumerMaxRate,
- defaultProducerWindowSize, defaultProducerMaxRate, response.getServerVersion());
- return connection;
+
+ return new ClientConnectionImpl(response.getConnectionTargetID(), serverID, strictTck, remotingConnection,
+ defaultConsumerWindowSize, defaultConsumerMaxRate,
+ defaultProducerWindowSize, defaultProducerMaxRate, response.getServerVersion());
}
catch (Throwable t)
{
@@ -167,11 +184,6 @@
}
// ClientConnectionFactory implementation ---------------------------------------------
-
- public Configuration getConfiguration()
- {
- return config;
- }
public int getConsumerWindowSize()
{
Added: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -0,0 +1,205 @@
+/*
+ * 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.core.client.impl;
+
+import org.jboss.messaging.core.client.ConnectionParams;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class ConnectionParamsImpl implements ConnectionParams
+{
+
+ protected int timeout = DEFAULT_REQRES_TIMEOUT;
+ protected int keepAliveInterval = DEFAULT_KEEP_ALIVE_INTERVAL;
+ protected int keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+ protected boolean invmDisabled = DEFAULT_INVM_DISABLED;
+ protected boolean invmDisabledModified = false;
+ protected boolean tcpNoDelay;
+ protected int tcpReceiveBufferSize = -1;
+ protected int tcpSendBufferSize = -1;
+ protected boolean sslEnabled = DEFAULT_SSL_ENABLED;
+ protected boolean sslEnabledModified = false;
+ protected String keyStorePath;
+ protected String keyStorePassword;
+ protected String trustStorePath;
+ protected String trustStorePassword;
+
+ public int getTimeout()
+ {
+ return timeout;
+ }
+
+ public void setTimeout(int timeout)
+ {
+ this.timeout = timeout;
+ }
+
+ public int getKeepAliveInterval()
+ {
+ return keepAliveInterval;
+ }
+
+ public void setKeepAliveInterval(int keepAliveInterval)
+ {
+ this.keepAliveInterval = keepAliveInterval;
+ }
+
+ public int getKeepAliveTimeout()
+ {
+ return keepAliveTimeout;
+ }
+
+ public void setKeepAliveTimeout(int keepAliveTimeout)
+ {
+ this.keepAliveTimeout = keepAliveTimeout;
+ }
+
+ public boolean isInvmDisabled()
+ {
+ return invmDisabled;
+ }
+
+ public void setInvmDisabled(boolean invmDisabled)
+ {
+ this.invmDisabled = invmDisabled;
+ }
+
+ public boolean isInvmDisabledModified()
+ {
+ return invmDisabledModified;
+ }
+
+ public void setInvmDisabledModified(boolean invmDisabledModified)
+ {
+ this.invmDisabledModified = invmDisabledModified;
+ }
+
+ public boolean isTcpNoDelay()
+ {
+ return tcpNoDelay;
+ }
+
+ public void setTcpNoDelay(boolean tcpNoDelay)
+ {
+ this.tcpNoDelay = tcpNoDelay;
+ }
+
+ public int getTcpReceiveBufferSize()
+ {
+ return tcpReceiveBufferSize;
+ }
+
+ public void setTcpReceiveBufferSize(int tcpReceiveBufferSize)
+ {
+ this.tcpReceiveBufferSize = tcpReceiveBufferSize;
+ }
+
+ public int getTcpSendBufferSize()
+ {
+ return tcpSendBufferSize;
+ }
+
+ public void setTcpSendBufferSize(int tcpSendBufferSize)
+ {
+ this.tcpSendBufferSize = tcpSendBufferSize;
+ }
+
+ public boolean isSSLEnabled()
+ {
+ return sslEnabled;
+ }
+
+ public void setSSLEnabled(boolean sslEnabled)
+ {
+ this.sslEnabled = sslEnabled;
+ }
+
+ public boolean isSSLEnabledModified()
+ {
+ return sslEnabledModified;
+ }
+
+ public void setSSLEnabledModified(boolean sslEnabledModified)
+ {
+ this.sslEnabledModified = sslEnabledModified;
+ }
+
+ 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("tcpNoDelay=").append(tcpNoDelay);
+ buff.append("&").append("tcpReceiveBufferSize=").append(tcpReceiveBufferSize);
+ buff.append("&").append("tcpSendBufferSize=").append(tcpSendBufferSize);
+ buff.append("&").append("sslEnabled=").append(sslEnabled);
+ buff.append("&").append("keyStorePath=").append(keyStorePath);
+ buff.append("&").append("trustStorePath=").append(trustStorePath);
+ return buff.toString();
+ }
+}
Added: trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/LocationImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -0,0 +1,72 @@
+/*
+ * 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.core.client.impl;
+
+import org.jboss.messaging.core.remoting.TransportType;
+import org.jboss.messaging.core.client.Location;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="ataylor at redhat.com">Andy Taylor</a>
+ */
+public class LocationImpl implements Location
+{
+
+ protected TransportType transport;
+ protected String host;
+ protected int port = DEFAULT_REMOTING_PORT;
+
+ public LocationImpl(TransportType transport)
+ {
+ assert transport == TransportType.INVM;
+ this.transport = transport;
+ }
+
+ public LocationImpl(TransportType transport, String host, int port)
+ {
+ assert (transport == TransportType.INVM) || (host != null && port > 0);
+ this.transport = transport;
+ this.host = host;
+ this.port = port;
+ }
+
+ public String getLocation()
+ {
+ return transport + (transport == TransportType.INVM?"":"://" + host + ":" + port);
+ }
+
+ public TransportType getTransport()
+ {
+ return transport;
+ }
+
+ public String getHost()
+ {
+ return host;
+ }
+
+ public int getPort()
+ {
+ return port;
+ }
+}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -25,7 +25,8 @@
import static org.jboss.messaging.core.remoting.ConnectorRegistrySingleton.REGISTRY;
import org.jboss.messaging.core.client.FailureListener;
-import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.NIOConnector;
@@ -52,8 +53,10 @@
// Attributes -----------------------------------------------------------------------------------
- private final Configuration config;
+ private final Location location;
+ private final ConnectionParams connectionParams;
+
private NIOConnector connector;
private NIOSession session;
@@ -64,15 +67,17 @@
// Constructors ---------------------------------------------------------------------------------
- public RemotingConnectionImpl(final Configuration config, final PacketDispatcher dispatcher) throws Exception
+ public RemotingConnectionImpl(final Location location, ConnectionParams connectionParams, final PacketDispatcher dispatcher) throws Exception
{
- assert config != null;
+ assert location != null;
assert dispatcher != null;
+ assert connectionParams != null;
- this.config = config;
+ this.location = location;
+ this.connectionParams = connectionParams;
this.dispatcher = dispatcher;
- log.trace(this + " created with configuration " + config);
+ log.trace(this + " created with configuration " + location);
}
// Public ---------------------------------------------------------------------------------------
@@ -83,11 +88,11 @@
{
if (log.isTraceEnabled()) { log.trace(this + " started remoting connection"); }
- connector = REGISTRY.getConnector(config, dispatcher);
+ connector = REGISTRY.getConnector(location, connectionParams, dispatcher);
session = connector.connect();
if (log.isDebugEnabled())
- log.debug("Using " + connector + " to connect to " + config);
+ log.debug("Using " + connector + " to connect to " + location);
log.trace(this + " started");
}
@@ -102,7 +107,7 @@
{
if (listener != null)
connector.removeFailureListener(listener);
- NIOConnector connectorFromRegistry = REGISTRY.removeConnector(config);
+ NIOConnector connectorFromRegistry = REGISTRY.removeConnector(location);
if (connectorFromRegistry != null)
connectorFromRegistry.disconnect();
}
@@ -218,7 +223,7 @@
} else
{
Packet response = (Packet) session.writeAndBlock(packet,
- config.getTimeout(), SECONDS);
+ connectionParams.getTimeout(), SECONDS);
return response;
}
}
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -25,6 +25,8 @@
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.server.JournalType;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
/**
*
@@ -60,7 +62,7 @@
int getPort();
- String getLocation();
+ Location getLocation();
boolean isTcpNoDelay();
@@ -107,4 +109,6 @@
boolean isCreateJournalDir();
boolean isRequireDestinations();
+
+ ConnectionParams getConnectionParams();
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -30,6 +30,10 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.core.server.JournalType;
+import org.jboss.messaging.core.client.impl.LocationImpl;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
/**
* @author <a href="mailto:ataylor at redhat.com>Andy Taylor</a>
@@ -222,9 +226,9 @@
this.port = port;
}
- public String getLocation()
+ public Location getLocation()
{
- return transport + "://" + host + "/" + port;
+ return new LocationImpl(transport, host, port);
}
public int getKeepAliveInterval()
@@ -419,5 +423,21 @@
{
return requireDestinations;
}
+
+ public ConnectionParams getConnectionParams()
+ {
+ ConnectionParams connectionParams = new ConnectionParamsImpl();
+ connectionParams.setInvmDisabled(invmDisabled);
+ connectionParams.setInvmDisabledModified(invmDisabledModified);
+ connectionParams.setKeepAliveInterval(keepAliveInterval);
+ connectionParams.setKeepAliveTimeout(keepAliveTimeout);
+ connectionParams.setSSLEnabled(sslEnabled);
+ connectionParams.setSSLEnabledModified(sslEnabledModified);
+ connectionParams.setTcpNoDelay(tcpNoDelay);
+ connectionParams.setTcpReceiveBufferSize(tcpReceiveBufferSize);
+ connectionParams.setTcpSendBufferSize(tcpSendBufferSize);
+ connectionParams.setTimeout(timeout);
+ return connectionParams;
+ }
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -116,7 +116,8 @@
int producerWindowSize, int producerMaxRate)
{
return new ClientConnectionFactoryImpl(messagingServer.getConfiguration().getMessagingServerID(),
- messagingServer.getConfiguration(),
+ messagingServer.getConfiguration().getLocation(),
+ messagingServer.getConfiguration().getConnectionParams(),
messagingServer.getConfiguration().isStrictTck() || strictTck,
consumerWindowSize, consumerMaxRate,
producerWindowSize, producerMaxRate);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/remoting/ConnectorRegistry.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -9,6 +9,8 @@
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.remoting.impl.invm.INVMConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
/**
@@ -35,15 +37,15 @@
* @return <code>true</code> if this Configuration has not already been
* registered, <code>false</code> else
*/
- boolean register(Configuration config, PacketDispatcher serverDispatcher);
+ boolean register(Location location, PacketDispatcher serverDispatcher);
/**
* @return <code>true</code> if this Configuration was registered,
* <code>false</code> else
*/
- boolean unregister(Configuration config);
+ boolean unregister(Location location);
- NIOConnector getConnector(Configuration config, PacketDispatcher dispatcher);
+ NIOConnector getConnector(Location location, ConnectionParams connectionParams, PacketDispatcher dispatcher);
/**
* Decrement the number of references on the NIOConnector corresponding to
@@ -59,11 +61,11 @@
* @throws IllegalStateException
* if no NIOConnector were created for the given Configuration
*/
- NIOConnector removeConnector(Configuration config);
+ NIOConnector removeConnector(Location location);
int getRegisteredConfigurationSize();
- int getConnectorCount(Configuration config);
+ int getConnectorCount(Location location);
void clear();
}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -13,7 +13,6 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.ConnectorRegistry;
import org.jboss.messaging.core.remoting.NIOConnector;
@@ -21,6 +20,8 @@
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;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -49,11 +50,11 @@
* @return <code>true</code> if this Configuration has not already been registered,
* <code>false</code> else
*/
- public boolean register(Configuration config, PacketDispatcher serverDispatcher)
+ public boolean register(Location location, PacketDispatcher serverDispatcher)
{
- assert config != null;
+ assert location != null;
assert serverDispatcher != null;
- String key = config.getLocation();
+ String key = location.getLocation();
PacketDispatcher previousDispatcher = localDispatchers.get(key);
@@ -70,9 +71,9 @@
* @return <code>true</code> if this Configuration was registered,
* <code>false</code> else
*/
- public boolean unregister(Configuration config)
+ public boolean unregister(Location location)
{
- PacketDispatcher dispatcher = localDispatchers.remove(config.getLocation());
+ PacketDispatcher dispatcher = localDispatchers.remove(location.getLocation());
if(log.isDebugEnabled())
{
@@ -82,10 +83,10 @@
return (dispatcher != null);
}
- public synchronized NIOConnector getConnector(Configuration config, PacketDispatcher dispatcher)
+ public synchronized NIOConnector getConnector(Location location, ConnectionParams connectionParams, PacketDispatcher dispatcher)
{
- assert config != null;
- String key = config.getLocation();
+ assert location != null;
+ String key = location.getLocation();
if (connectors.containsKey(key))
{
@@ -117,11 +118,11 @@
NIOConnector connector = null;
- TransportType transport = config.getTransport();
+ TransportType transport = location.getTransport();
if (transport == TCP)
{
- connector = new MinaConnector(config, dispatcher);
+ connector = new MinaConnector(location, connectionParams, dispatcher);
}
if (connector == null)
@@ -132,7 +133,7 @@
if (log.isDebugEnabled())
log.debug("Created " + connector + " to connect to "
- + config);
+ + location);
NIOConnectorHolder holder = new NIOConnectorHolder(connector);
connectors.put(key, holder);
@@ -153,10 +154,10 @@
* @throws IllegalStateException
* if no NIOConnector were created for the given Configuration
*/
- public synchronized NIOConnector removeConnector(Configuration config)
+ public synchronized NIOConnector removeConnector(Location location)
{
- assert config != null;
- String key = config.getLocation();
+ assert location != null;
+ String key = location.getLocation();
NIOConnectorHolder holder = connectors.get(key);
if (holder == null)
@@ -187,9 +188,9 @@
return registeredConfigs.size();
}
- public int getConnectorCount(Configuration remotingConfig)
+ public int getConnectorCount(Location location)
{
- String key = remotingConfig.getLocation();
+ String key = location.getLocation();
NIOConnectorHolder holder = connectors.get(key);
if (holder == null)
{
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -31,7 +31,9 @@
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.jboss.messaging.core.client.FailureListener;
-import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.client.Location;
+import org.jboss.messaging.core.client.ConnectionParams;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
@@ -56,8 +58,10 @@
// Attributes ----------------------------------------------------
- private Configuration configuration;
+ private Location location;
+ private ConnectionParams connectionParams;
+
private transient NioSocketConnector connector;
private PacketDispatcher dispatcher;
@@ -76,34 +80,46 @@
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
+ public MinaConnector(Location location, PacketDispatcher dispatcher)
+ {
+ this(location, new ConnectionParamsImpl(), dispatcher, new ClientKeepAliveFactory());
+ }
- public MinaConnector(Configuration configuration, PacketDispatcher dispatcher)
+ public MinaConnector(Location location, ConnectionParams connectionParams, PacketDispatcher dispatcher)
{
- this(configuration, dispatcher, new ClientKeepAliveFactory());
+ this(location, connectionParams, dispatcher, new ClientKeepAliveFactory());
}
- public MinaConnector(Configuration configuration, PacketDispatcher dispatcher,
+ public MinaConnector(Location location, PacketDispatcher dispatcher,
KeepAliveFactory keepAliveFactory)
{
- assert configuration != null;
+ this(location, new ConnectionParamsImpl(), dispatcher, keepAliveFactory);
+ }
+
+ public MinaConnector(Location location, ConnectionParams connectionParams, PacketDispatcher dispatcher,
+ KeepAliveFactory keepAliveFactory)
+ {
+ assert location != null;
assert dispatcher != null;
assert keepAliveFactory != null;
+ assert connectionParams != null;
- this.configuration = configuration;
+ this.location = location;
+ this.connectionParams = connectionParams;
this.dispatcher = dispatcher;
this.connector = new NioSocketConnector();
DefaultIoFilterChainBuilder filterChain = connector.getFilterChain();
addMDCFilter(filterChain);
- if (configuration.isSSLEnabled())
+ if (connectionParams.isSSLEnabled())
{
try
{
- addSSLFilter(filterChain, true, configuration.getKeyStorePath(), configuration.getKeyStorePassword(), null, null);
+ addSSLFilter(filterChain, true, connectionParams.getKeyStorePath(), connectionParams.getKeyStorePassword(), null, null);
} catch (Exception e)
{
- IllegalStateException ise = new IllegalStateException("Unable to create MinaConnector for " + configuration);
+ IllegalStateException ise = new IllegalStateException("Unable to create MinaConnector for " + location);
ise.initCause(e);
throw ise;
}
@@ -111,15 +127,15 @@
addCodecFilter(filterChain);
addLoggingFilter(filterChain);
blockingScheduler = addBlockingRequestResponseFilter(filterChain);
- addKeepAliveFilter(filterChain, keepAliveFactory, configuration.getKeepAliveInterval(),
- configuration.getKeepAliveTimeout(), this);
- connector.getSessionConfig().setTcpNoDelay(configuration.isTcpNoDelay());
- int receiveBufferSize = configuration.getTcpReceiveBufferSize();
+ addKeepAliveFilter(filterChain, keepAliveFactory, connectionParams.getKeepAliveInterval(),
+ connectionParams.getKeepAliveTimeout(), this);
+ connector.getSessionConfig().setTcpNoDelay(connectionParams.isTcpNoDelay());
+ int receiveBufferSize = connectionParams.getTcpReceiveBufferSize();
if (receiveBufferSize != -1)
{
connector.getSessionConfig().setReceiveBufferSize(receiveBufferSize);
}
- int sendBufferSize = configuration.getTcpSendBufferSize();
+ int sendBufferSize = connectionParams.getTcpSendBufferSize();
if (sendBufferSize != -1)
{
connector.getSessionConfig().setSendBufferSize(sendBufferSize);
@@ -139,7 +155,7 @@
threadPool = Executors.newCachedThreadPool();
connector.setHandler(new MinaHandler(dispatcher, threadPool, this, false));
- InetSocketAddress address = new InetSocketAddress(configuration.getHost(), configuration.getPort());
+ InetSocketAddress address = new InetSocketAddress(location.getHost(), location.getPort());
ConnectFuture future = connector.connect(address);
connector.setDefaultRemoteAddress(address);
ioListener = new IoServiceListenerAdapter();
@@ -219,7 +235,7 @@
public String getServerURI()
{
- return configuration.getURI();
+ return location.getLocation() + connectionParams.getURI();
}
// FailureNotifier implementation -------------------------------
@@ -237,7 +253,7 @@
@Override
public String toString()
{
- return "MinaConnector@" + System.identityHashCode(this) + "[configuration=" + configuration + "]";
+ return "MinaConnector@" + System.identityHashCode(this) + "[configuration=" + location + "]";
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -175,7 +175,7 @@
if (log.isDebugEnabled())
log.debug("invm optimization for remoting is " + (disableInvm ? "disabled" : "enabled"));
if (!disableInvm)
- REGISTRY.register(config, dispatcher);
+ REGISTRY.register(config.getLocation(), dispatcher);
started = true;
}
@@ -193,7 +193,7 @@
threadPool.shutdown();
}
- REGISTRY.unregister(config);
+ REGISTRY.unregister(config.getLocation());
started = false;
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -9,6 +9,7 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.impl.MessageImpl;
@@ -54,7 +55,7 @@
public void testINVMCoreClient() throws Exception
{
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, invmServer.getConfiguration());
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(INVM));
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/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -30,6 +30,7 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
@@ -164,7 +165,7 @@
server = new MessagingServerImpl(config);
server.start();
- cf = new ClientConnectionFactoryImpl(0, config);
+ cf = new ClientConnectionFactoryImpl(0, new LocationImpl(TCP,"localhost", ConfigurationImpl.DEFAULT_REMOTING_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-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -29,6 +29,7 @@
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
@@ -103,7 +104,7 @@
server = new MessagingServerImpl(config);
server.start();
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config);
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_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-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -32,6 +32,7 @@
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
@@ -79,7 +80,7 @@
// FIXME there should be another way to get a meaningful Version on the
// client side...
MessagingServer server = new MessagingServerImpl();
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config);
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT));
ClientConnection conn = cf.createConnection();
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
ClientProducer producer = session.createProducer(QUEUE);
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-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -24,19 +24,13 @@
import static org.jboss.messaging.core.remoting.TransportType.TCP;
import static org.jboss.messaging.tests.integration.core.remoting.impl.ClientExitTest.QUEUE;
-import org.jboss.messaging.core.client.ClientConnection;
-import org.jboss.messaging.core.client.ClientConnectionFactory;
-import org.jboss.messaging.core.client.ClientConsumer;
-import org.jboss.messaging.core.client.ClientProducer;
-import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.*;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
/**
* Code to be run in an external VM, via main().
@@ -60,12 +54,8 @@
{
try
{
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
- "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
+ Location config = new LocationImpl(TCP, "localhost", ConfigurationImpl.DEFAULT_REMOTING_PORT);
- // FIXME there should be another way to get a meaningful Version on the
- // client side...
- MessagingServer server = new MessagingServerImpl();
ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config);
ClientConnection conn = cf.createConnection(null, null);
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
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-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -15,6 +15,7 @@
import static org.jboss.messaging.core.remoting.TransportType.INVM;
import org.jboss.messaging.core.client.*;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.message.impl.MessageImpl;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.jms.client.JBossTextMessage;
@@ -52,7 +53,7 @@
DummyInterceptor interceptorA = null;
DummyInterceptorB interceptorB = null;
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, server.getConfiguration());
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(INVM));
ClientConnection conn = null;
try
{
@@ -159,7 +160,7 @@
interceptor.sendException=false;
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, server.getConfiguration());
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(INVM));
conn = cf.createConnection();
conn.start();
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ClientKeepAliveTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
@@ -95,7 +96,7 @@
};
service.addFailureListener(listener);
- MinaConnector connector = new MinaConnector(service.getConfiguration(), new PacketDispatcherImpl(null), factory);
+ MinaConnector connector = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), new PacketDispatcherImpl(null), factory);
connector.connect();
boolean firedKeepAliveNotification = latch.await(TestSupport.KEEP_ALIVE_INTERVAL
@@ -126,7 +127,7 @@
};
service.addFailureListener(listener);
- MinaConnector connector = new MinaConnector(service.getConfiguration(), new PacketDispatcherImpl(null), factory);
+ MinaConnector connector = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), new PacketDispatcherImpl(null), factory);
NIOSession session = connector.connect();
long clientSessionID = session.getID();
@@ -171,7 +172,7 @@
try
{
- MinaConnector connector = new MinaConnector(service.getConfiguration(),
+ MinaConnector connector = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT),
new PacketDispatcherImpl(null), factory);
NIOSession session = connector.connect();
@@ -230,10 +231,8 @@
};
service.addFailureListener(listener);
- MinaConnector connectorNotResponding = new MinaConnector(service
- .getConfiguration(), new PacketDispatcherImpl(null), notRespondingfactory);
- MinaConnector connectorResponding = new MinaConnector(service
- .getConfiguration(), new PacketDispatcherImpl(null), respondingfactory);
+ MinaConnector connectorNotResponding = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), new PacketDispatcherImpl(null), notRespondingfactory);
+ MinaConnector connectorResponding = new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), new PacketDispatcherImpl(null), respondingfactory);
NIOSession sessionNotResponding = connectorNotResponding.connect();
long clientSessionIDNotResponding = sessionNotResponding.getID();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -15,6 +15,7 @@
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;
+import org.jboss.messaging.core.client.impl.LocationImpl;
public class MinaServiceTest extends TestCase
{
@@ -42,7 +43,7 @@
public void testMinaConnector_Failure() throws Exception
{
- NIOConnector connector = new MinaConnector(ConfigurationHelper.newConfiguration(
+ NIOConnector connector = new MinaConnector(new LocationImpl(
TCP, "localhost", 9000), new PacketDispatcherImpl(null));
try
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaSessionTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -18,6 +18,7 @@
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
+import org.jboss.messaging.core.client.impl.LocationImpl;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -61,7 +62,7 @@
@Override
protected NIOConnector createNIOConnector(PacketDispatcher dispatcher)
{
- return new MinaConnector(createRemotingConfiguration(), dispatcher);
+ return new MinaConnector(new LocationImpl(TCP, "localhost", TestSupport.PORT), dispatcher);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ServerKeepAliveTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -86,7 +86,7 @@
service.start();
MinaConnector connector = new MinaConnector(service
- .getConfiguration(), new PacketDispatcherImpl(null));
+ .getConfiguration().getLocation(), service.getConfiguration().getConnectionParams(), new PacketDispatcherImpl(null));
final long[] sessionIDNotResponding = new long[1];
final CountDownLatch latch = new CountDownLatch(1);
@@ -141,7 +141,7 @@
service.start();
MinaConnector connector = new MinaConnector(service
- .getConfiguration(), new PacketDispatcherImpl(null));
+ .getConfiguration().getLocation(), new PacketDispatcherImpl(null));
final long[] sessionIDNotResponding = new long[1];
final CountDownLatch latch = new CountDownLatch(1);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSL.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -25,17 +25,12 @@
import java.util.Arrays;
-import org.jboss.messaging.core.client.ClientConnection;
-import org.jboss.messaging.core.client.ClientConnectionFactory;
-import org.jboss.messaging.core.client.ClientProducer;
-import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.*;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
-import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.jms.client.JBossTextMessage;
/**
@@ -70,16 +65,13 @@
String keyStorePath = args[1];
String keyStorePassword = args[2];
- ConfigurationImpl config = ConfigurationHelper.newConfiguration(TCP,
- "localhost", CoreClientOverSSLTest.SSL_PORT);
- config.setSSLEnabled(sslEnabled);
- config.setKeyStorePath(keyStorePath);
- config.setKeyStorePassword(keyStorePassword);
+ Location config = new LocationImpl(TCP, "localhost", CoreClientOverSSLTest.SSL_PORT);
+ ConnectionParams connectionParams = new ConnectionParamsImpl();
+ connectionParams.setSSLEnabled(sslEnabled);
+ connectionParams.setKeyStorePath(keyStorePath);
+ connectionParams.setKeyStorePassword(keyStorePassword);
- // FIXME there should be another way to get a meaningful Version on the
- // client side...
- MessagingServer server = new MessagingServerImpl();
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config);
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config, connectionParams);
ClientConnection conn = cf.createConnection(null, null);
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
ClientProducer producer = session.createProducer(CoreClientOverSSLTest.QUEUE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -129,7 +129,7 @@
server = new MessagingServerImpl(config);
server.start();
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config);
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, config.getLocation());
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/stress/core/remoting/mina/PacketStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -58,7 +58,7 @@
Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
service = new MinaService(config);
service.start();
- connector = new MinaConnector(config, new PacketDispatcherImpl(null));
+ connector = new MinaConnector(config.getLocation(), new PacketDispatcherImpl(null));
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/ConnectorRegistryTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -18,6 +18,7 @@
import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
import org.jboss.messaging.core.remoting.impl.ConnectorRegistryImpl;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
+import org.jboss.messaging.core.client.impl.ConnectionParamsImpl;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -59,14 +60,14 @@
{
Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
- assertTrue(registry.register(config, dispatcher));
- assertFalse(registry.register(config, dispatcher));
+ assertTrue(registry.register(config.getLocation(), dispatcher));
+ assertFalse(registry.register(config.getLocation(), dispatcher));
- assertTrue(registry.unregister(config));
- assertFalse(registry.unregister(config));
+ assertTrue(registry.unregister(config.getLocation()));
+ assertFalse(registry.unregister(config.getLocation()));
- assertTrue(registry.register(config, dispatcher));
- assertTrue(registry.unregister(config));
+ assertTrue(registry.register(config.getLocation(), dispatcher));
+ assertTrue(registry.unregister(config.getLocation()));
}
public void testRegistrationForTwoConfigurations() throws Exception
@@ -76,11 +77,11 @@
PacketDispatcher dispatcher_1 = new PacketDispatcherImpl(null);
PacketDispatcher dispatcher_2 = new PacketDispatcherImpl(null);
- assertTrue(registry.register(config_1, dispatcher_1));
- assertTrue(registry.register(config_2, dispatcher_2));
+ assertTrue(registry.register(config_1.getLocation(), dispatcher_1));
+ assertTrue(registry.register(config_2.getLocation(), dispatcher_2));
- assertTrue(registry.unregister(config_1));
- assertTrue(registry.unregister(config_2));
+ assertTrue(registry.unregister(config_1.getLocation()));
+ assertTrue(registry.unregister(config_2.getLocation()));
}
public void testINVMConnectorFromTCPConfiguration() throws Exception
@@ -88,15 +89,15 @@
Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
// config is registered -> client and server are in the same vm
- assertTrue(registry.register(config, dispatcher));
+ assertTrue(registry.register(config.getLocation(), dispatcher));
- NIOConnector connector = registry.getConnector(config, dispatcher);
+ NIOConnector connector = registry.getConnector(config.getLocation(), new ConnectionParamsImpl(), dispatcher);
assertTrue(connector.getServerURI().startsWith(INVM.toString()));
- assertTrue(registry.unregister(config));
+ assertTrue(registry.unregister(config.getLocation()));
- assertNotNull(registry.removeConnector(config));
+ assertNotNull(registry.removeConnector(config.getLocation()));
}
@@ -106,38 +107,38 @@
// config is not registered -> client and server are not in the same vm
- NIOConnector connector = registry.getConnector(config, dispatcher);
+ NIOConnector connector = registry.getConnector(config.getLocation(), new ConnectionParamsImpl(), dispatcher);
assertNotNull(connector);
assertEquals(config.getURI(), connector.getServerURI());
- assertNotNull(registry.removeConnector(config));
+ assertNotNull(registry.removeConnector(config.getLocation()));
}
public void testConnectorCount() throws Exception
{
Configuration config = ConfigurationHelper.newConfiguration(TCP, "localhost", PORT);
- assertEquals(0, registry.getConnectorCount(config));
+ assertEquals(0, registry.getConnectorCount(config.getLocation()));
- NIOConnector connector1 = registry.getConnector(config, dispatcher);
- assertEquals(1, registry.getConnectorCount(config));
+ NIOConnector connector1 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(1, registry.getConnectorCount(config.getLocation()));
- NIOConnector connector2 = registry.getConnector(config, dispatcher);
- assertEquals(2, registry.getConnectorCount(config));
+ NIOConnector connector2 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(2, registry.getConnectorCount(config.getLocation()));
assertSame(connector1, connector2);
- assertNull(registry.removeConnector(config));
- assertEquals(1, registry.getConnectorCount(config));
+ assertNull(registry.removeConnector(config.getLocation()));
+ assertEquals(1, registry.getConnectorCount(config.getLocation()));
- NIOConnector connector3 = registry.getConnector(config, dispatcher);
- assertEquals(2, registry.getConnectorCount(config));
+ NIOConnector connector3 = registry.getConnector(config.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(2, registry.getConnectorCount(config.getLocation()));
assertSame(connector1, connector3);
- assertNull(registry.removeConnector(config));
- assertNotNull(registry.removeConnector(config));
- assertEquals(0, registry.getConnectorCount(config));
+ assertNull(registry.removeConnector(config.getLocation()));
+ assertNotNull(registry.removeConnector(config.getLocation()));
+ assertEquals(0, registry.getConnectorCount(config.getLocation()));
}
public void testConnectorCount_2() throws Exception
@@ -147,19 +148,19 @@
assertNotSame(config1, config2);
- assertEquals(0, registry.getConnectorCount(config1));
- assertEquals(0, registry.getConnectorCount(config2));
+ assertEquals(0, registry.getConnectorCount(config1.getLocation()));
+ assertEquals(0, registry.getConnectorCount(config2.getLocation()));
- NIOConnector connector1 = registry.getConnector(config1, dispatcher);
- assertEquals(1, registry.getConnectorCount(config1));
+ NIOConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(1, registry.getConnectorCount(config1.getLocation()));
- NIOConnector connector2 = registry.getConnector(config2, dispatcher);
- assertEquals(1, registry.getConnectorCount(config2));
+ NIOConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(1, registry.getConnectorCount(config2.getLocation()));
assertNotSame(connector1, connector2);
- assertNotNull(registry.removeConnector(config1));
- assertNotNull(registry.removeConnector(config2));
+ assertNotNull(registry.removeConnector(config1.getLocation()));
+ assertNotNull(registry.removeConnector(config2.getLocation()));
}
/**
@@ -173,16 +174,16 @@
assertNotSame(config1, config2);
- NIOConnector connector1 = registry.getConnector(config1, dispatcher);
- assertEquals(1, registry.getConnectorCount(config1));
+ NIOConnector connector1 = registry.getConnector(config1.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(1, registry.getConnectorCount(config1.getLocation()));
- NIOConnector connector2 = registry.getConnector(config2, dispatcher);
- assertEquals(2, registry.getConnectorCount(config2));
+ NIOConnector connector2 = registry.getConnector(config2.getLocation(), new ConnectionParamsImpl(), dispatcher);
+ assertEquals(2, registry.getConnectorCount(config2.getLocation()));
assertSame(connector1, connector2);
- assertNull(registry.removeConnector(config1));
- assertNotNull(registry.removeConnector(config2));
+ assertNull(registry.removeConnector(config1.getLocation()));
+ assertNotNull(registry.removeConnector(config2.getLocation()));
}
// Package protected ---------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/network/ClientNetworkFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/network/ClientNetworkFailureTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/network/ClientNetworkFailureTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -32,10 +32,12 @@
import org.jboss.messaging.core.client.ClientConnectionFactory;
import org.jboss.messaging.core.client.ClientConnection;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.messaging.core.remoting.TransportType;
+import static org.jboss.messaging.core.remoting.TransportType.TCP;
import org.jboss.messaging.core.server.impl.MessagingServerImpl;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.ConnectionManager;
@@ -104,7 +106,7 @@
public void testServerResourcesCleanUpWhenClientCommThrowsException()
throws Exception
{
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, server.getConfiguration());
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(TCP, "localhost", 5400));
ClientConnection conn = cf.createConnection();
@@ -144,7 +146,7 @@
public void testServerResourcesCleanUpWhenClientCommDropsPacket()
throws Exception
{
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, server.getConfiguration());
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(TCP, "localhost", 5400));
ClientConnection conn = cf.createConnection();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java 2008-04-17 20:52:08 UTC (rev 4078)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/ConnectionManagerTest.java 2008-04-18 09:30:15 UTC (rev 4079)
@@ -29,6 +29,7 @@
import org.jboss.messaging.core.client.ClientConnectionFactory;
import org.jboss.messaging.core.client.ClientConnection;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import junit.framework.TestCase;
/**
@@ -77,7 +78,7 @@
{
assertActiveConnectionsOnTheServer(0);
- ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, server.getConfiguration());
+ ClientConnectionFactory cf = new ClientConnectionFactoryImpl(0, new LocationImpl(INVM));
ClientConnection conn_1 = cf.createConnection();
More information about the jboss-cvs-commits
mailing list