[jboss-cvs] JBoss Messaging SVN: r5400 - in trunk: src/main/org/jboss/messaging/core/paging/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 20 12:22:09 EST 2008
Author: timfox
Date: 2008-11-20 12:22:09 -0500 (Thu, 20 Nov 2008)
New Revision: 5400
Added:
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
Removed:
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java
Modified:
trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java
trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
Log:
Some small changes on paging
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -59,7 +59,7 @@
{
/** The system is paging because of global-page-mode */
boolean isGlobalPageMode();
-
+
/** During startup PostOffice may set GlobalPageMode as true */
void setGlobalPageMode(boolean globalMode);
@@ -135,9 +135,9 @@
* @throws Exception
* */
void clearLastPageRecord(LastPageRecord lastRecord) throws Exception;
+
/**
* @return
*/
long getDefaultPageSize();
-
}
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingStore.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -39,7 +39,6 @@
*/
public interface PagingStore extends MessagingComponent
{
-
int getNumberOfPages();
SimpleString getStoreName();
@@ -89,5 +88,4 @@
LastPageRecord getLastRecord();
void setLastRecord(LastPageRecord record);
-
}
Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -25,6 +25,7 @@
import java.util.concurrent.Executor;
import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.util.SimpleString;
/**
* The integration point between the PagingManger and the File System (aka SequentialFiles)
@@ -34,13 +35,11 @@
*/
public interface PagingStoreFactory
{
+ PagingStore newStore(SimpleString destinationName, QueueSettings queueSettings);
- PagingStore newStore(org.jboss.messaging.util.SimpleString destinationName, QueueSettings queueSettings);
-
Executor getPagingExecutor();
-
+
void stop() throws InterruptedException;
void setPagingManager(PagingManager manager);
-
}
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/LastPageRecordImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -33,7 +33,6 @@
*/
public class LastPageRecordImpl implements LastPageRecord
{
-
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
@@ -52,14 +51,12 @@
public LastPageRecordImpl(final long lastId, final SimpleString destination)
{
- super();
this.lastId = lastId;
this.destination = destination;
}
public LastPageRecordImpl()
{
- super();
}
public long getRecordId()
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -41,7 +41,6 @@
*/
public class PageImpl implements Page
{
-
// Constants -----------------------------------------------------
private static final int SIZE_INTEGER = 4;
@@ -98,7 +97,6 @@
public PageMessage[] read() throws Exception
{
-
ArrayList<PageMessage> messages = new ArrayList<PageMessage>();
ByteBuffer buffer = fileFactory.newBuffer((int)file.size());
@@ -257,7 +255,5 @@
this.errorCode = errorCode;
countLatch.down();
}
-
}
-
}
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -43,7 +43,6 @@
*/
public class PageMessageImpl implements PageMessage
{
-
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
@@ -56,7 +55,7 @@
/** Large messages will need to be instatiated lazily during getMessage when the StorageManager is available */
private byte[] largeMessageLazyData;
-
+
private ServerMessage message;
private long transactionID = -1;
@@ -77,7 +76,7 @@
this(new ServerMessageImpl());
}
- public ServerMessage getMessage(StorageManager storage)
+ public ServerMessage getMessage(final StorageManager storage)
{
if (this.largeMessageLazyData != null)
{
@@ -99,17 +98,17 @@
public void decode(final MessagingBuffer buffer)
{
transactionID = buffer.getLong();
-
+
boolean isLargeMessage = buffer.getBoolean();
-
+
if (isLargeMessage)
{
int largeMessageHeaderSize = buffer.getInt();
-
+
this.largeMessageLazyData = new byte[largeMessageHeaderSize];
-
+
buffer.getBytes(largeMessageLazyData);
-
+
}
else
{
@@ -117,7 +116,7 @@
message = new ServerMessageImpl();
message.decode(buffer);
}
-
+
}
public void encode(final MessagingBuffer buffer)
@@ -130,9 +129,7 @@
public int getEncodeSize()
{
- return DataConstants.SIZE_LONG + DataConstants.SIZE_BYTE +
- DataConstants.SIZE_INT +
- message.getEncodeSize();
+ return DataConstants.SIZE_LONG + DataConstants.SIZE_BYTE + DataConstants.SIZE_INT + message.getEncodeSize();
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PageTransactionInfoImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -36,7 +36,6 @@
*/
public class PageTransactionInfoImpl implements PageTransactionInfo
{
-
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
@@ -90,6 +89,7 @@
public int decrement()
{
final int value = numberOfMessages.decrementAndGet();
+
if (value < 0)
{
throw new IllegalStateException("Internal error Negative value on Paging transactions!");
@@ -110,9 +110,9 @@
transactionID = buffer.getLong();
numberOfMessages.set(buffer.getInt());
countDownCompleted = null; // if it is being readed, probably it was
- // committed
+ // committed
complete = true; // Unless it is a incomplete prepare, which is marked by
- // markIcomplete
+ // markIcomplete
}
public synchronized void encode(final MessagingBuffer buffer)
@@ -168,5 +168,4 @@
// Private -------------------------------------------------------
// Inner classes -------------------------------------------------
-
}
Deleted: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-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.paging.impl;
-
-import java.io.File;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import org.jboss.messaging.core.journal.SequentialFileFactory;
-import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
-import org.jboss.messaging.core.paging.PagingManager;
-import org.jboss.messaging.core.paging.PagingStore;
-import org.jboss.messaging.core.paging.PagingStoreFactory;
-import org.jboss.messaging.core.settings.impl.QueueSettings;
-import org.jboss.messaging.util.JBMThreadFactory;
-import org.jboss.messaging.util.SimpleString;
-
-/**
- *
- * Integration point between Paging and NIO
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
- */
-public class PagingManagerFactoryNIO implements PagingStoreFactory
-{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private final String directory;
-
- private final ExecutorService executor;
-
- private PagingManager pagingManager;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public PagingManagerFactoryNIO(final String directory)
- {
- this.directory = directory;
- executor = Executors.newCachedThreadPool(new JBMThreadFactory("JBM-depaging-threads"));
- }
-
- // Public --------------------------------------------------------
-
- public Executor getPagingExecutor()
- {
- return executor;
- }
-
- public void stop() throws InterruptedException
- {
- executor.shutdown();
- executor.awaitTermination(60, TimeUnit.SECONDS);
- }
-
- public PagingStore newStore(final SimpleString destinationName, final QueueSettings settings)
- {
- final String destinationDirectory = directory + "/" + destinationName.toString();
- File destinationFile = new File(destinationDirectory);
- destinationFile.mkdirs();
-
- return new PagingStoreImpl(pagingManager,
- newFileFactory(destinationDirectory),
- destinationName,
- settings,
- executor);
- }
-
- public void setPagingManager(final PagingManager manager)
- {
- pagingManager = manager;
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- protected SequentialFileFactory newFileFactory(final String destinationDirectory)
- {
- return new NIOSequentialFileFactory(destinationDirectory);
- }
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -56,7 +56,6 @@
*/
public class PagingManagerImpl implements PagingManager
{
-
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
@@ -128,7 +127,7 @@
{
return globalMode.get();
}
-
+
public void setGlobalPageMode(boolean globalMode)
{
this.globalMode.set(globalMode);
@@ -138,10 +137,10 @@
* @param destination
* @return
*/
- public synchronized PagingStore createPageStore(SimpleString storeName) throws Exception
+ public synchronized PagingStore createPageStore(final SimpleString storeName) throws Exception
{
PagingStore store = stores.get(storeName);
-
+
if (store == null)
{
store = newStore(storeName);
@@ -159,12 +158,10 @@
return store;
}
-
-
- public PagingStore getPageStore(final SimpleString storeName) throws Exception
+ public PagingStore getPageStore(final SimpleString storeName) throws Exception
{
PagingStore store = stores.get(storeName);
-
+
if (store == null)
{
throw new IllegalStateException("Store " + storeName + " not found on paging");
@@ -221,6 +218,7 @@
}
lastPage.setLastId(pageId);
+
storageManager.storeLastPage(depageTransactionID, lastPage);
HashSet<PageTransactionInfo> pageTransactionsToUpdate = new HashSet<PageTransactionInfo>();
@@ -265,7 +263,7 @@
pageTransactionsToUpdate.add(pageTransactionInfo);
}
}
-
+
refsToAdd.addAll(postOffice.route(pagedMessage));
if (pagedMessage.getDurableRefCount() != 0)
@@ -290,7 +288,7 @@
}
storageManager.commit(depageTransactionID);
-
+
trace("Depage committed");
for (MessageReference ref : refsToAdd)
@@ -378,7 +376,7 @@
public void stop() throws Exception
{
started = false;
-
+
pagingSPI.stop();
for (PagingStore store : stores.values())
@@ -501,7 +499,7 @@
// Inner classes -------------------------------------------------
- class GlobalDepager implements Runnable
+ private class GlobalDepager implements Runnable
{
public void run()
{
@@ -552,7 +550,5 @@
globalDepageRunning.set(false);
}
}
-
}
-
}
Copied: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java (from rev 5399, trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-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.paging.impl;
+
+import java.io.File;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.messaging.core.journal.SequentialFileFactory;
+import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
+import org.jboss.messaging.core.paging.PagingManager;
+import org.jboss.messaging.core.paging.PagingStore;
+import org.jboss.messaging.core.paging.PagingStoreFactory;
+import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.util.JBMThreadFactory;
+import org.jboss.messaging.util.SimpleString;
+
+/**
+ *
+ * Integration point between Paging and NIO
+ * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
+ *
+ */
+public class PagingStoreFactoryNIO implements PagingStoreFactory
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private final String directory;
+
+ private final ExecutorService executor;
+
+ private PagingManager pagingManager;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ public PagingStoreFactoryNIO(final String directory)
+ {
+ this.directory = directory;
+
+ executor = Executors.newCachedThreadPool(new JBMThreadFactory("JBM-depaging-threads"));
+ }
+
+ // Public --------------------------------------------------------
+
+ public Executor getPagingExecutor()
+ {
+ return executor;
+ }
+
+ public void stop() throws InterruptedException
+ {
+ executor.shutdown();
+ executor.awaitTermination(60, TimeUnit.SECONDS);
+ }
+
+ public PagingStore newStore(final SimpleString destinationName, final QueueSettings settings)
+ {
+ final String destinationDirectory = directory + "/" + destinationName.toString();
+ File destinationFile = new File(destinationDirectory);
+ destinationFile.mkdirs();
+
+ return new PagingStoreImpl(pagingManager,
+ newFileFactory(destinationDirectory),
+ destinationName,
+ settings,
+ executor);
+ }
+
+ public void setPagingManager(final PagingManager manager)
+ {
+ pagingManager = manager;
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ protected SequentialFileFactory newFileFactory(final String destinationDirectory)
+ {
+ return new NIOSequentialFileFactory(destinationDirectory);
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -24,7 +24,6 @@
import java.text.DecimalFormat;
import java.util.List;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -54,7 +53,6 @@
*/
public class PagingStoreImpl implements TestSupportPageStore
{
-
// Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(PagingStoreImpl.class);
@@ -75,7 +73,7 @@
private final boolean dropMessagesOnSize;
private boolean droppedMessages;
-
+
private final PagingManager pagingManager;
private final ExecutorService executor;
@@ -219,7 +217,6 @@
page.delete();
return addressNotFull;
-
}
/**
@@ -230,9 +227,9 @@
public Page depage() throws Exception
{
positioningGlobalLock.acquire(); // Can't change currentPage or any of ids
- // without a global lock
+ // without a global lock
lock.writeLock().lock(); // Wait pending writes to finish before
- // entering the block
+ // entering the block
try
{
@@ -298,11 +295,11 @@
// this address
if (dropMessagesOnSize)
{
- //TODO - why?
+ // TODO - why?
return false;
}
- //TODO why calc this before checking currentPage?
+ // TODO why calc this before checking currentPage?
int bytesToWrite = fileFactory.calculateBlockSize(message.getEncodeSize() + PageImpl.SIZE_RECORD);
// The only thing single-threaded done on paging is positioning and
@@ -444,10 +441,10 @@
try
{
running = false;
-
+
executor.shutdown();
executor.awaitTermination(60, TimeUnit.SECONDS);
-
+
if (currentPage != null)
{
currentPage.close();
@@ -643,7 +640,7 @@
// Inner classes -------------------------------------------------
- class DepageRunnable implements Runnable
+ private class DepageRunnable implements Runnable
{
public DepageRunnable()
{
@@ -669,5 +666,4 @@
}
}
}
-
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -35,7 +35,7 @@
import org.jboss.messaging.core.management.MessagingServerControlMBean;
import org.jboss.messaging.core.paging.PagingManager;
import org.jboss.messaging.core.paging.PagingStoreFactory;
-import org.jboss.messaging.core.paging.impl.PagingManagerFactoryNIO;
+import org.jboss.messaging.core.paging.impl.PagingStoreFactoryNIO;
import org.jboss.messaging.core.paging.impl.PagingManagerImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.PostOffice;
@@ -209,7 +209,7 @@
new JBMThreadFactory("JBM-scheduled-threads"));
queueFactory = new QueueFactoryImpl(scheduledExecutor, queueSettingsRepository);
- PagingStoreFactory storeFactory = new PagingManagerFactoryNIO(configuration.getPagingDirectory());
+ PagingStoreFactory storeFactory = new PagingStoreFactoryNIO(configuration.getPagingDirectory());
pagingManager = new PagingManagerImpl(storeFactory,
storageManager,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java 2008-11-20 17:14:40 UTC (rev 5399)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java 2008-11-20 17:22:09 UTC (rev 5400)
@@ -29,7 +29,7 @@
import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.PagingStore;
import org.jboss.messaging.core.paging.impl.PageMessageImpl;
-import org.jboss.messaging.core.paging.impl.PagingManagerFactoryNIO;
+import org.jboss.messaging.core.paging.impl.PagingStoreFactoryNIO;
import org.jboss.messaging.core.paging.impl.PagingManagerImpl;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.server.ServerMessage;
@@ -66,7 +66,7 @@
HierarchicalRepository<QueueSettings> queueSettings = new HierarchicalObjectRepository<QueueSettings>();
queueSettings.setDefault(new QueueSettings());
- PagingManagerImpl managerImpl = new PagingManagerImpl(new PagingManagerFactoryNIO(journalDir),
+ PagingManagerImpl managerImpl = new PagingManagerImpl(new PagingStoreFactoryNIO(journalDir),
null,
queueSettings,
-1,
@@ -113,7 +113,7 @@
queueSettings.addMatch("simple-test", simpleTestSettings);
- PagingManagerImpl managerImpl = new PagingManagerImpl(new PagingManagerFactoryNIO(journalDir),
+ PagingManagerImpl managerImpl = new PagingManagerImpl(new PagingStoreFactoryNIO(journalDir),
null,
queueSettings,
-1,
More information about the jboss-cvs-commits
mailing list