[jboss-cvs] JBoss Messaging SVN: r4476 - in trunk: src/main/org/jboss/messaging/core/client/impl and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jun 15 10:05:29 EDT 2008
Author: timfox
Date: 2008-06-15 10:05:29 -0400 (Sun, 15 Jun 2008)
New Revision: 4476
Modified:
trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.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/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java
Log:
Moved URI from connectionparams - not needed
Modified: trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-06-15 13:32:33 UTC (rev 4475)
+++ trunk/src/main/org/jboss/messaging/core/client/ConnectionParams.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -79,6 +79,4 @@
String getTrustStorePassword();
void setTrustStorePassword(String trustStorePassword);
-
- String getURI();
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-06-15 13:32:33 UTC (rev 4475)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionParamsImpl.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -216,28 +216,7 @@
{
this.trustStorePassword = trustStorePassword;
}
-
- public String getURI()
- {
- StringBuffer buff = new StringBuffer();
- buff.append("?").append("callTimeout=").append(callTimeout);
- buff.append("&").append("pingInterval=").append(pingInterval);
- buff.append("&").append("pingTimeout=").append(pingTimeout);
- buff.append("&").append("inVMDisabled=").append(inVMOptimisationEnabled);
- 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();
- }
-
- public String toString()
- {
- return "ConnectionParamsImpl:" + System.identityHashCode(this) + ":" + getURI();
- }
-
+
public boolean equals(Object other)
{
if (other instanceof ConnectionParams == false)
Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java 2008-06-15 13:32:33 UTC (rev 4475)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingConnector.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -6,10 +6,12 @@
*/
package org.jboss.messaging.core.remoting;
+import java.io.IOException;
+
+import org.jboss.messaging.core.client.ConnectionParams;
+import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.client.RemotingSessionListener;
-import java.io.IOException;
-
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
@@ -26,7 +28,9 @@
void removeSessionListener(RemotingSessionListener listener);
- String getServerURI();
-
PacketDispatcher getDispatcher();
+
+ Location getLocation();
+
+ ConnectionParams getConnectionParams();
}
\ 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-06-15 13:32:33 UTC (rev 4475)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ConnectorRegistryImpl.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -127,7 +127,7 @@
else if (transport == INVM)
{
PacketDispatcher localDispatcher = localDispatchers.get(key);
- connector = new INVMConnector(idCounter.getAndIncrement(), new PacketDispatcherImpl(null), localDispatcher);
+ connector = new INVMConnector(location, connectionParams, idCounter.getAndIncrement(), new PacketDispatcherImpl(null), localDispatcher);
}
if (connector == null)
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-06-15 13:32:33 UTC (rev 4475)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMConnector.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -6,14 +6,16 @@
*/
package org.jboss.messaging.core.remoting.impl.invm;
+import java.io.IOException;
+
+import org.jboss.messaging.core.client.ConnectionParams;
+import org.jboss.messaging.core.client.Location;
import org.jboss.messaging.core.client.RemotingSessionListener;
+import org.jboss.messaging.core.client.impl.LocationImpl;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.RemotingConnector;
import org.jboss.messaging.core.remoting.RemotingSession;
-import static org.jboss.messaging.core.remoting.TransportType.INVM;
-import java.io.IOException;
-
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*
@@ -32,16 +34,22 @@
private final PacketDispatcher clientDispatcher;
private final PacketDispatcher serverDispatcher;
+
+ private final Location location;
+ private final ConnectionParams connectionParams;
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public INVMConnector(final long id, final PacketDispatcher clientDispatcher, final PacketDispatcher serverDispatcher)
+ public INVMConnector(final Location location, final ConnectionParams params,
+ final long id, final PacketDispatcher clientDispatcher, final PacketDispatcher serverDispatcher)
{
this.id = id;
this.clientDispatcher = clientDispatcher;
this.serverDispatcher = serverDispatcher;
+ this.location = location;
+ this.connectionParams = params;
}
// Public --------------------------------------------------------
@@ -60,7 +68,8 @@
if (session == null)
{
return false;
- } else
+ }
+ else
{
boolean closed = session.close();
session = null;
@@ -68,10 +77,15 @@
}
}
- public String getServerURI()
+ public Location getLocation()
{
- return INVM + "://localhost";
+ return location;
}
+
+ public ConnectionParams getConnectionParams()
+ {
+ return connectionParams;
+ }
public PacketDispatcher getDispatcher()
{
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-06-15 13:32:33 UTC (rev 4475)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -268,10 +268,15 @@
}
}
- public String getServerURI()
+ public Location getLocation()
{
- return location.getLocation() + connectionParams.getURI();
+ return location;
}
+
+ public ConnectionParams getConnectionParams()
+ {
+ return connectionParams;
+ }
public PacketDispatcher getDispatcher()
{
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-06-15 13:32:33 UTC (rev 4475)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaServiceTest.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -31,7 +31,7 @@
public void testINVMConnector_OK() throws Exception
{
- RemotingConnector connector = new INVMConnector(1, new PacketDispatcherImpl(null), invmService.getDispatcher());
+ RemotingConnector connector = new INVMConnector(null, null, 1, new PacketDispatcherImpl(null), invmService.getDispatcher());
RemotingSession session = connector.connect();
assertTrue(session.isConnected());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java 2008-06-15 13:32:33 UTC (rev 4475)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ConnectionParamsImplTest.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -53,26 +53,7 @@
assertEquals(null, cp.getTrustStorePath());
assertEquals(null, cp.getTrustStorePassword());
}
-
- public void testURI()
- {
- ConnectionParams cp = new ConnectionParamsImpl();
- StringBuffer buff = new StringBuffer();
- buff.append("?").append("callTimeout=").append(ConnectionParamsImpl.DEFAULT_CALL_TIMEOUT);
- buff.append("&").append("pingInterval=").append(ConnectionParamsImpl.DEFAULT_PING_INTERVAL);
- buff.append("&").append("pingTimeout=").append(ConnectionParamsImpl.DEFAULT_PING_TIMEOUT);
- buff.append("&").append("inVMDisabled=").append(ConnectionParamsImpl.DEFAULT_INVM_OPTIMISATION_ENABLED);
- buff.append("&").append("tcpNoDelay=").append(ConnectionParamsImpl.DEFAULT_TCP_NODELAY);
- buff.append("&").append("tcpReceiveBufferSize=").append(ConnectionParamsImpl.DEFAULT_TCP_RECEIVE_BUFFER_SIZE);
- buff.append("&").append("tcpSendBufferSize=").append(ConnectionParamsImpl.DEFAULT_TCP_SEND_BUFFER_SIZE);
- buff.append("&").append("sslEnabled=").append(ConnectionParamsImpl.DEFAULT_SSL_ENABLED);
- buff.append("&").append("keyStorePath=").append((String)null);
- buff.append("&").append("trustStorePath=").append((String)null);
-
- assertEquals(buff.toString(), cp.getURI());
- }
-
public void testSetAndGetAttributes()
{
for (int j = 0; j < 100; j++)
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java 2008-06-15 13:32:33 UTC (rev 4475)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/ConnectorRegistryImplTest.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -92,7 +92,7 @@
RemotingConnector connector = registry.getConnector(config.getLocation(), new ConnectionParamsImpl());
- assertTrue(connector.getServerURI().startsWith(INVM.toString()));
+ assertTrue(connector.getLocation().getTransport().equals(TransportType.INVM));
assertTrue(registry.unregister(config.getLocation()));
@@ -109,8 +109,8 @@
assertNotNull(connector);
- assertEquals(config.getTransport() + "://" + config.getHost() +
- ":" + config.getPort() + config.getConnectionParams().getURI(), connector.getServerURI());
+ assertEquals(config.getLocation(), connector.getLocation());
+ assertEquals(config.getConnectionParams(), connector.getConnectionParams());
assertNotNull(registry.removeConnector(config.getLocation()));
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java 2008-06-15 13:32:33 UTC (rev 4475)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/invm/INVMSessionTest.java 2008-06-15 14:05:29 UTC (rev 4476)
@@ -40,7 +40,7 @@
@Override
protected RemotingConnector createNIOConnector(PacketDispatcher dispatcher)
{
- return new INVMConnector(1, dispatcher, serverDispatcher);
+ return new INVMConnector(null, null, 1, dispatcher, serverDispatcher);
}
@Override
More information about the jboss-cvs-commits
mailing list