You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/07 05:50:51 UTC
svn commit: r961087 [7/7] - in /activemq/sandbox/activemq-apollo-actor: ./
activemq-broker/
activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/
activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/
activemq-broker/src/tes...
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java Wed Jul 7 03:50:42 2010
@@ -24,9 +24,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hawtdb.api.BTreeIndexFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/io/MemoryMappedFile.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/io/MemoryMappedFile.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/io/MemoryMappedFile.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/io/MemoryMappedFile.java Wed Jul 7 03:50:42 2010
@@ -31,7 +31,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import org.apache.activemq.util.IOHelper;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.IOPagingException;
/**
@@ -299,4 +299,4 @@ final public class MemoryMappedFile {
};
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAccessor.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAccessor.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAccessor.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAccessor.java Wed Jul 7 03:50:42 2010
@@ -21,7 +21,7 @@ import java.io.RandomAccessFile;
import java.util.Map;
import org.apache.activemq.util.IOHelper;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.internal.journal.DataFileAppender.WriteCommand;
import org.apache.hawtdb.internal.journal.DataFileAppender.WriteKey;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAppender.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAppender.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAppender.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAppender.java Wed Jul 7 03:50:42 2010
@@ -25,8 +25,8 @@ import java.util.zip.Adler32;
import java.util.zip.Checksum;
import org.apache.activemq.util.IOHelper;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java Wed Jul 7 03:50:42 2010
@@ -36,8 +36,8 @@ import java.util.zip.Adler32;
import java.util.zip.Checksum;
import org.apache.activemq.util.Scheduler;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
import org.apache.activemq.util.list.LinkedNodeList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/ReplicationTarget.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/ReplicationTarget.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/ReplicationTarget.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/ReplicationTarget.java Wed Jul 7 03:50:42 2010
@@ -16,7 +16,7 @@
*/
package org.apache.hawtdb.internal.journal;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
/**
*
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/Extent.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/Extent.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/Extent.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/Extent.java Wed Jul 7 03:50:42 2010
@@ -21,7 +21,7 @@ import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
import org.apache.hawtdb.api.IOPagingException;
import org.apache.hawtdb.api.Paged;
import org.apache.hawtdb.api.Paged.SliceType;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentInputStream.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentInputStream.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentInputStream.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentInputStream.java Wed Jul 7 03:50:42 2010
@@ -20,7 +20,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.Paged;
import org.apache.hawtdb.internal.util.Ranges;
@@ -112,4 +112,4 @@ public class ExtentInputStream extends I
public Ranges getPages() {
return pages;
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentOutputStream.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentOutputStream.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentOutputStream.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentOutputStream.java Wed Jul 7 03:50:42 2010
@@ -19,7 +19,7 @@ package org.apache.hawtdb.internal.page;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.Paged;
import org.apache.hawtdb.internal.util.Ranges;
@@ -101,4 +101,4 @@ public class ExtentOutputStream extends
public Ranges getPages() {
return pages;
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/HawtTransaction.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/HawtTransaction.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/HawtTransaction.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/HawtTransaction.java Wed Jul 7 03:50:42 2010
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.activemq.util.StringSupport;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.Allocator;
import org.apache.hawtdb.api.EncoderDecoder;
import org.apache.hawtdb.api.IOPagingException;
@@ -310,4 +310,4 @@ final class HawtTransaction implements T
parent.flush();
}
-}
\ No newline at end of file
+}
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/PageFile.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/PageFile.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/PageFile.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/PageFile.java Wed Jul 7 03:50:42 2010
@@ -18,7 +18,7 @@ package org.apache.hawtdb.internal.page;
import java.nio.ByteBuffer;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.EncoderDecoder;
import org.apache.hawtdb.api.Paged;
import org.apache.hawtdb.internal.io.MemoryMappedFile;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java Wed Jul 7 03:50:42 2010
@@ -25,8 +25,8 @@ import java.util.Map;
import javolution.io.Struct;
import org.apache.activemq.metric.MetricCounter;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.hawtdb.internal.Benchmarker.BenchmarkAction;
import org.junit.Test;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/BTreeIndexBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/BTreeIndexBenchmark.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/BTreeIndexBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/BTreeIndexBenchmark.java Wed Jul 7 03:50:42 2010
@@ -16,7 +16,7 @@
*/
package org.apache.hawtdb.internal.index;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.activemq.util.marshaller.FixedBufferMarshaller;
import org.apache.activemq.util.marshaller.LongMarshaller;
import org.apache.hawtdb.api.BTreeIndexFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/HashIndexBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/HashIndexBenchmark.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/HashIndexBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/HashIndexBenchmark.java Wed Jul 7 03:50:42 2010
@@ -16,7 +16,7 @@
*/
package org.apache.hawtdb.internal.index;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.activemq.util.marshaller.FixedBufferMarshaller;
import org.apache.activemq.util.marshaller.LongMarshaller;
import org.apache.hawtdb.api.HashIndexFactory;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/IndexBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/IndexBenchmark.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/IndexBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/IndexBenchmark.java Wed Jul 7 03:50:42 2010
@@ -19,7 +19,7 @@ package org.apache.hawtdb.internal.index
import java.io.File;
import java.util.Random;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.Index;
import org.apache.hawtdb.api.OutOfSpaceException;
import org.apache.hawtdb.api.Transaction;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/journal/JournalTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/journal/JournalTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/journal/JournalTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/journal/JournalTest.java Wed Jul 7 03:50:42 2010
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.internal.journal.Journal;
/**
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/ConcurrentPageFileTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/ConcurrentPageFileTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/ConcurrentPageFileTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/ConcurrentPageFileTest.java Wed Jul 7 03:50:42 2010
@@ -30,7 +30,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.EncoderDecoder;
import org.apache.hawtdb.api.IOPagingException;
import org.apache.hawtdb.api.OptimisticUpdateException;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/TransactionBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/TransactionBenchmark.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/TransactionBenchmark.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/TransactionBenchmark.java Wed Jul 7 03:50:42 2010
@@ -18,7 +18,7 @@ package org.apache.hawtdb.internal.page;
import java.util.Random;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.hawtdb.api.Transaction;
import org.apache.hawtdb.internal.Action;
import org.apache.hawtdb.internal.Benchmarker.BenchmarkAction;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java Wed Jul 7 03:50:42 2010
@@ -21,7 +21,7 @@ import java.io.RandomAccessFile;
import java.util.Map;
import org.apache.activemq.util.IOHelper;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
import org.apache.kahadb.journal.DataFileAppender.WriteCommand;
import org.apache.kahadb.journal.DataFileAppender.WriteKey;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java Wed Jul 7 03:50:42 2010
@@ -25,8 +25,8 @@ import java.util.zip.Adler32;
import java.util.zip.Checksum;
import org.apache.activemq.util.IOHelper;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.LinkedNode;
import org.apache.activemq.util.list.LinkedNodeList;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java Wed Jul 7 03:50:42 2010
@@ -28,9 +28,9 @@ import java.util.zip.Adler32;
import java.util.zip.Checksum;
import org.apache.activemq.util.Scheduler;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.LinkedNodeList;
import org.apache.activemq.util.list.Sequence;
import org.apache.commons.logging.Log;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java Wed Jul 7 03:50:42 2010
@@ -16,7 +16,7 @@
*/
package org.apache.kahadb.journal;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.Buffer;
public interface ReplicationTarget {
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java Wed Jul 7 03:50:42 2010
@@ -44,7 +44,7 @@ import java.util.zip.Checksum;
import org.apache.activemq.util.IOHelper;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.LRUCache;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.Sequence;
import org.apache.activemq.util.list.SequenceSet;
import org.apache.commons.logging.Log;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java Wed Jul 7 03:50:42 2010
@@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
import org.apache.activemq.util.list.Sequence;
import org.apache.activemq.util.list.SequenceSet;
import org.apache.activemq.util.marshaller.Marshaller;
Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java Wed Jul 7 03:50:42 2010
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.buffer.Buffer;
public class JournalTest extends TestCase {
protected static final int DEFAULT_MAX_BATCH_SIZE = 1024 * 1024 * 4;