svn commit: r713435 - in /activemq/sandbox/kahadb/src/main/java/org/apache/kahadb: replication/ReplicationMaster.java replication/transport/KDBRWireFormat.java store/KahaDBStore.java

[chirino]

Author: chirino
Date: Wed Nov 12 09:48:40 2008
New Revision: 713435

URL: http://svn.apache.org/viewvc?rev=713435&view=rev
Log:
Updated to pickup recent activemq-protobuf changes

Modified:
    
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/ReplicationMaster.java
    
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/transport/KDBRWireFormat.java
    
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBStore.java

Modified: 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/ReplicationMaster.java
URL: 
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/ReplicationMaster.java?rev=713435&r1=713434&r2=713435&view=diff
==============================================================================
--- 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/ReplicationMaster.java
 (original)
+++ 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/ReplicationMaster.java
 Wed Nov 12 09:48:40 2008
@@ -31,6 +31,7 @@
 import java.util.zip.Checksum;
 
 import org.apache.activemq.Service;
+import org.apache.activemq.protobuf.ByteString;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportAcceptListener;
 import org.apache.activemq.transport.TransportFactory;
@@ -52,8 +53,6 @@
 import org.apache.kahadb.store.KahaDBStore;
 import org.apache.kahadb.util.ByteSequence;
 
-import com.google.protobuf.ByteString;
-
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
 public class ReplicationMaster implements Service, ClusterListener, 
ReplicationTarget {

Modified: 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/transport/KDBRWireFormat.java
URL: 
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/transport/KDBRWireFormat.java?rev=713435&r1=713434&r2=713435&view=diff
==============================================================================
--- 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/transport/KDBRWireFormat.java
 (original)
+++ 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/replication/transport/KDBRWireFormat.java
 Wed Nov 12 09:48:40 2008
@@ -22,6 +22,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import org.apache.activemq.protobuf.InvalidProtocolBufferException;
 import org.apache.activemq.protobuf.Message;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
@@ -33,8 +34,6 @@
 import org.apache.kahadb.replication.pb.PBSlaveInit;
 import org.apache.kahadb.replication.pb.PBSlaveInitResponse;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
 public class KDBRWireFormat implements WireFormat {
 
        private int version;

Modified: 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBStore.java
URL: 
http://svn.apache.org/viewvc/activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBStore.java?rev=713435&r1=713434&r2=713435&view=diff
==============================================================================
--- 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBStore.java 
(original)
+++ 
activemq/sandbox/kahadb/src/main/java/org/apache/kahadb/store/KahaDBStore.java 
Wed Nov 12 09:48:40 2008
@@ -39,6 +39,7 @@
 import org.apache.activemq.command.TransactionId;
 import org.apache.activemq.command.XATransactionId;
 import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.protobuf.ByteString;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.PersistenceAdapter;
@@ -51,7 +52,6 @@
 import org.apache.activemq.wireformat.WireFormat;
 import org.apache.kahadb.journal.Location;
 import org.apache.kahadb.page.Transaction;
-import org.apache.kahadb.replication.pb.PBJournalLocation;
 import org.apache.kahadb.store.data.KahaAddMessageCommand;
 import org.apache.kahadb.store.data.KahaCommitCommand;
 import org.apache.kahadb.store.data.KahaDestination;
@@ -66,8 +66,6 @@
 import org.apache.kahadb.store.data.KahaXATransactionId;
 import org.apache.kahadb.store.data.KahaDestination.DestinationType;
 
-import com.google.protobuf.ByteString;
-
 public class KahaDBStore extends MessageDatabase implements PersistenceAdapter 
{
 
     private WireFormat wireFormat = new OpenWireFormat();