[jboss-cvs] JBoss Messaging SVN: r4773 - in branches/Branch_JBMESSAGING-1303: src/main/org/jboss/messaging/core/management/impl and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 5 08:57:26 EDT 2008
Author: jmesnil
Date: 2008-08-05 08:57:26 -0400 (Tue, 05 Aug 2008)
New Revision: 4773
Removed:
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/NullManagementService.java
Modified:
branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml
branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/StorageManager.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java
branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/performance/persistence/impl/StorageManagerTimingTest.java
branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java
branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java
Log:
JBMESSAGING-1303: Revisit management interfaces
* removed NullManagementService. The ManagementService instance is now injected into objects which require it.
* Enabling or disabling management is done internally in ManagementServiceImpl
Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-beans.xml 2008-08-05 12:57:26 UTC (rev 4773)
@@ -58,6 +58,9 @@
<parameter>
<inject bean="Configuration"/>
</parameter>
+ <parameter>
+ <inject bean="ManagementService"/>
+ </parameter>
</constructor>
</bean>
Modified: branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/config/jbm-standalone-beans.xml 2008-08-05 12:57:26 UTC (rev 4773)
@@ -1,4 +1,3 @@
-
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
@@ -78,6 +77,9 @@
<parameter>
<inject bean="Configuration"/>
</parameter>
+ <parameter>
+ <inject bean="ManagementService"/>
+ </parameter>
</constructor>
</bean>
Deleted: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/NullManagementService.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/NullManagementService.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/management/impl/NullManagementService.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * 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.management.impl;
-
-import org.jboss.messaging.core.management.ManagementService;
-import org.jboss.messaging.core.management.MessagingServerManagement;
-import org.jboss.messaging.core.persistence.StorageManager;
-import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.server.Queue;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
-import org.jboss.messaging.core.settings.impl.QueueSettings;
-import org.jboss.messaging.util.SimpleString;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class NullManagementService implements ManagementService
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public NullManagementService()
- {
- }
-
- // Public --------------------------------------------------------
-
- // ManagementRegistration implementation -------------------------
-
- public void setPostOffice(PostOffice postOffice)
- {
- }
-
- public void setQueueSettingsRepository(
- HierarchicalRepository<QueueSettings> queueSettingsRepository)
- {
- }
-
- public void registerServer(MessagingServerManagement server)
- throws Exception
- {
- }
-
- public void unregisterServer() throws Exception
- {
- }
-
- public void registerAddress(SimpleString address) throws Exception
- {
- }
-
- public void unregisterAddress(SimpleString address) throws Exception
- {
- }
-
- public void registerQueue(Queue queue, SimpleString address,
- StorageManager storageManager) throws Exception
- {
- }
-
- public void unregisterQueue(SimpleString name, SimpleString address)
- throws Exception
- {
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/StorageManager.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.server.MessageReference;
@@ -91,7 +90,4 @@
void loadBindings(QueueFactory queueFactory, List<Binding> bindings,
List<SimpleString> destinations) throws Exception;
-
- void setManagementService(ManagementService managementService);
-
}
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -48,7 +48,6 @@
import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.ManagementService;
-import org.jboss.messaging.core.management.impl.NullManagementService;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -69,6 +68,7 @@
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
public class JournalStorageManager implements StorageManager
@@ -112,9 +112,9 @@
private volatile boolean started;
- private ManagementService managementService = new NullManagementService();
-
- public JournalStorageManager(final Configuration config)
+ private final ManagementService managementService;
+
+ public JournalStorageManager(final Configuration config, final ManagementService managementService)
{
if (config.getJournalType() != JournalType.NIO && config.getJournalType() != JournalType.ASYNCIO)
{
@@ -176,13 +176,16 @@
config.getJournalMinFiles(), config.isJournalSyncTransactional(),
config.isJournalSyncNonTransactional(), journalFF,
"jbm-data", "jbm", config.getJournalMaxAIO(), config.getJournalAIOTimeout());
+
+ this.managementService = managementService;
}
/* This constructor is only used for testing */
- public JournalStorageManager(final Journal messageJournal, final Journal bindingsJournal)
+ public JournalStorageManager(final Journal messageJournal, final Journal bindingsJournal, final ManagementService managementService)
{
this.messageJournal = messageJournal;
this.bindingsJournal = bindingsJournal;
+ this.managementService = managementService;
}
public long generateMessageID()
@@ -555,11 +558,6 @@
bindingIDSequence.set(maxID + 1);
}
- public void setManagementService(ManagementService managementService)
- {
- this.managementService = managementService;
- }
-
// MessagingComponent implementation ------------------------------------------------------
public synchronized void start() throws Exception
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -27,7 +27,6 @@
import java.util.Set;
import org.jboss.messaging.core.filter.Filter;
-import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.core.server.ServerMessage;
@@ -81,6 +80,4 @@
Map<SimpleString, List<Binding>> getMappings();
Set<SimpleString> listAllDestinations();
-
- void setManagementService(ManagementService managementService);
}
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -37,7 +37,6 @@
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.ManagementService;
-import org.jboss.messaging.core.management.impl.NullManagementService;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
@@ -55,6 +54,7 @@
* A PostOfficeImpl
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
public class PostOfficeImpl implements PostOffice
@@ -77,15 +77,17 @@
private volatile boolean started;
- private ManagementService managementService = new NullManagementService();
+ private ManagementService managementService;
public PostOfficeImpl(final StorageManager storageManager,
- final QueueFactory queueFactory, final boolean checkAllowable)
+ final QueueFactory queueFactory, final ManagementService managementService, final boolean checkAllowable)
{
this.storageManager = storageManager;
this.queueFactory = queueFactory;
+ this.managementService = managementService;
+
this.checkAllowable = checkAllowable;
}
@@ -277,11 +279,6 @@
return flowControllers.get(address);
}
- public void setManagementService(ManagementService managementService)
- {
- this.managementService = managementService;
- }
-
// Private -----------------------------------------------------------------
private Binding createBinding(final SimpleString address, final SimpleString name, final Filter filter,
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -37,7 +37,6 @@
import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.management.MessagingServerManagement;
import org.jboss.messaging.core.management.impl.MessagingServerManagementImpl;
-import org.jboss.messaging.core.management.impl.NullManagementService;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
import org.jboss.messaging.core.postoffice.impl.PostOfficeImpl;
@@ -150,7 +149,6 @@
{
throw new IllegalStateException("Must inject StorageManager before starting MessagingServer");
}
- storageManager.setManagementService(managementService);
if (remotingService == null)
{
@@ -187,8 +185,7 @@
managementService.setQueueSettingsRepository(queueSettingsRepository);
scheduledExecutor = new ScheduledThreadPoolExecutor(configuration.getScheduledThreadPoolMaxSize(), new JBMThreadFactory("JBM-scheduled-threads"));
queueFactory = new QueueFactoryImpl(scheduledExecutor, queueSettingsRepository);
- postOffice = new PostOfficeImpl(storageManager, queueFactory, configuration.isRequireDestinations());
- postOffice.setManagementService(managementService);
+ postOffice = new PostOfficeImpl(storageManager, queueFactory, managementService, configuration.isRequireDestinations());
managementService.setPostOffice(postOffice);
threadPool = Executors.newFixedThreadPool(configuration.getThreadPoolMaxSize(), new JBMThreadFactory("JBM-session-threads"));
executorFactory = new OrderedExecutorFactory(threadPool);
Modified: branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -21,10 +21,12 @@
*/
package org.jboss.messaging.core.server.impl;
+import java.lang.management.ManagementFactory;
+
import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.ManagementService;
-import org.jboss.messaging.core.management.impl.NullManagementService;
+import org.jboss.messaging.core.management.impl.ManagementServiceImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.persistence.impl.nullpm.NullStorageManager;
import org.jboss.messaging.core.remoting.RemotingService;
@@ -37,6 +39,7 @@
/**
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*
*/
public class MessagingServiceImpl implements MessagingService
@@ -54,7 +57,7 @@
JBMSecurityManager securityManager = new JBMSecurityManagerImpl(true);
- ManagementService managementService = new NullManagementService();
+ ManagementService managementService = new ManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(), false);
MessagingServer server = new MessagingServerImpl();
Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/performance/persistence/impl/StorageManagerTimingTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/performance/persistence/impl/StorageManagerTimingTest.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/performance/persistence/impl/StorageManagerTimingTest.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -22,9 +22,11 @@
package org.jboss.messaging.tests.performance.persistence.impl;
+import org.easymock.EasyMock;
import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
import org.jboss.messaging.core.config.impl.FileConfiguration;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
import org.jboss.messaging.core.server.JournalType;
@@ -120,6 +122,7 @@
final int numberOfThreads) throws Exception
{
FileConfiguration configuration = new FileConfiguration();
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
configuration.start();
@@ -128,7 +131,7 @@
configuration.setJournalType(journalType);
- final JournalStorageManager journal = new JournalStorageManager(configuration);
+ final JournalStorageManager journal = new JournalStorageManager(configuration, managementService);
journal.start();
FakePostOffice office = new FakePostOffice();
Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -41,6 +41,7 @@
import org.jboss.messaging.core.journal.RecordInfo;
import org.jboss.messaging.core.journal.TestableJournal;
import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -71,9 +72,11 @@
public void testStoreMessage() throws Exception
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
- Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+
ServerMessage msg = EasyMock.createStrictMock(ServerMessage.class);
long msgID = 1021092;
EasyMock.expect(msg.getMessageID()).andReturn(msgID);
@@ -87,7 +90,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long queueID = 1210981;
final long messageID = 101921092;
@@ -107,7 +112,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long messageID = 101921092;
@@ -120,8 +127,10 @@
public void testStoreMessageTransactional() throws Exception
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
- Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
ServerMessage msg = EasyMock.createStrictMock(ServerMessage.class);
long msgID = 1021092;
@@ -136,8 +145,10 @@
public void testStoreAcknowledgeTransactional() throws Exception
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
- Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long queueID = 1210981;
final long messageID = 101921092;
@@ -157,8 +168,10 @@
public void testStoreDeleteTransactional() throws Exception
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
- Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long messageID = 101921092;
final long txID = 1209373;
@@ -173,7 +186,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long txID = 1209373;
@@ -187,7 +202,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long txID = 1209373;
@@ -201,7 +218,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long txID = 1209373;
@@ -215,7 +234,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
final long msgID = 120912901;
final long queueID = 1283743;
@@ -246,7 +267,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
messageJournal.load((List<RecordInfo>) EasyMock.anyObject(), (List<PreparedTransactionInfo>) EasyMock.anyObject());
@@ -409,7 +432,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
Queue queue = EasyMock.createStrictMock(Queue.class);
SimpleString queueName = new SimpleString("saiohsiudh");
@@ -477,7 +502,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
Binding binding = EasyMock.createStrictMock(Binding.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
@@ -498,7 +525,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
Binding binding = EasyMock.createStrictMock(Binding.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
@@ -525,7 +554,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
SimpleString dest = new SimpleString("oaskokas");
@@ -642,7 +673,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
bindingsJournal.load((List<RecordInfo>) EasyMock.anyObject(), (List<PreparedTransactionInfo>) EasyMock.anyObject());
@@ -704,7 +737,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
assertFalse(jsm.isStarted());
bindingsJournal.start();
@@ -761,7 +796,9 @@
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
assertEquals(id++, jsm.generateMessageID());
assertEquals(id++, jsm.generateMessageID());
@@ -774,7 +811,9 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
long id = 1212;
EasyMock.expect(messageJournal.getTransactionID()).andReturn(id);
@@ -789,9 +828,10 @@
public void testConstructor()
{
Configuration config = new ConfigurationImpl();
-
- JournalStorageManager jsm = new JournalStorageManager(config);
-
+ ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
+
+ JournalStorageManager jsm = new JournalStorageManager(config, managementService);
+
assertNotNull(jsm.getMessageJournal());
TestableJournal messageJournal = (TestableJournal)jsm.getMessageJournal();
Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/PostOfficeImplTest.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -31,6 +31,7 @@
import org.easymock.IAnswer;
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
+import org.jboss.messaging.core.management.ManagementService;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
@@ -59,7 +60,8 @@
{
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.replay(pm, qf);
@@ -72,7 +74,8 @@
{
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.replay(pm, qf);
@@ -99,7 +102,8 @@
EasyMock.expect(queue.getName()).andStubReturn(queueName);
queue.setFlowController(null);
EasyMock.expect(queue.getPersistenceID()).andStubReturn(1);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, null));
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
@@ -141,9 +145,9 @@
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
-
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, null));
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
@@ -172,6 +176,7 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
SimpleString address1 = new SimpleString("testAddress1");
EasyMock.expect(binding.getAddress()).andStubReturn(address1);
@@ -182,7 +187,8 @@
EasyMock.expect(queue.getName()).andStubReturn(queueName);
queue.setFlowController(null);
EasyMock.expect(queue.getPersistenceID()).andStubReturn(1);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, null));
@@ -227,9 +233,9 @@
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
-
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, null));
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
@@ -257,6 +263,7 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
SimpleString address1 = new SimpleString("testAddress1");
dests.add(address1);
@@ -266,7 +273,8 @@
EasyMock.expect(queue.getName()).andStubReturn(queueName);
queue.setFlowController((FlowController) EasyMock.anyObject());
EasyMock.expect(queue.getPersistenceID()).andStubReturn(1);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
EasyMock.expectLastCall().andAnswer(new LoadBindingsIAnswer(bindingArrayList, dests));
EasyMock.expect(pm.addDestination(address1)).andReturn(true);
@@ -289,7 +297,8 @@
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
Binding[] bindings = new Binding[100];
@@ -341,7 +350,9 @@
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
Binding[] bindings = new Binding[100];
@@ -393,7 +404,9 @@
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
Binding[] bindings = new Binding[100];
@@ -444,7 +457,9 @@
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
ArrayList<Binding> bindingArrayList = new ArrayList<Binding>();
List<SimpleString> dests = new ArrayList<SimpleString>();
Binding[] bindings = new Binding[100];
@@ -492,10 +507,10 @@
public void testAddQueue() throws Exception
{
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
-
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
- PostOffice po = new PostOfficeImpl(pm, qf, false);
+ PostOffice po = new PostOfficeImpl(pm, qf, ms, false);
final long id = 324;
final SimpleString name = new SimpleString("wibb22");
@@ -534,10 +549,10 @@
public void testRemoveQueue() throws Exception
{
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
-
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
- PostOffice po = new PostOfficeImpl(pm, qf, false);
+ PostOffice po = new PostOfficeImpl(pm, qf, ms, false);
final long id = 324;
final SimpleString name = new SimpleString("wibb22");
@@ -585,10 +600,10 @@
public void testAddRemoveMultipleWithDifferentConditions() throws Exception
{
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
-
QueueFactory qf = new FakeQueueFactory();
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
- PostOffice po = new PostOfficeImpl(pm, qf, false);
+ PostOffice po = new PostOfficeImpl(pm, qf, ms, false);
final SimpleString condition1 = new SimpleString("queue.wibble");
@@ -674,7 +689,8 @@
SimpleString address = new SimpleString("testAddress");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(pm.addDestination(address)).andReturn(true);
@@ -694,7 +710,8 @@
SimpleString address3 = new SimpleString("testAddress3");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(pm.addDestination(address)).andReturn(true);
@@ -720,7 +737,8 @@
SimpleString address = new SimpleString("testAddress");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(pm.addDestination(address)).andReturn(true);
@@ -743,7 +761,8 @@
SimpleString address3 = new SimpleString("testAddress3");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(pm.addDestination(address)).andReturn(true);
@@ -779,7 +798,8 @@
SimpleString address = new SimpleString("testAddress");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.replay(pm, qf);
@@ -798,7 +818,8 @@
SimpleString address3 = new SimpleString("testAddress3");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.replay(pm, qf);
@@ -821,7 +842,8 @@
SimpleString address = new SimpleString("testAddress");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.replay(pm, qf);
@@ -842,7 +864,8 @@
SimpleString address3 = new SimpleString("testAddress3");
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.replay(pm, qf);
@@ -874,7 +897,8 @@
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
Filter filter = EasyMock.createStrictMock(Filter.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, true, false)).andReturn(queue);
@@ -900,7 +924,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
Queue queue2 = EasyMock.createStrictMock(Queue.class);
Queue queue3 = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, true, false)).andReturn(queue);
@@ -934,7 +959,8 @@
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
Filter filter = EasyMock.createStrictMock(Filter.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, false, false)).andReturn(queue);
@@ -959,7 +985,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
Queue queue2 = EasyMock.createStrictMock(Queue.class);
Queue queue3 = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, false, false)).andReturn(queue);
@@ -990,7 +1017,8 @@
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
Filter filter = EasyMock.createStrictMock(Filter.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, true, false)).andReturn(queue);
@@ -1022,7 +1050,8 @@
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
Filter filter = EasyMock.createStrictMock(Filter.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, true, false)).andReturn(queue);
@@ -1052,7 +1081,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
Queue queue2 = EasyMock.createStrictMock(Queue.class);
Queue queue3 = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, true, false)).andReturn(queue);
@@ -1094,7 +1124,8 @@
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
Filter filter = EasyMock.createStrictMock(Filter.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, false, false)).andReturn(queue);
@@ -1122,7 +1153,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
Queue queue2 = EasyMock.createStrictMock(Queue.class);
Queue queue3 = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(qf.createQueue(-1, queueName, filter, false, false)).andReturn(queue);
@@ -1160,7 +1192,8 @@
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
Filter filter = EasyMock.createStrictMock(Filter.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(queue.getName()).andStubReturn(queueName);
@@ -1186,7 +1219,8 @@
ServerMessage message = EasyMock.createStrictMock(ServerMessage.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, true);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, true);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(message.getDestination()).andStubReturn(new SimpleString("testtDestination"));
@@ -1211,7 +1245,8 @@
ServerMessage message = EasyMock.createStrictMock(ServerMessage.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, false);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, false);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
EasyMock.expect(message.getDestination()).andStubReturn(new SimpleString("testtDestination"));
@@ -1230,7 +1265,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, false);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, false);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
SimpleString address = new SimpleString("testtDestination");
@@ -1259,7 +1295,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, false);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, false);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
SimpleString address = new SimpleString("testtDestination");
@@ -1289,7 +1326,8 @@
Queue queue = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, false);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, false);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
SimpleString address = new SimpleString("testtDestination");
@@ -1322,7 +1360,8 @@
Queue queue3 = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, false);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, false);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
SimpleString address = new SimpleString("testtDestination");
@@ -1372,7 +1411,8 @@
Queue queue3 = EasyMock.createStrictMock(Queue.class);
StorageManager pm = EasyMock.createStrictMock(StorageManager.class);
QueueFactory qf = EasyMock.createStrictMock(QueueFactory.class);
- PostOffice postOffice = new PostOfficeImpl(pm, qf, false);
+ ManagementService ms = EasyMock.createNiceMock(ManagementService.class);
+ PostOffice postOffice = new PostOfficeImpl(pm, qf, ms, false);
pm.loadBindings(EasyMock.eq(qf), (List<Binding>) EasyMock.anyObject(), (List<SimpleString>) EasyMock.anyObject());
pm.loadMessages(EasyMock.eq(postOffice), (Map<Long, Queue>) EasyMock.anyObject());
SimpleString address = new SimpleString("testtDestination");
Modified: branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java 2008-08-05 12:01:40 UTC (rev 4772)
+++ branches/Branch_JBMESSAGING-1303/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java 2008-08-05 12:57:26 UTC (rev 4773)
@@ -185,7 +185,6 @@
EasyMock.expect(sm.isStarted()).andStubReturn(true);
EasyMock.expect(rs.isStarted()).andStubReturn(false);
- sm.setManagementService(EasyMock.isA(ManagementService.class));
EasyMock.replay(sm, rs);
@@ -206,7 +205,6 @@
EasyMock.expect(sm.isStarted()).andStubReturn(true);
EasyMock.expect(rs.isStarted()).andStubReturn(true);
rs.addRemotingSessionListener(EasyMock.isA(ConnectionManagerImpl.class));
- sm.setManagementService(EasyMock.isA(ManagementService.class));
sm.loadBindings(EasyMock.isA(QueueFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
@@ -309,7 +307,6 @@
EasyMock.expect(sm.isStarted()).andStubReturn(true);
EasyMock.expect(rs.isStarted()).andStubReturn(true);
rs.addRemotingSessionListener(EasyMock.isA(ConnectionManagerImpl.class));
- sm.setManagementService(EasyMock.isA(ManagementService.class));
sm.loadBindings(EasyMock.isA(QueueFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
@@ -394,7 +391,6 @@
server.setManagementService(mr);
rs.addRemotingSessionListener(EasyMock.isA(ConnectionManagerImpl.class));
- sm.setManagementService(EasyMock.isA(ManagementService.class));
sm.loadBindings(EasyMock.isA(QueueFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
PacketDispatcher pd = EasyMock.createMock(PacketDispatcher.class);
@@ -455,7 +451,6 @@
EasyMock.expect(rs.getDispatcher()).andReturn(pd);
rs.addRemotingSessionListener(EasyMock.isA(ConnectionManagerImpl.class));
- sm.setManagementService(EasyMock.isA(ManagementService.class));
sm.loadBindings(EasyMock.isA(QueueFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
More information about the jboss-cvs-commits
mailing list