Author: rajdavies
Date: Mon Sep 8 08:45:15 2008
New Revision: 693138
URL: http://svn.apache.org/viewvc?rev=693138&view=rev
Log:
remove backport.concurrent imports
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBPersistenceAdaptor.java
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/MessageDatabase.java
Modified:
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBPersistenceAdaptor.java
URL:
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBPersistenceAdaptor.java?rev=693138&r1=693137&r2=693138&view=diff
==============================================================================
---
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBPersistenceAdaptor.java
(original)
+++
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBPersistenceAdaptor.java
Mon Sep 8 08:45:15 2008
@@ -16,20 +16,14 @@
*/
package org.apache.kahadb.store;
-import com.google.protobuf.ByteString;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-
import java.io.DataInputStream;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.StringTokenizer;
import java.util.Map.Entry;
-
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
@@ -54,14 +48,8 @@
import org.apache.activemq.usage.SystemUsage;
import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.wireformat.WireFormat;
-import org.apache.kahadb.StringMarshaller;
-import org.apache.kahadb.index.BTreeIndex;
import org.apache.kahadb.journal.Location;
import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.store.MessageDatabase.AddOpperation;
-import org.apache.kahadb.store.MessageDatabase.LocationMarshaller;
-import org.apache.kahadb.store.MessageDatabase.Operation;
-import org.apache.kahadb.store.MessageDatabase.StoredDestination;
import org.apache.kahadb.store.data.KahaAddMessageCommand;
import org.apache.kahadb.store.data.KahaCommitCommand;
import org.apache.kahadb.store.data.KahaDestination;
@@ -71,10 +59,11 @@
import org.apache.kahadb.store.data.KahaRemoveDestinationCommand;
import org.apache.kahadb.store.data.KahaRemoveMessageCommand;
import org.apache.kahadb.store.data.KahaRollbackCommand;
-import org.apache.kahadb.store.data.KahaTransactionInfo;
import org.apache.kahadb.store.data.KahaSubscriptionCommand;
+import org.apache.kahadb.store.data.KahaTransactionInfo;
import org.apache.kahadb.store.data.KahaXATransactionId;
import org.apache.kahadb.store.data.KahaDestination.DestinationType;
+import com.google.protobuf.ByteString;
public class KahaDBPersistenceAdaptor extends MessageDatabase implements
PersistenceAdapter {
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=693138&r1=693137&r2=693138&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
Mon Sep 8 08:45:15 2008
@@ -16,8 +16,6 @@
*/
package org.apache.kahadb.store;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.File;
@@ -34,6 +32,7 @@
import java.util.List;
import java.util.TreeMap;
import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.command.LocalTransactionId;
