[jboss-cvs] JBoss Messaging SVN: r7399 - in trunk: src/main/org/jboss/messaging/core/journal/impl and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 18 22:18:59 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-06-18 22:18:59 -0400 (Thu, 18 Jun 2009)
New Revision: 7399
Removed:
trunk/src/main/org/jboss/messaging/core/journal/BufferCallback.java
Modified:
trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java
trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java
trunk/src/main/org/jboss/messaging/core/journal/impl/AbstractSequentialFactory.java
trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
tweaks
Deleted: trunk/src/main/org/jboss/messaging/core/journal/BufferCallback.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/BufferCallback.java 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/src/main/org/jboss/messaging/core/journal/BufferCallback.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -1,35 +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.journal;
-
-/**
- *
- * This interface is defined here just to avoid a direct dependency to the asyncio package
- *
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
- */
-public interface BufferCallback extends org.jboss.messaging.core.asyncio.BufferCallback
-{
-
-}
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -32,10 +32,10 @@
import org.jboss.messaging.core.asyncio.AIOCallback;
import org.jboss.messaging.core.asyncio.AsynchronousFile;
+import org.jboss.messaging.core.asyncio.BufferCallback;
import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
import org.jboss.messaging.core.asyncio.impl.TimedBuffer;
import org.jboss.messaging.core.asyncio.impl.TimedBufferObserver;
-import org.jboss.messaging.core.journal.BufferCallback;
import org.jboss.messaging.core.journal.IOCallback;
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.journal.SequentialFileFactory;
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFileFactory.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -27,10 +27,10 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
+import org.jboss.messaging.core.asyncio.BufferCallback;
import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
import org.jboss.messaging.core.asyncio.impl.TimedBuffer;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.journal.BufferCallback;
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.utils.JBMThreadFactory;
Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/AbstractSequentialFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/AbstractSequentialFactory.java 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/AbstractSequentialFactory.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -29,7 +29,6 @@
import java.util.Arrays;
import java.util.List;
-import org.jboss.messaging.core.journal.BufferCallback;
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.journal.SequentialFileFactory;
import org.jboss.messaging.core.logging.Logger;
Modified: trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/src/main/org/jboss/messaging/core/persistence/StorageManager.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -77,8 +77,6 @@
void storeDuplicateID(SimpleString address, byte[] duplID, long recordID) throws Exception;
- void updateDuplicateID(SimpleString address, byte[] duplID, long recordID) throws Exception;
-
void deleteDuplicateID(long recordID) throws Exception;
void storeMessageTransactional(long txID, ServerMessage message) throws Exception;
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 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -321,13 +321,6 @@
messageJournal.appendAddRecord(recordID, DUPLICATE_ID, encoding, syncNonTransactional);
}
- public void updateDuplicateID(final SimpleString address, final byte[] duplID, final long recordID) throws Exception
- {
- DuplicateIDEncoding encoding = new DuplicateIDEncoding(address, duplID);
-
- messageJournal.appendUpdateRecord(recordID, DUPLICATE_ID, encoding, syncNonTransactional);
- }
-
public void deleteDuplicateID(long recordID) throws Exception
{
messageJournal.appendDeleteRecord(recordID, syncNonTransactional);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2009-06-19 01:56:22 UTC (rev 7398)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2009-06-19 02:18:59 UTC (rev 7399)
@@ -28,7 +28,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.jboss.messaging.core.journal.BufferCallback;
+import org.jboss.messaging.core.asyncio.BufferCallback;
import org.jboss.messaging.core.journal.IOCallback;
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.journal.SequentialFileFactory;
More information about the jboss-cvs-commits
mailing list