activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961087 [2/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...
Date Wed, 07 Jul 2010 03:50:51 GMT
Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/RootEntity.java
(from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/RootEntity.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/RootEntity.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/RootEntity.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/RootEntity.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/RootEntity.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/RootEntity.java
Wed Jul  7 03:50:42 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.*;
 import java.util.*;
@@ -25,13 +25,13 @@ import org.apache.activemq.broker.store.
 import org.apache.activemq.broker.store.Store.KeyNotFoundException;
 import org.apache.activemq.broker.store.Store.QueueQueryResult;
 import org.apache.activemq.broker.store.Store.SubscriptionRecord;
-import org.apache.activemq.broker.store.kahadb.Data.MessageAdd;
-import org.apache.activemq.broker.store.kahadb.Data.SubscriptionAdd;
-import org.apache.activemq.broker.store.kahadb.Data.SubscriptionAdd.SubscriptionAddBuffer;
-import org.apache.activemq.protobuf.InvalidProtocolBufferException;
+import org.apache.activemq.broker.store.hawtdb.Data.MessageAdd;
+import org.apache.activemq.broker.store.hawtdb.Data.SubscriptionAdd;
+import org.apache.activemq.broker.store.hawtdb.Data.SubscriptionAdd.SubscriptionAddBuffer;
+import org.fusesource.hawtbuf.proto.InvalidProtocolBufferException;
 import org.fusesource.hawtdb.api.*;
 import org.fusesource.hawtdb.internal.journal.Location;
-import org.apache.activemq.util.buffer.*;
+import org.fusesource.hawtbuf.*;
 import org.fusesource.hawtdb.util.marshaller.LongMarshaller;
 import org.fusesource.hawtdb.util.marshaller.IntegerMarshaller;
 import org.fusesource.hawtdb.util.marshaller.LocationMarshaller;
@@ -105,7 +105,7 @@ public class RootEntity {
         private SortedIndex<AsciiBuffer, Integer> mapIndex;
 
         public void create(Transaction tx) {
-            state = KahaDBStore.CLOSED_STATE;
+            state = HawtDBStore.CLOSED_STATE;
             messageKeyIndex = messageKeyIndexFactory.create(tx, tx.alloc());
             if (USE_LOC_INDEX)
                 locationIndex = locationIndexFactory.create(tx, tx.alloc());
@@ -757,4 +757,4 @@ public class RootEntity {
 
     }
 
-}
\ No newline at end of file
+}

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/hawtdb-data.proto
(from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/kahadb-data.proto)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/hawtdb-data.proto?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/hawtdb-data.proto&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/kahadb-data.proto&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/kahadb-data.proto
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/hawtdb-data.proto
Wed Jul  7 03:50:42 2010
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 option java_multiple_files = false;
 option java_outer_classname = "Data";

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/hawtdb
(from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/hawtdb?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/hawtdb&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/hawtdb
Wed Jul  7 03:50:42 2010
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-class=org.apache.activemq.broker.store.kahadb.KahaDBStore
\ No newline at end of file
+class=org.apache.activemq.broker.store.hawtdb.HawtDBStore
\ No newline at end of file

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java
(from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStorePerformance.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStorePerformance.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStorePerformance.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java
Wed Jul  7 03:50:42 2010
@@ -14,18 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.File;
 
 import org.apache.activemq.broker.store.Store;
 import org.apache.activemq.broker.store.StorePerformanceBase;
+import org.apache.activemq.broker.store.hawtdb.HawtDBStore;
 
-public class KahaDBStorePerformance extends StorePerformanceBase {
+public class HawtDBStorePerformance extends StorePerformanceBase {
 
     @Override
     protected Store createStore() {
-        KahaDBStore rc = new KahaDBStore();
+        HawtDBStore rc = new HawtDBStore();
         rc.setStoreDirectory(new File("target/test-data/kahadb-store-performance"));
         rc.setDeleteAllMessages(true);
         return rc;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.java
(from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStoreTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStoreTest.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStoreTest.java
(original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.java
Wed Jul  7 03:50:42 2010
@@ -14,18 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.File;
 
 import org.apache.activemq.broker.store.Store;
 import org.apache.activemq.broker.store.StoreTestBase;
+import org.apache.activemq.broker.store.hawtdb.HawtDBStore;
 
-public class KahaDBStoreTest extends StoreTestBase {
+public class HawtDBStoreTest extends StoreTestBase {
 
     @Override
     protected Store createStore(boolean delete) {
-        KahaDBStore rc = new KahaDBStore();
+        HawtDBStore rc = new HawtDBStore();
         rc.setStoreDirectory(new File("target/test-data/kahadb-store-test"));
         rc.setDeleteAllMessages(delete);
         return rc;



Mime
View raw message