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 2012/11/06 23:04:31 UTC
svn commit: r1406369 [2/2] - in /activemq/trunk:
activemq-core/src/main/java/org/apache/activemq/broker/
activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/
activemq-core/src/main/java/org/apache/activemq/broker/scheduler/
activemq-c...
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNodeList.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNodeList.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNodeList.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LinkedNodeList.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LinkedNodeList.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.util.ArrayList;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LocationMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LocationMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LocationMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LocationMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LocationMarshaller.java Tue Nov 6 22:04:26 2012
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.kahadb.journal.Location;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
public class LocationMarshaller implements Marshaller<Location> {
public final static LocationMarshaller INSTANCE = new LocationMarshaller();
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LongMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LongMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LongMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LongMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/LongMarshaller.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.io.DataInput;
import java.io.DataOutput;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Marshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Marshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Marshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Marshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Marshaller.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.io.DataInput;
import java.io.DataOutput;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/ObjectMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/ObjectMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/ObjectMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/ObjectMarshaller.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Scheduler.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Scheduler.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Scheduler.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Scheduler.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Scheduler.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.util.HashMap;
import java.util.Timer;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SchedulerTimerTask.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SchedulerTimerTask.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SchedulerTimerTask.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SchedulerTimerTask.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SchedulerTimerTask.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.util.TimerTask;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Sequence.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Sequence.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Sequence.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/Sequence.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/Sequence.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
/**
* Represents a range of numbers.
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SequenceSet.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SequenceSet.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SequenceSet.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/SequenceSet.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/SequenceSet.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.io.DataInput;
import java.io.DataOutput;
@@ -33,7 +33,7 @@ import java.util.NoSuchElementException;
*/
public class SequenceSet extends LinkedNodeList<Sequence> implements Iterable<Long> {
- public static class Marshaller implements org.apache.kahadb.util.Marshaller<SequenceSet> {
+ public static class Marshaller implements org.apache.activemq.store.kahadb.disk.util.Marshaller<SequenceSet> {
public static final Marshaller INSTANCE = new Marshaller();
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/StringMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/StringMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/StringMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/StringMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/StringMarshaller.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import java.io.DataInput;
import java.io.DataOutput;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/VariableMarshaller.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/VariableMarshaller.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/VariableMarshaller.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/VariableMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/disk/util/VariableMarshaller.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
/**
* Convenience base class for Marshaller implementations which do not deepCopy and
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PList.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PList.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PList.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PList.java Tue Nov 6 22:04:26 2012
@@ -26,12 +26,12 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.kahadb.index.ListIndex;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.LocationMarshaller;
-import org.apache.kahadb.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.ListIndex;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.util.LocationMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListEntry.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListEntry.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListEntry.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListEntry.java Tue Nov 6 22:04:26 2012
@@ -16,7 +16,7 @@
*/
package org.apache.activemq.store.kahadb.plist;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
public class PListEntry {
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/plist/PListStore.java Tue Nov 6 22:04:26 2012
@@ -34,16 +34,16 @@ import org.apache.activemq.thread.Schedu
import org.apache.activemq.util.IOHelper;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
-import org.apache.kahadb.index.BTreeIndex;
-import org.apache.kahadb.journal.Journal;
-import org.apache.kahadb.journal.Location;
-import org.apache.kahadb.page.Page;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.LockFile;
-import org.apache.kahadb.util.StringMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.index.BTreeIndex;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.journal.Location;
+import org.apache.activemq.store.kahadb.disk.page.Page;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.util.LockFile;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/ByteSequence.java Tue Nov 6 22:04:26 2012
@@ -71,4 +71,35 @@ public class ByteSequence {
}
}
+ public int indexOf(ByteSequence needle, int pos) {
+ int max = length - needle.length;
+ for (int i = pos; i < max; i++) {
+ if (matches(needle, i)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ private boolean matches(ByteSequence needle, int pos) {
+ for (int i = 0; i < needle.length; i++) {
+ if( data[offset + pos+ i] != needle.data[needle.offset + i] ) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private byte getByte(int i) {
+ return data[offset+i];
+ }
+
+ final public int indexOf(byte value, int pos) {
+ for (int i = pos; i < length; i++) {
+ if (data[offset + i] == value) {
+ return i;
+ }
+ }
+ return -1;
+ }
}
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java Tue Nov 6 22:04:26 2012
@@ -16,16 +16,10 @@
*/
package org.apache.activemq.util;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.util.ArrayList;
import java.util.List;
+import java.util.Stack;
/**
*
@@ -107,7 +101,44 @@ public final class IOHelper {
}
return result;
}
-
+
+ public static boolean delete(File top) {
+ boolean result = true;
+ Stack<File> files = new Stack<File>();
+ // Add file to the stack to be processed...
+ files.push(top);
+ // Process all files until none remain...
+ while (!files.isEmpty()) {
+ File file = files.pop();
+ if (file.isDirectory()) {
+ File list[] = file.listFiles();
+ if (list == null || list.length == 0) {
+ // The current directory contains no entries...
+ // delete directory and continue...
+ result &= file.delete();
+ } else {
+ // Add back the directory since it is not empty....
+ // and when we process it again it will be empty and can be
+ // deleted safely...
+ files.push(file);
+ for (File dirFile : list) {
+ if (dirFile.isDirectory()) {
+ // Place the directory on the stack...
+ files.push(dirFile);
+ } else {
+ // This is a simple file, delete it...
+ result &= dirFile.delete();
+ }
+ }
+ }
+ } else {
+ // This is a simple file, delete it...
+ result &= file.delete();
+ }
+ }
+ return result;
+ }
+
public static boolean deleteFile(File fileToDelete) {
if (fileToDelete == null || !fileToDelete.exists()) {
return true;
@@ -153,7 +184,7 @@ public final class IOHelper {
}
public static void copyFile(File src, File dest) throws IOException {
- copyFile(src,dest,null);
+ copyFile(src, dest, null);
}
public static void copyFile(File src, File dest, FilenameFilter filter) throws IOException {
@@ -234,8 +265,8 @@ public final class IOHelper {
}
static {
- MAX_DIR_NAME_LENGTH = Integer.valueOf(System.getProperty("MaximumDirNameLength","200")).intValue();
- MAX_FILE_NAME_LENGTH = Integer.valueOf(System.getProperty("MaximumFileNameLength","64")).intValue();
+ MAX_DIR_NAME_LENGTH = Integer.getInteger("MaximumDirNameLength",200);
+ MAX_FILE_NAME_LENGTH = Integer.getInteger("MaximumFileNameLength",64);
}
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LFUCache.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LFUCache.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LFUCache.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LFUCache.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LFUCache.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.util;
import java.util.Collection;
import java.util.HashMap;
Copied: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java (from r1406368, activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java?p2=activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java&p1=activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/kahadb/util/LockFile.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/LockFile.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.util;
import java.io.File;
import java.io.IOException;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursorTest.java Tue Nov 6 22:04:26 2012
@@ -28,8 +28,8 @@ import org.apache.activemq.command.Activ
import org.apache.activemq.command.MessageId;
import org.apache.activemq.store.kahadb.plist.PList;
import org.apache.activemq.usage.SystemUsage;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.util.ByteSequence;
import org.junit.After;
import org.junit.Test;
import org.slf4j.Logger;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerStoreTest.java Tue Nov 6 22:04:26 2012
@@ -18,7 +18,7 @@ package org.apache.activemq.broker.sched
import junit.framework.TestCase;
import org.apache.activemq.util.IOHelper;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
import java.io.File;
import java.util.ArrayList;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java Tue Nov 6 22:04:26 2012
@@ -26,7 +26,7 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeUnit;
import org.apache.activemq.util.IOHelper;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBFastEnqueueTest.java Tue Nov 6 22:04:26 2012
@@ -33,12 +33,10 @@ import org.apache.activemq.ActiveMQConne
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ConnectionControl;
-import org.apache.activemq.kaha.impl.async.DataFileAppenderTest;
-import org.apache.kahadb.journal.FileAppender;
-import org.apache.kahadb.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.journal.FileAppender;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreRecoveryBrokerTest.java Tue Nov 6 22:04:26 2012
@@ -21,7 +21,6 @@ import org.apache.activemq.broker.Broker
import org.apache.activemq.broker.RecoveryBrokerTest;
import org.apache.activemq.broker.StubConnection;
import org.apache.activemq.command.*;
-import org.apache.kahadb.page.PageFile;
import java.io.File;
import java.io.RandomAccessFile;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/PBMesssagesTest.java Tue Nov 6 22:04:26 2012
@@ -21,14 +21,13 @@ import java.io.IOException;
import junit.framework.TestCase;
import org.apache.activemq.protobuf.Buffer;
-import org.apache.kahadb.journal.Location;
import org.apache.activemq.store.kahadb.data.KahaAddMessageCommand;
import org.apache.activemq.store.kahadb.data.KahaDestination;
import org.apache.activemq.store.kahadb.data.KahaEntryType;
import org.apache.activemq.store.kahadb.data.KahaDestination.DestinationType;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.DataByteArrayInputStream;
-import org.apache.kahadb.util.DataByteArrayOutputStream;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.util.DataByteArrayInputStream;
+import org.apache.activemq.util.DataByteArrayOutputStream;
public class PBMesssagesTest extends TestCase {
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexBenchMark.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexBenchMark.java Tue Nov 6 22:04:26 2012
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
import java.io.IOException;
import java.text.NumberFormat;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
public class BTreeIndexBenchMark extends IndexBenchmark {
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/BTreeIndexTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/BTreeIndexTest.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -32,11 +32,11 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.StringMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexBenchMark.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexBenchMark.java Tue Nov 6 22:04:26 2012
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
public class HashIndexBenchMark extends IndexBenchmark {
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/HashIndexTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/HashIndexTest.java Tue Nov 6 22:04:26 2012
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
-import org.apache.kahadb.index.HashIndex;
-import org.apache.kahadb.index.Index;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
public class HashIndexTest extends IndexTestSupport {
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexBenchmark.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexBenchmark.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
import java.io.File;
import java.io.IOException;
@@ -24,9 +24,9 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
import junit.framework.TestCase;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.IOHelper;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.IOHelper;
/**
* @author chirino
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/IndexTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/IndexTestSupport.java Tue Nov 6 22:04:26 2012
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
import java.io.File;
import java.io.IOException;
import junit.framework.TestCase;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.util.IOHelper;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.page.Transaction;
+import org.apache.activemq.util.IOHelper;
/**
* Test a HashIndex
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/index/ListIndexTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/index/ListIndexTest.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.index;
+package org.apache.activemq.store.kahadb.disk.index;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -30,12 +30,12 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Random;
-import org.apache.kahadb.page.PageFile;
-import org.apache.kahadb.util.LongMarshaller;
-import org.apache.kahadb.util.Sequence;
-import org.apache.kahadb.util.SequenceSet;
-import org.apache.kahadb.util.StringMarshaller;
-import org.apache.kahadb.util.VariableMarshaller;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.util.LongMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.Sequence;
+import org.apache.activemq.store.kahadb.disk.util.SequenceSet;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.VariableMarshaller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/journal/JournalTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/journal/JournalTest.java Tue Nov 6 22:04:26 2012
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.journal;
+package org.apache.activemq.store.kahadb.disk.journal;
import java.io.File;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
-import org.apache.kahadb.journal.Journal;
-import org.apache.kahadb.util.ByteSequence;
-import org.apache.kahadb.util.IOHelper;
+import org.apache.activemq.util.ByteSequence;
+import org.apache.activemq.util.IOHelper;
public class JournalTest extends TestCase {
protected static final int DEFAULT_MAX_BATCH_SIZE = 1024 * 1024 * 4;
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/page/PageFileTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/page/PageFileTest.java Tue Nov 6 22:04:26 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kahadb.page;
+package org.apache.activemq.store.kahadb.disk.page;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -24,7 +24,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.HashSet;
-import org.apache.kahadb.util.StringMarshaller;
+import org.apache.activemq.store.kahadb.disk.util.StringMarshaller;
import junit.framework.TestCase;
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java (from r1406368, activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java&r1=1406368&r2=1406369&rev=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/kahadb/util/SequenceSetTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/disk/util/SequenceSetTest.java Tue Nov 6 22:04:26 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kahadb.util;
+package org.apache.activemq.store.kahadb.disk.util;
import static org.junit.Assert.*;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/plist/PListTest.java Tue Nov 6 22:04:26 2012
@@ -32,7 +32,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.util.IOHelper;
-import org.apache.kahadb.util.ByteSequence;
+import org.apache.activemq.util.ByteSequence;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java Tue Nov 6 22:04:26 2012
@@ -17,11 +17,9 @@
package org.apache.activemq.usecases;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Random;
import java.util.HashSet;
-import java.util.Vector;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -46,8 +44,8 @@ import org.apache.activemq.command.Messa
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.util.Wait;
-import org.apache.kahadb.journal.Journal;
-import org.apache.kahadb.page.PageFile;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
+import org.apache.activemq.store.kahadb.disk.page.PageFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala?rev=1406369&r1=1406368&r2=1406369&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala (original)
+++ activemq/trunk/activemq-leveldb/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala Tue Nov 6 22:04:26 2012
@@ -35,7 +35,6 @@ import concurrent.CountDownLatch
import javax.management.ObjectName
import org.apache.activemq.broker.jmx.AnnotatedMBean
import org.apache.activemq.util._
-import org.apache.kahadb.util.LockFile
import org.apache.activemq.leveldb.util.{RetrySupport, FileSupport, Log}
object LevelDBStore extends Log {