[jboss-cvs] JBoss Messaging SVN: r4785 - in trunk: src/main/org/jboss/messaging/core/postoffice/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 8 03:32:12 EDT 2008
Author: jmesnil
Date: 2008-08-08 03:32:12 -0400 (Fri, 08 Aug 2008)
New Revision: 4785
Modified:
trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
Log:
moved registration of QueueControlMBean from JournalStorageManager to PostOfficeImpl
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-08-08 05:08:58 UTC (rev 4784)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2008-08-08 07:32:12 UTC (rev 4785)
@@ -47,7 +47,6 @@
import org.jboss.messaging.core.journal.impl.JournalImpl;
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.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -112,9 +111,7 @@
private volatile boolean started;
- private final ManagementService managementService;
-
- public JournalStorageManager(final Configuration config, final ManagementService managementService)
+ public JournalStorageManager(final Configuration config)
{
if (config.getJournalType() != JournalType.NIO && config.getJournalType() != JournalType.ASYNCIO)
{
@@ -176,16 +173,13 @@
config.getJournalMinFiles(), config.isJournalSyncTransactional(),
config.isJournalSyncNonTransactional(), journalFF,
"jbm-data", "jbm", config.getJournalMaxAIO());
-
- this.managementService = managementService;
}
/* This constructor is only used for testing */
- public JournalStorageManager(final Journal messageJournal, final Journal bindingsJournal, final ManagementService managementService)
+ public JournalStorageManager(final Journal messageJournal, final Journal bindingsJournal)
{
this.messageJournal = messageJournal;
this.bindingsJournal = bindingsJournal;
- this.managementService = managementService;
}
public long generateMessageID()
@@ -532,8 +526,6 @@
Binding binding = new BindingImpl(address, queue);
- managementService.registerQueue(queue, address, this);
-
bindings.add(binding);
}
else if (rec == DESTINATION_RECORD)
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-08-08 05:08:58 UTC (rev 4784)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-08-08 07:32:12 UTC (rev 4785)
@@ -314,6 +314,8 @@
managementService.registerAddress(binding.getAddress());
}
+ managementService.registerQueue(binding.getQueue(), binding.getAddress(), storageManager);
+
bindings.add(binding);
if (nameMap.putIfAbsent(binding.getQueue().getName(), binding) != null)
Modified: trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2008-08-08 05:08:58 UTC (rev 4784)
+++ trunk/tests/src/org/jboss/messaging/tests/performance/persistence/StorageManagerTimingTest.java 2008-08-08 07:32:12 UTC (rev 4785)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.performance.persistence;
import java.io.File;
-import java.lang.management.ManagementFactory;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicLong;
@@ -31,7 +30,6 @@
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.impl.ManagementServiceImpl;
import org.jboss.messaging.core.persistence.impl.journal.JournalStorageManager;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.remoting.impl.mina.IoBufferWrapper;
@@ -129,7 +127,7 @@
configuration.setJournalType(journalType);
- final JournalStorageManager journal = new JournalStorageManager(configuration, new ManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(), false));
+ final JournalStorageManager journal = new JournalStorageManager(configuration);
journal.start();
FakePostOffice office = new FakePostOffice();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-08-08 05:08:58 UTC (rev 4784)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/persistence/impl/journal/JournalStorageManagerTest.java 2008-08-08 07:32:12 UTC (rev 4785)
@@ -41,7 +41,6 @@
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;
@@ -73,9 +72,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
ServerMessage msg = EasyMock.createStrictMock(ServerMessage.class);
long msgID = 1021092;
@@ -90,9 +88,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long queueID = 1210981;
final long messageID = 101921092;
@@ -112,9 +109,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long messageID = 101921092;
@@ -128,9 +124,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
ServerMessage msg = EasyMock.createStrictMock(ServerMessage.class);
long msgID = 1021092;
@@ -146,9 +141,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long queueID = 1210981;
final long messageID = 101921092;
@@ -169,9 +163,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long messageID = 101921092;
final long txID = 1209373;
@@ -186,9 +179,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long txID = 1209373;
@@ -202,9 +194,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long txID = 1209373;
@@ -218,9 +209,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long txID = 1209373;
@@ -234,9 +224,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
final long msgID = 120912901;
final long queueID = 1283743;
@@ -267,9 +256,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
messageJournal.load((List<RecordInfo>) EasyMock.anyObject(), (List<PreparedTransactionInfo>) EasyMock.anyObject());
@@ -432,9 +420,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
Queue queue = EasyMock.createStrictMock(Queue.class);
SimpleString queueName = new SimpleString("saiohsiudh");
@@ -502,9 +489,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
Binding binding = EasyMock.createStrictMock(Binding.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
@@ -525,9 +511,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
Binding binding = EasyMock.createStrictMock(Binding.class);
Queue queue = EasyMock.createStrictMock(Queue.class);
@@ -554,9 +539,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
SimpleString dest = new SimpleString("oaskokas");
@@ -673,9 +657,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
bindingsJournal.load((List<RecordInfo>) EasyMock.anyObject(), (List<PreparedTransactionInfo>) EasyMock.anyObject());
@@ -737,9 +720,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
assertFalse(jsm.isStarted());
bindingsJournal.start();
@@ -794,9 +776,8 @@
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
assertEquals(id++, jsm.generateMessageID());
assertEquals(id++, jsm.generateMessageID());
@@ -809,9 +790,8 @@
{
Journal messageJournal = EasyMock.createStrictMock(Journal.class);
Journal bindingsJournal = EasyMock.createStrictMock(Journal.class);
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(messageJournal, bindingsJournal);
long id = 1212;
EasyMock.expect(messageJournal.getTransactionID()).andReturn(id);
@@ -826,9 +806,8 @@
public void testConstructor()
{
Configuration config = new ConfigurationImpl();
- ManagementService managementService = EasyMock.createNiceMock(ManagementService.class);
- JournalStorageManager jsm = new JournalStorageManager(config, managementService);
+ JournalStorageManager jsm = new JournalStorageManager(config);
assertNotNull(jsm.getMessageJournal());
More information about the jboss-cvs-commits
mailing list