Author: chirino
Date: Wed Nov 12 08:39:40 2008
New Revision: 713421
URL: http://svn.apache.org/viewvc?rev=713421&view=rev
Log:
Doing some cleanup.
Added:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
(contents, props changed)
- copied, changed from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/BytesMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
(contents, props changed)
- copied, changed from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/IntegerMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
(contents, props changed)
- copied, changed from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/LongMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
(contents, props changed)
- copied, changed from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Marshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
(contents, props changed)
- copied, changed from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/ObjectMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
(contents, props changed)
- copied, changed from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/StringMarshaller.java
Removed:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Accessor.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/BytesMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Container.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Extent.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/IntegerMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/LongMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Marshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/ObjectMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Store.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/StringMarshaller.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Transaction.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/ha/
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/Index.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Page.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/MessageDatabase.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
Wed Nov 12 08:39:40 2008
@@ -28,11 +28,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.kahadb.Marshaller;
import org.apache.kahadb.page.Page;
import org.apache.kahadb.page.PageFile;
import org.apache.kahadb.page.Transaction;
import org.apache.kahadb.page.Transaction.Closure;
+import org.apache.kahadb.util.Marshaller;
/**
* BTreeIndex represents a Variable Magnitude B+Tree in a Page File.
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
Wed Nov 12 08:39:40 2008
@@ -144,7 +144,7 @@
* @param <Key>
* @param <Value>
*/
- static public class Marshaller<Key,Value> implements
org.apache.kahadb.Marshaller<BTreeNode<Key,Value>> {
+ static public class Marshaller<Key,Value> implements
org.apache.kahadb.util.Marshaller<BTreeNode<Key,Value>> {
private final BTreeIndex<Key,Value> index;
public Marshaller(BTreeIndex<Key,Value> index) {
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
--- activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java
(original)
+++ activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashBin.java
Wed Nov 12 08:39:40 2008
@@ -35,7 +35,7 @@
class HashBin<Key, Value> {
- static public class Marshaller<Key, Value> implements
org.apache.kahadb.Marshaller<HashBin<Key, Value>> {
+ static public class Marshaller<Key, Value> implements
org.apache.kahadb.util.Marshaller<HashBin<Key, Value>> {
private final HashIndex<Key, Value> hashIndex;
public Marshaller(HashIndex<Key, Value> index) {
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/HashIndex.java
Wed Nov 12 08:39:40 2008
@@ -26,11 +26,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.kahadb.Marshaller;
import org.apache.kahadb.page.Page;
import org.apache.kahadb.page.PageFile;
import org.apache.kahadb.page.Transaction;
import org.apache.kahadb.page.Transaction.Closure;
+import org.apache.kahadb.util.Marshaller;
/**
* BTree implementation
@@ -105,7 +105,7 @@
os.writeInt(binsActive);
}
- static class Marshaller implements
org.apache.kahadb.Marshaller<Metadata> {
+ static class Marshaller implements
org.apache.kahadb.util.Marshaller<Metadata> {
public Class<Metadata> getType() {
return Metadata.class;
}
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/Index.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/Index.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
--- activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/Index.java
(original)
+++ activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/index/Index.java
Wed Nov 12 08:39:40 2008
@@ -20,8 +20,8 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.kahadb.Marshaller;
import org.apache.kahadb.page.Transaction;
+import org.apache.kahadb.util.Marshaller;
/**
* Simpler than a Map
Modified: activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Page.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Page.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
--- activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Page.java
(original)
+++ activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Page.java Wed
Nov 12 08:39:40 2008
@@ -23,10 +23,10 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.kahadb.Marshaller;
import org.apache.kahadb.util.ByteSequence;
import org.apache.kahadb.util.DataByteArrayInputStream;
import org.apache.kahadb.util.DataByteArrayOutputStream;
+import org.apache.kahadb.util.Marshaller;
/**
* A Page within a file.
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
Wed Nov 12 08:39:40 2008
@@ -27,11 +27,11 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.kahadb.Marshaller;
import org.apache.kahadb.page.PageFile.PageWrite;
import org.apache.kahadb.util.ByteSequence;
import org.apache.kahadb.util.DataByteArrayInputStream;
import org.apache.kahadb.util.DataByteArrayOutputStream;
+import org.apache.kahadb.util.Marshaller;
import org.apache.kahadb.util.Sequence;
import org.apache.kahadb.util.SequenceSet;
@@ -423,7 +423,7 @@
/**
* @see
org.apache.kahadb.page.Transaction#load(org.apache.kahadb.page.Page,
- * org.apache.kahadb.Marshaller)
+ * org.apache.kahadb.util.Marshaller)
*/
public InputStream openInputStream(final Page p) throws IOException {
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/MessageDatabase.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/MessageDatabase.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/MessageDatabase.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/MessageDatabase.java
Wed Nov 12 08:39:40 2008
@@ -41,9 +41,6 @@
import org.apache.activemq.util.Callback;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.kahadb.LongMarshaller;
-import org.apache.kahadb.Marshaller;
-import org.apache.kahadb.StringMarshaller;
import org.apache.kahadb.index.BTreeIndex;
import org.apache.kahadb.index.BTreeVisitor;
import org.apache.kahadb.journal.Journal;
@@ -68,6 +65,9 @@
import org.apache.kahadb.util.ByteSequence;
import org.apache.kahadb.util.DataByteArrayInputStream;
import org.apache.kahadb.util.DataByteArrayOutputStream;
+import org.apache.kahadb.util.LongMarshaller;
+import org.apache.kahadb.util.Marshaller;
+import org.apache.kahadb.util.StringMarshaller;
public class MessageDatabase {
Copied:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
(from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/BytesMarshaller.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java?p2=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java&p1=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/BytesMarshaller.java&r1=712226&r2=713421&rev=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/BytesMarshaller.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
Wed Nov 12 08:39:40 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb;
+package org.apache.kahadb.util;
import java.io.DataInput;
import java.io.DataOutput;
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
(from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/IntegerMarshaller.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java?p2=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java&p1=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/IntegerMarshaller.java&r1=712226&r2=713421&rev=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/IntegerMarshaller.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
Wed Nov 12 08:39:40 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb;
+package org.apache.kahadb.util;
import java.io.DataInput;
import java.io.DataOutput;
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
(from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/LongMarshaller.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java?p2=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java&p1=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/LongMarshaller.java&r1=712226&r2=713421&rev=713421&view=diff
==============================================================================
--- activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/LongMarshaller.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
Wed Nov 12 08:39:40 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb;
+package org.apache.kahadb.util;
import java.io.DataInput;
import java.io.DataOutput;
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
(from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Marshaller.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java?p2=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java&p1=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Marshaller.java&r1=712226&r2=713421&rev=713421&view=diff
==============================================================================
--- activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/Marshaller.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
Wed Nov 12 08:39:40 2008
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb;
+package org.apache.kahadb.util;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
/**
- *Marshaller for marshalling in/out objects to a RawContainer
+ * Marshaller for marshalling in/out objects to a RawContainer
*
* @version $Revision$
*/
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
(from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/ObjectMarshaller.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java?p2=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java&p1=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/ObjectMarshaller.java&r1=712226&r2=713421&rev=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/ObjectMarshaller.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
Wed Nov 12 08:39:40 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb;
+package org.apache.kahadb.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/SequenceSet.java
Wed Nov 12 08:39:40 2008
@@ -32,7 +32,7 @@
*/
public class SequenceSet extends LinkedNodeList<Sequence> {
- public static class Marshaller implements
org.apache.kahadb.Marshaller<SequenceSet> {
+ public static class Marshaller implements
org.apache.kahadb.util.Marshaller<SequenceSet> {
public static final Marshaller INSTANCE = new Marshaller();
Copied:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
(from r712226,
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/StringMarshaller.java)
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java?p2=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java&p1=activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/StringMarshaller.java&r1=712226&r2=713421&rev=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/StringMarshaller.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
Wed Nov 12 08:39:40 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb;
+package org.apache.kahadb.util;
import java.io.DataInput;
import java.io.DataOutput;
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
(original)
+++
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java
Wed Nov 12 08:39:40 2008
@@ -19,9 +19,9 @@
import java.io.IOException;
import java.text.NumberFormat;
-import org.apache.kahadb.LongMarshaller;
-import org.apache.kahadb.StringMarshaller;
import org.apache.kahadb.page.Transaction;
+import org.apache.kahadb.util.LongMarshaller;
+import org.apache.kahadb.util.StringMarshaller;
public class BTreeIndexBenchMark extends IndexBenchmark {
Modified:
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
(original)
+++
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java
Wed Nov 12 08:39:40 2008
@@ -22,10 +22,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.kahadb.LongMarshaller;
-import org.apache.kahadb.StringMarshaller;
import org.apache.kahadb.index.BTreeIndex;
import org.apache.kahadb.index.Index;
+import org.apache.kahadb.util.LongMarshaller;
+import org.apache.kahadb.util.StringMarshaller;
public class BTreeIndexTest extends IndexTestSupport {
Modified:
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
(original)
+++
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java
Wed Nov 12 08:39:40 2008
@@ -16,9 +16,9 @@
*/
package org.apache.kahadb.index;
-import org.apache.kahadb.LongMarshaller;
-import org.apache.kahadb.StringMarshaller;
import org.apache.kahadb.page.Transaction;
+import org.apache.kahadb.util.LongMarshaller;
+import org.apache.kahadb.util.StringMarshaller;
public class HashIndexBenchMark extends IndexBenchmark {
Modified:
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java
(original)
+++
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/index/HashIndexTest.java
Wed Nov 12 08:39:40 2008
@@ -16,10 +16,10 @@
*/
package org.apache.kahadb.index;
-import org.apache.kahadb.LongMarshaller;
-import org.apache.kahadb.StringMarshaller;
import org.apache.kahadb.index.HashIndex;
import org.apache.kahadb.index.Index;
+import org.apache.kahadb.util.LongMarshaller;
+import org.apache.kahadb.util.StringMarshaller;
public class HashIndexTest extends IndexTestSupport {
Modified:
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java?rev=713421&r1=713420&r2=713421&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java
(original)
+++
activemq/sandbox/kahadb/src/test/java/org/apache/kahadb/page/PageFileTest.java
Wed Nov 12 08:39:40 2008
@@ -24,7 +24,7 @@
import java.io.OutputStream;
import java.util.HashSet;
-import org.apache.kahadb.StringMarshaller;
+import org.apache.kahadb.util.StringMarshaller;
import junit.framework.TestCase;
