[jboss-cvs] JBoss Messaging SVN: r4166 - in trunk: src/main/org/jboss/messaging/core/client/impl and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 9 06:46:17 EDT 2008
Author: timfox
Date: 2008-05-09 06:46:16 -0400 (Fri, 09 May 2008)
New Revision: 4166
Added:
trunk/src/main/org/jboss/messaging/core/remoting/PacketReturner.java
Removed:
trunk/src/main/org/jboss/messaging/core/remoting/PacketSender.java
Modified:
trunk/src/etc/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.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/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java
trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java
trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
trunk/src/main/org/jboss/messaging/core/server/ServerConnection.java
trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java
trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/PacketDispatcherTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java
Log:
Changed security store to take SimpleString and added option to disable security and security optmisations
Modified: trunk/src/etc/jbm-configuration.xml
===================================================================
--- trunk/src/etc/jbm-configuration.xml 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/etc/jbm-configuration.xml 2008-05-09 10:46:16 UTC (rev 4166)
@@ -73,6 +73,8 @@
<journal-task-period>5000</journal-task-period>
+ <security-enabled>true</security-enabled>
+
</configuration>
</deployment>
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -3,7 +3,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
@@ -33,7 +33,7 @@
return consumerID;
}
- public void handle(final Packet packet, final PacketSender sender)
+ public void handle(final Packet packet, final PacketReturner sender)
{
try
{
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -3,7 +3,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerReceiveTokensMessage;
@@ -34,7 +34,7 @@
return producerID;
}
- public void handle(final Packet packet, final PacketSender sender)
+ public void handle(final Packet packet, final PacketReturner sender)
{
try
{
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -33,7 +33,7 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
/**
@@ -255,7 +255,7 @@
return id;
}
- public synchronized void handle(final Packet packet, final PacketSender sender)
+ public synchronized void handle(final Packet packet, final PacketReturner sender)
{
this.response = packet;
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -72,6 +72,8 @@
int getKeepAliveTimeout();
int getTimeout();
+
+ boolean isSecurityEnabled();
String getKeyStorePath();
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -83,6 +83,8 @@
protected int journalMinFiles;
protected long journalTaskPeriod;
+
+ protected boolean securityEnabled = true;
// remoting config
@@ -384,6 +386,11 @@
return requireDestinations;
}
+ public boolean isSecurityEnabled()
+ {
+ return securityEnabled;
+ }
+
public ConnectionParams getConnectionParams()
{
ConnectionParams connectionParams = new ConnectionParamsImpl();
@@ -399,5 +406,7 @@
connectionParams.setTimeout(timeout);
return connectionParams;
}
+
+
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -127,7 +127,8 @@
this.journalTaskPeriod = getLong(e, "journal-task-period", 5000L);
-
+ this.securityEnabled = getBoolean(e, "security-enabled", true);
+
NodeList defaultInterceptors = e.getElementsByTagName("default-interceptors-config");
ArrayList<String> interceptorList = new ArrayList<String>();
Modified: trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -22,7 +22,7 @@
void setListener(PacketHandlerRegistrationListener listener);
- void dispatch(Packet packet, PacketSender sender) throws Exception;
+ void dispatch(Packet packet, PacketReturner sender) throws Exception;
/** Call filters on a package */
void callFilters(Packet packet) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/PacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -25,5 +25,5 @@
{
long getID();
- void handle(Packet packet, PacketSender sender);
+ void handle(Packet packet, PacketReturner sender);
}
Copied: trunk/src/main/org/jboss/messaging/core/remoting/PacketReturner.java (from rev 4163, trunk/src/main/org/jboss/messaging/core/remoting/PacketSender.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/PacketReturner.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/PacketReturner.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -0,0 +1,23 @@
+/*
+ * 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 PacketReturner
+{
+ void send(Packet packet) throws Exception;
+
+ long getSessionID();
+
+ String getRemoteAddress();
+}
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/PacketSender.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/PacketSender.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/PacketSender.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -1,23 +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;
-
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public interface PacketSender
-{
- void send(Packet packet) throws Exception;
-
- long getSessionID();
-
- String getRemoteAddress();
-}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -21,7 +21,7 @@
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -116,7 +116,7 @@
return handlers.get(handlerID);
}
- public void dispatch(final Packet packet, final PacketSender sender) throws Exception
+ public void dispatch(final Packet packet, final PacketReturner sender) throws Exception
{
long targetID = packet.getTargetID();
if (NO_ID_SET == targetID)
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/INVMSession.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -13,7 +13,7 @@
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -85,7 +85,7 @@
try
{
serverDispatcher.dispatch((Packet) packet,
- new PacketSender()
+ new PacketReturner()
{
public void send(Packet response) throws Exception
{
@@ -120,7 +120,7 @@
// final Packet[] responses = new Packet[1];
//
// serverDispatcher.dispatch(request,
-// new PacketSender()
+// new PacketReturner()
// {
// public void send(Packet response)
// {
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -19,7 +19,8 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.util.OrderedExecutorFactory;
@@ -106,15 +107,6 @@
public void messageReceived(final IoSession session, final Object message)
throws Exception
{
- if (message instanceof Response)
- {
- if (log.isTraceEnabled())
- log.trace("received response " + message);
- // response is handled by the reqres filter.
- // do nothing
- return;
- }
-
if (message instanceof Ping)
{
if (log.isTraceEnabled())
@@ -171,29 +163,38 @@
private void messageReceivedInternal(final IoSession session, Packet packet)
throws Exception
{
- PacketSender sender = new PacketSender()
+ PacketReturner returner;
+
+ if (packet.getResponseTargetID() != EmptyPacket.NO_ID_SET)
+ {
+ returner = new PacketReturner()
+ {
+ public void send(Packet p) throws Exception
+ {
+ dispatcher.callFilters(p);
+ session.write(p);
+ }
+
+ public long getSessionID()
+ {
+ return session.getId();
+ }
+
+ public String getRemoteAddress()
+ {
+ return session.getRemoteAddress().toString();
+ }
+ };
+ }
+ else
{
- public void send(Packet p) throws Exception
- {
- dispatcher.callFilters(p);
- session.write(p);
- }
-
- public long getSessionID()
- {
- return session.getId();
- }
-
- public String getRemoteAddress()
- {
- return session.getRemoteAddress().toString();
- }
- };
+ returner = null;
+ }
if (log.isTraceEnabled())
log.trace("received packet " + packet);
- dispatcher.dispatch(packet, sender);
+ dispatcher.dispatch(packet, returner);
}
// Inner classes -------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -11,6 +11,7 @@
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
* @version <tt>$Revision$</tt>
*
Modified: trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -23,10 +23,9 @@
import java.util.HashSet;
-import javax.security.auth.Subject;
-
import org.jboss.messaging.core.server.ServerConnection;
import org.jboss.messaging.core.settings.HierarchicalRepository;
+import org.jboss.messaging.util.SimpleString;
/**
@@ -39,7 +38,7 @@
{
void authenticate(String user, String password) throws Exception;
- void check(String address, CheckType checkType, ServerConnection conn) throws Exception;
+ void check(SimpleString address, CheckType checkType, ServerConnection conn) throws Exception;
void setSecurityRepository(HierarchicalRepository<HashSet<Role>> securityRepository);
}
Modified: trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -27,13 +27,14 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.security.CheckType;
+import org.jboss.messaging.core.security.JBMSecurityManager;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.security.SecurityStore;
-import org.jboss.messaging.core.security.JBMSecurityManager;
import org.jboss.messaging.core.server.ServerConnection;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.HierarchicalRepositoryChangeListener;
import org.jboss.messaging.util.ConcurrentHashSet;
+import org.jboss.messaging.util.SimpleString;
/**
* The JBM SecurityStore implementation
@@ -76,62 +77,71 @@
private final long invalidationInterval;
private volatile long lastCheck;
-
+
+ private final boolean securityEnabled;
+
// Constructors --------------------------------------------------
- public SecurityStoreImpl(long invalidationInterval)
+ public SecurityStoreImpl(final long invalidationInterval, final boolean securityEnabled)
{
this.invalidationInterval = invalidationInterval;
+
+ this.securityEnabled = securityEnabled;
}
// SecurityManager implementation --------------------------------
- public void authenticate(String user, String password) throws Exception
+ public void authenticate(final String user, final String password) throws Exception
{
- if(!securityManager.validateUser(user, password))
+ if (securityEnabled && !securityManager.validateUser(user, password))
{
throw new MessagingException(MessagingException.SECURITY_EXCEPTION, "Unable to validate user: " + user);
}
}
- public void check(String address, CheckType checkType, ServerConnection conn) throws Exception
+ public void check(final SimpleString address, final CheckType checkType, final ServerConnection conn) throws Exception
{
- if (trace) { log.trace("checking access permissions to " + address); }
-
- if (checkCached(address, checkType))
+ if (securityEnabled)
{
- // OK
- return;
- }
-
- HashSet<Role> roles = securityRepository.getMatch(address);
- if(!securityManager.validateUserAndRole(conn.getUsername(), conn.getPassword(), roles, checkType))
- {
- throw new MessagingException(MessagingException.SECURITY_EXCEPTION, "Unable to validate user: " + conn.getUsername());
- }
- // if we get here we're granted, add to the cache
-
- switch (checkType.type)
- {
- case CheckType.TYPE_READ:
+ if (trace) { log.trace("checking access permissions to " + address); }
+
+ if (checkCached(address, checkType))
{
- readCache.add(address);
- break;
+ // OK
+ return;
}
- case CheckType.TYPE_WRITE:
+
+ String saddress = address.toString();
+
+ HashSet<Role> roles = securityRepository.getMatch(saddress);
+ if(!securityManager.validateUserAndRole(conn.getUsername(), conn.getPassword(), roles, checkType))
{
- writeCache.add(address);
- break;
+ throw new MessagingException(MessagingException.SECURITY_EXCEPTION, "Unable to validate user: " + conn.getUsername());
}
- case CheckType.TYPE_CREATE:
+ // if we get here we're granted, add to the cache
+
+ switch (checkType.type)
{
- createCache.add(address);
- break;
+ case CheckType.TYPE_READ:
+ {
+ readCache.add(saddress);
+ break;
+ }
+ case CheckType.TYPE_WRITE:
+ {
+ writeCache.add(saddress);
+ break;
+ }
+ case CheckType.TYPE_CREATE:
+ {
+ createCache.add(saddress);
+ break;
+ }
+ default:
+ {
+ throw new IllegalArgumentException("Invalid checkType:" + checkType);
+ }
}
- default:
- {
- throw new IllegalArgumentException("Invalid checkType:" + checkType);
- }
}
}
@@ -141,7 +151,6 @@
}
-
// Public --------------------------------------------------------
public void setSecurityRepository(HierarchicalRepository<HashSet<Role>> securityRepository)
@@ -170,7 +179,7 @@
createCache.clear();
}
- private boolean checkCached(String dest, CheckType checkType)
+ private boolean checkCached(final SimpleString dest, final CheckType checkType)
{
long now = System.currentTimeMillis();
Modified: trunk/src/main/org/jboss/messaging/core/server/ServerConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/ServerConnection.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/ServerConnection.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -23,7 +23,7 @@
import java.util.Collection;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.security.SecurityStore;
import org.jboss.messaging.util.SimpleString;
@@ -41,7 +41,7 @@
long getID();
ConnectionCreateSessionResponseMessage createSession(boolean xa, boolean autoCommitSends, boolean autoCommitAcks,
- PacketSender sender) throws Exception;
+ PacketReturner sender) throws Exception;
void start() throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -23,7 +23,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.server.Delivery;
import org.jboss.messaging.core.server.MessageReference;
@@ -47,11 +47,11 @@
private final long deliveryID;
- private final PacketSender sender;
+ private final PacketReturner sender;
public DeliveryImpl(final MessageReference reference,
final long sessionID, final long consumerID,
- final long deliveryID, final PacketSender sender)
+ final long deliveryID, final PacketReturner sender)
{
this.reference = reference;
this.sessionID = sessionID;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -153,7 +153,7 @@
// Create the wired components
- securityStore = new SecurityStoreImpl(configuration.getSecurityInvalidationInterval());
+ securityStore = new SecurityStoreImpl(configuration.getSecurityInvalidationInterval(), configuration.isSecurityEnabled());
securityRepository.setDefault(new HashSet<Role>());
securityStore.setSecurityRepository(securityRepository);
securityStore.setSecurityManager(securityManager);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -26,7 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.server.MessagingServer;
@@ -63,7 +63,7 @@
return 0;
}
- public Packet doHandle(final Packet packet, final PacketSender sender) throws Exception
+ public Packet doHandle(final Packet packet, final PacketReturner sender) throws Exception
{
Packet response = null;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -38,7 +38,7 @@
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
@@ -208,7 +208,7 @@
return ServerBrowserImpl.this.id;
}
- public Packet doHandle(Packet packet, PacketSender sender) throws Exception
+ public Packet doHandle(Packet packet, PacketReturner sender) throws Exception
{
Packet response = null;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -30,7 +30,7 @@
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.security.SecurityStore;
import org.jboss.messaging.core.server.ConnectionManager;
@@ -153,7 +153,7 @@
public ConnectionCreateSessionResponseMessage createSession(final boolean xa, final boolean autoCommitSends,
final boolean autoCommitAcks,
- final PacketSender sender) throws Exception
+ final PacketReturner sender) throws Exception
{
long id = dispatcher.generateID();
ServerSession session =
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -23,7 +23,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.server.ServerConnection;
@@ -50,7 +50,7 @@
return connection.getID();
}
- public Packet doHandle(final Packet packet, final PacketSender sender) throws Exception
+ public Packet doHandle(final Packet packet, final PacketReturner sender) throws Exception
{
Packet response = null;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -23,7 +23,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.server.ServerConsumer;
@@ -50,7 +50,7 @@
return consumer.getID();
}
- public Packet doHandle(final Packet packet, final PacketSender sender) throws Exception
+ public Packet doHandle(final Packet packet, final PacketReturner sender) throws Exception
{
Packet response = null;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -25,7 +25,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
/**
@@ -39,13 +39,13 @@
{
private static final Logger log = Logger.getLogger(ServerPacketHandlerSupport.class);
- public void handle(final Packet packet, final PacketSender sender)
+ public void handle(final Packet packet, final PacketReturner returner)
{
Packet response;
try
{
- response = doHandle(packet, sender);
+ response = doHandle(packet, returner);
}
catch (Exception e)
{
@@ -72,7 +72,7 @@
try
{
- sender.send(response);
+ returner.send(response);
}
catch (Exception e)
{
@@ -81,7 +81,7 @@
}
}
- protected abstract Packet doHandle(final Packet packet, final PacketSender sender) throws Exception;
+ protected abstract Packet doHandle(final Packet packet, final PacketReturner sender) throws Exception;
@Override
public String toString()
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -24,7 +24,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.postoffice.FlowController;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerReceiveTokensMessage;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.ServerProducer;
@@ -52,14 +52,14 @@
private final FlowController flowController;
- private final PacketSender sender;
+ private final PacketReturner sender;
private volatile boolean waiting;
// Constructors ----------------------------------------------------------------
public ServerProducerImpl(final long id, final long clientTargetID, final ServerSession session, final SimpleString address,
- final PacketSender sender,
+ final PacketReturner sender,
final FlowController flowController) throws Exception
{
this.id = id;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -23,7 +23,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
import org.jboss.messaging.core.server.ServerProducer;
@@ -49,7 +49,7 @@
return producer.getID();
}
- public Packet doHandle(final Packet packet, final PacketSender sender) throws Exception
+ public Packet doHandle(final Packet packet, final PacketReturner sender) throws Exception
{
Packet response = null;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -43,7 +43,7 @@
import org.jboss.messaging.core.postoffice.FlowController;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserResponseMessage;
@@ -110,7 +110,7 @@
private final ResourceManager resourceManager;
- private final PacketSender sender;
+ private final PacketReturner sender;
private final PacketDispatcher dispatcher;
@@ -144,7 +144,7 @@
public ServerSessionImpl(final long id, final boolean autoCommitSends,
final boolean autoCommitAcks,
final boolean xa, final ServerConnection connection,
- final ResourceManager resourceManager, final PacketSender sender,
+ final ResourceManager resourceManager, final PacketReturner sender,
final PacketDispatcher dispatcher, final StorageManager persistenceManager,
final HierarchicalRepository<QueueSettings> queueSettingsRepository,
final PostOffice postOffice, final SecurityStore securityStore) throws Exception
@@ -303,7 +303,7 @@
public void send(final ServerMessage msg) throws Exception
{
//check the user has write access to this address
- securityStore.check(msg.getDestination().toString(), CheckType.WRITE, connection);
+ securityStore.check(msg.getDestination(), CheckType.WRITE, connection);
msg.setMessageID(persistenceManager.generateMessageID());
@@ -808,7 +808,7 @@
public void addDestination(final SimpleString address, final boolean temporary) throws Exception
{
- securityStore.check(address.toString(), CheckType.CREATE, connection);
+ securityStore.check(address, CheckType.CREATE, connection);
if (!postOffice.addDestination(address, temporary))
{
@@ -825,7 +825,7 @@
public void removeDestination(final SimpleString address, final boolean temporary) throws Exception
{
- securityStore.check(address.toString(), CheckType.CREATE, connection);
+ securityStore.check(address, CheckType.CREATE, connection);
if (!postOffice.removeDestination(address, temporary))
{
@@ -848,7 +848,7 @@
{
try
{
- securityStore.check(address.toString(), CheckType.CREATE, connection);
+ securityStore.check(address, CheckType.CREATE, connection);
}
catch (MessagingException e)
{
@@ -923,7 +923,7 @@
throw new MessagingException(MessagingException.QUEUE_DOES_NOT_EXIST);
}
- securityStore.check(binding.getAddress().toString(), CheckType.READ, connection);
+ securityStore.check(binding.getAddress(), CheckType.READ, connection);
Filter filter = null;
@@ -1023,7 +1023,7 @@
throw new MessagingException(MessagingException.QUEUE_DOES_NOT_EXIST);
}
- securityStore.check(binding.getAddress().toString(), CheckType.READ, connection);
+ securityStore.check(binding.getAddress(), CheckType.READ, connection);
long id = dispatcher.generateID();
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -28,7 +28,7 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionAcknowledgeMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionAddDestinationMessage;
@@ -79,7 +79,7 @@
return session.getID();
}
- public Packet doHandle(final Packet packet, final PacketSender sender) throws Exception
+ public Packet doHandle(final Packet packet, final PacketReturner sender) throws Exception
{
Packet response = null;
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -22,6 +22,7 @@
package org.jboss.test.messaging.jms;
import java.io.Serializable;
+import java.util.concurrent.CountDownLatch;
import javax.jms.BytesMessage;
import javax.jms.Connection;
@@ -29,6 +30,7 @@
import javax.jms.Destination;
import javax.jms.Message;
import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
@@ -163,34 +165,49 @@
MessageProducer p = ps.createProducer(queue1);
- // MessageConsumer cons = ps.createConsumer(queue1);
+ MessageConsumer cons = ps.createConsumer(queue1);
- // pconn.start();
+ pconn.start();
p.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
p.setDisableMessageID(true);
p.setDisableMessageTimestamp(true);
- final int numMessages = 20000;
+ final int numMessages = 10000;
long start = System.currentTimeMillis();
BytesMessage msg = ps.createBytesMessage();
msg.writeBytes(new byte[1000]);
+
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ class MyListener implements MessageListener
+ {
+ int count;
+ public void onMessage(Message msg)
+ {
+ count++;
+
+ if (count == numMessages)
+ {
+ latch.countDown();
+ }
+ }
+ }
+ cons.setMessageListener(new MyListener());
+
for (int i = 0; i < numMessages; i++)
{
p.send(msg);
}
-// for (int i = 0; i < numMessages; i++)
-// {
-// cons.receive(1000);
-// }
-
+ latch.await();
+
long end = System.currentTimeMillis();
double actualRate = 1000 * (double)numMessages / ( end - start);
@@ -200,7 +217,7 @@
}
finally
{
-
+ pconn.close();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaHandlerOrderingTest.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -17,7 +17,7 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaHandler;
import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
@@ -107,7 +107,7 @@
clientDispatcher.register(handler_1);
handler_2 = new TestPacketHandler(24) {
@Override
- public void handle(Packet packet, PacketSender sender)
+ public void handle(Packet packet, PacketReturner sender)
{
// slow down the 2nd handler
try
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/ReversePacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -15,7 +15,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
import org.jboss.messaging.tests.unit.core.remoting.TestPacketHandler;
@@ -37,7 +37,7 @@
private int sleepTime;
private TimeUnit timeUnit;
- private PacketSender lastSender;
+ private PacketReturner lastSender;
// Static --------------------------------------------------------
@@ -56,7 +56,7 @@
this.timeUnit = timeUnit;
}
- public PacketSender getLastSender()
+ public PacketReturner getLastSender()
{
return lastSender;
}
@@ -69,7 +69,7 @@
}
@Override
- protected void doHandle(Packet packet, PacketSender sender)
+ protected void doHandle(Packet packet, PacketReturner sender)
{
Assert.assertTrue(packet instanceof TextPacket);
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-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -19,7 +19,7 @@
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.tests.unit.core.remoting.impl.ConfigurationHelper;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
@@ -151,7 +151,7 @@
return handlerID;
}
- public void handle(Packet packet, PacketSender sender)
+ public void handle(Packet packet, PacketReturner sender)
{
messagesReceived++;
if (messagesReceived % spinner == 0)
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/PacketDispatcherTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/PacketDispatcherTest.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/PacketDispatcherTest.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -16,7 +16,7 @@
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
@@ -89,7 +89,7 @@
public void testDispatchPacketWithRegisteredHandler() throws Exception
{
PacketHandler handler = createMock(PacketHandler.class);
- PacketSender sender = createMock(PacketSender.class);
+ PacketReturner sender = createMock(PacketReturner.class);
TextPacket packet = new TextPacket("testDispatch");
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/TestPacketHandler.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -13,7 +13,7 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
public class TestPacketHandler implements PacketHandler
@@ -45,7 +45,7 @@
this.latch = new CountDownLatch(count);
}
- public void handle(Packet packet, PacketSender sender)
+ public void handle(Packet packet, PacketReturner sender)
{
packets.add((TextPacket) packet);
@@ -55,7 +55,7 @@
latch.countDown();
}
- protected void doHandle(Packet packet, PacketSender sender)
+ protected void doHandle(Packet packet, PacketReturner sender)
{
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/SessionTestBase.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -19,7 +19,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.PacketSender;
+import org.jboss.messaging.core.remoting.PacketReturner;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.TextPacket;
import org.jboss.messaging.tests.integration.core.remoting.mina.ReversePacketHandler;
@@ -123,7 +123,7 @@
assertTrue(serverPacketHandler.await(2, SECONDS));
assertNotNull(serverPacketHandler.getLastSender());
- PacketSender sender = serverPacketHandler.getLastSender();
+ PacketReturner sender = serverPacketHandler.getLastSender();
TextPacket packetFromServer = new TextPacket(
"testClientHandlePacketSentByServer from server");
packetFromServer.setTargetID(clientHandler.getID());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java 2008-05-09 10:40:53 UTC (rev 4165)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/impl/SecurityStoreImplTest.java 2008-05-09 10:46:16 UTC (rev 4166)
@@ -21,19 +21,19 @@
*/
package org.jboss.messaging.tests.unit.core.security.impl;
+import java.util.HashSet;
+
import junit.framework.TestCase;
-import org.jboss.messaging.core.security.impl.SecurityStoreImpl;
+
+import org.easymock.EasyMock;
+import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.JBMSecurityManager;
import org.jboss.messaging.core.security.Role;
-import org.jboss.messaging.core.security.CheckType;
-import org.jboss.messaging.core.settings.impl.HierarchicalObjectRepository;
+import org.jboss.messaging.core.security.impl.SecurityStoreImpl;
+import org.jboss.messaging.core.server.ServerConnection;
import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.server.ServerConnection;
-import org.jboss.messaging.core.server.impl.ServerConnectionImpl;
-import org.easymock.EasyMock;
+import org.jboss.messaging.util.SimpleString;
-import java.util.HashSet;
-
/**
* tests SecurityStoreImpl
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
@@ -44,7 +44,7 @@
protected void setUp() throws Exception
{
- securityStore = new SecurityStoreImpl(1000000000);
+ securityStore = new SecurityStoreImpl(1000000000, true);
}
protected void tearDown() throws Exception
@@ -85,11 +85,11 @@
//noinspection unchecked
HierarchicalRepository<HashSet<Role>> repository = EasyMock.createStrictMock(HierarchicalRepository.class);
- String address = "anaddress";
+ SimpleString address = new SimpleString("anaddress");
HashSet<Role> roles = new HashSet<Role>();
roles.add(new Role("user", false, false, true));
repository.registerListener(securityStore);
- EasyMock.expect(repository.getMatch(address)).andReturn(roles);
+ EasyMock.expect(repository.getMatch(address.toString())).andReturn(roles);
ServerConnection serverConnection = EasyMock.createNiceMock(ServerConnection.class);
EasyMock.expect(serverConnection.getUsername()).andReturn("user");
EasyMock.expect(serverConnection.getPassword()).andReturn("password");
@@ -116,11 +116,11 @@
//noinspection unchecked
HierarchicalRepository<HashSet<Role>> repository = EasyMock.createStrictMock(HierarchicalRepository.class);
- String address = "anaddress";
+ SimpleString address = new SimpleString("anaddress");
HashSet<Role> roles = new HashSet<Role>();
roles.add(new Role("user", false, false, true));
repository.registerListener(securityStore);
- EasyMock.expect(repository.getMatch(address)).andReturn(roles);
+ EasyMock.expect(repository.getMatch(address.toString())).andReturn(roles);
ServerConnection serverConnection = EasyMock.createNiceMock(ServerConnection.class);
EasyMock.expect(serverConnection.getUsername()).andReturn("user");
EasyMock.expect(serverConnection.getPassword()).andReturn("password");
@@ -147,16 +147,16 @@
//noinspection unchecked
HierarchicalRepository<HashSet<Role>> repository = EasyMock.createStrictMock(HierarchicalRepository.class);
- String address = "anaddress";
+ SimpleString address = new SimpleString("anaddress");
HashSet<Role> roles = new HashSet<Role>();
roles.add(new Role("user", false, false, true));
repository.registerListener(securityStore);
- EasyMock.expect(repository.getMatch(address)).andReturn(roles);
+ EasyMock.expect(repository.getMatch(address.toString())).andReturn(roles);
ServerConnection serverConnection = EasyMock.createNiceMock(ServerConnection.class);
EasyMock.expect(serverConnection.getUsername()).andReturn("user");
EasyMock.expect(serverConnection.getPassword()).andReturn("password");
EasyMock.expect(securityManager.validateUserAndRole("user", "password", roles, CheckType.CREATE)).andReturn(true);
- EasyMock.expect(repository.getMatch(address)).andReturn(roles);
+ EasyMock.expect(repository.getMatch(address.toString())).andReturn(roles);
EasyMock.expect(serverConnection.getUsername()).andReturn("user");
EasyMock.expect(serverConnection.getPassword()).andReturn("password");
EasyMock.expect(securityManager.validateUserAndRole("user", "password", roles, CheckType.CREATE)).andReturn(true);
@@ -171,22 +171,22 @@
}
public void testSuccessfulCheckTimeoutCache() throws Exception
{
- securityStore = new SecurityStoreImpl(2000);
+ securityStore = new SecurityStoreImpl(2000, true);
JBMSecurityManager securityManager = EasyMock.createStrictMock(JBMSecurityManager.class);
securityStore.setSecurityManager(securityManager);
//noinspection unchecked
HierarchicalRepository<HashSet<Role>> repository = EasyMock.createStrictMock(HierarchicalRepository.class);
- String address = "anaddress";
+ SimpleString address = new SimpleString("anaddress");
HashSet<Role> roles = new HashSet<Role>();
roles.add(new Role("user", false, false, true));
repository.registerListener(securityStore);
- EasyMock.expect(repository.getMatch(address)).andReturn(roles);
+ EasyMock.expect(repository.getMatch(address.toString())).andReturn(roles);
ServerConnection serverConnection = EasyMock.createNiceMock(ServerConnection.class);
EasyMock.expect(serverConnection.getUsername()).andReturn("user");
EasyMock.expect(serverConnection.getPassword()).andReturn("password");
EasyMock.expect(securityManager.validateUserAndRole("user", "password", roles, CheckType.CREATE)).andReturn(true);
- EasyMock.expect(repository.getMatch(address)).andReturn(roles);
+ EasyMock.expect(repository.getMatch(address.toString())).andReturn(roles);
EasyMock.expect(serverConnection.getUsername()).andReturn("user");
EasyMock.expect(serverConnection.getPassword()).andReturn("password");
EasyMock.expect(securityManager.validateUserAndRole("user", "password", roles, CheckType.CREATE)).andReturn(true);
More information about the jboss-cvs-commits
mailing list