activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1052003 - in /activemq/activemq-apollo/trunk: ./ apollo-bdb/ apollo-broker/ apollo-broker/src/main/scala/org/apache/activemq/apollo/store/ apollo-broker/src/test/scala/org/apache/activemq/apollo/store/ apollo-cassandra/ apollo-hawtdb/ apol...
Date Wed, 22 Dec 2010 17:34:26 GMT
Author: chirino
Date: Wed Dec 22 17:34:25 2010
New Revision: 1052003

URL: http://svn.apache.org/viewvc?rev=1052003&view=rev
Log:
consolidated the apollo-store module into the apollo-broker module since it's not optional
to the broker and is only used by the broker.

Added:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
      - copied, changed from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
Removed:
    activemq/activemq-apollo/trunk/apollo-store/pom.xml
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
    activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java
    activemq/activemq-apollo/trunk/apollo-store/src/test/ide-resources/log4j.properties
    activemq/activemq-apollo/trunk/apollo-store/src/test/resources/log4j.properties
    activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
    activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
Modified:
    activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1052003&r1=1052002&r2=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Wed Dec 22 17:34:25 2010
@@ -36,7 +36,7 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
 
@@ -98,7 +98,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1052003&r1=1052002&r2=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Wed Dec 22 17:34:25 2010
@@ -36,12 +36,12 @@
   
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-transport</artifactId>
+      <artifactId>apollo-dto</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-transport</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
Wed Dec 22 17:34:25 2010
@@ -1,3 +1,5 @@
+package org.apache.activemq.apollo.store
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store
-
 import collection.mutable.ListBuffer
 import java.util.HashMap
 import collection.Seq
@@ -342,4 +342,4 @@ trait DelayingStoreSupport extends Store
     }
   }
 
-}
+}
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/Store.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala
Wed Dec 22 17:34:25 2010
@@ -1,3 +1,5 @@
+package org.apache.activemq.apollo.store
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store
-
 import org.apache.activemq.apollo.dto.{StoreStatusDTO, StoreDTO}
 import org.apache.activemq.apollo.util._
 import ReporterLevel._
@@ -46,7 +46,7 @@ trait Store extends ServiceTrait {
 
   /**
    * Supplies configuration data to the Store.  This will be called
-   * before the store is started, but may also occur after the the Store 
+   * before the store is started, but may also occur after the the Store
    * is started.
    */
   def configure(config: StoreDTO, reporter:Reporter):Unit
@@ -63,7 +63,7 @@ trait Store extends ServiceTrait {
 
   /**
    * Adds a queue.
-   * 
+   *
    * This method auto generates and assigns the key field of the queue record and
    * returns true if it succeeded.
    */
@@ -110,4 +110,4 @@ trait Store extends ServiceTrait {
    */
   def loadMessage(messageKey:Long)(callback:(Option[MessageRecord])=>Unit )
 
-}
+}
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
Wed Dec 22 17:34:25 2010
@@ -1,3 +1,5 @@
+package org.apache.activemq.apollo.store
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store
-
 import org.apache.activemq.apollo.dto.StoreDTO
 import org.apache.activemq.apollo.util._
 import ReporterLevel._

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
Wed Dec 22 17:34:25 2010
@@ -1,3 +1,5 @@
+package org.apache.activemq.apollo.store
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store
-
 import org.fusesource.hawtdispatch.{Retained}
 import org.apache.activemq.apollo.store._
 

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java&p1=activemq/activemq-apollo/trunk/apollo-store/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala&p1=activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
Wed Dec 22 17:34:25 2010
@@ -1,3 +1,5 @@
+package org.apache.activemq.apollo.store
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store
-
 import org.fusesource.hawtbuf.AsciiBuffer._
 import org.fusesource.hawtdispatch._
 import org.fusesource.hawtdispatch.TaskTracker
@@ -182,7 +182,7 @@ abstract class StoreBenchmarkSupport ext
   }
 
   def loadMessages(queue:Long, messageKeys: List[Long]) = {
-    
+
     var keys = messageKeys.toList
     val metric = benchmarkCount(keys.size) {
       val latch = new CountDownLatch(1)
@@ -253,4 +253,4 @@ abstract class StoreBenchmarkSupport ext
     val endT = System.nanoTime();
     Metric(iterations, endT-startT)
   }
-}
+}
\ No newline at end of file

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
(from r1051695, activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala&p1=activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala&r1=1051695&r2=1052003&rev=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-store/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
Wed Dec 22 17:34:25 2010
@@ -1,3 +1,5 @@
+package org.apache.activemq.apollo.store
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store
-
 import org.fusesource.hawtbuf.AsciiBuffer._
 import org.fusesource.hawtdispatch._
 import org.fusesource.hawtdispatch.TaskTracker
@@ -207,4 +207,4 @@ abstract class StoreFunSuiteSupport exte
   }
 
 
-}
+}
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml?rev=1052003&r1=1052002&r2=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml Wed Dec 22 17:34:25 2010
@@ -43,7 +43,7 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     
@@ -89,7 +89,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml?rev=1052003&r1=1052002&r2=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml Wed Dec 22 17:34:25 2010
@@ -36,7 +36,7 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     
@@ -92,7 +92,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apollo-store</artifactId>
+      <artifactId>apollo-broker</artifactId>
       <version>1.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>

Modified: activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java?rev=1052003&r1=1052002&r2=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java
(original)
+++ activemq/activemq-apollo/trunk/apollo-selector/src/test/java/org/apache/activemq/apollo/selector/SelectorTest.java
Wed Dec 22 17:34:25 2010
@@ -27,6 +27,7 @@ import org.apache.activemq.apollo.filter
 /**
  * @version $Revision: 1.7 $
  */
+@SuppressWarnings("unchecked")
 public class SelectorTest extends TestCase {
 		
     class MockMessage implements Filterable {

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1052003&r1=1052002&r2=1052003&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Wed Dec 22 17:34:25 2010
@@ -150,8 +150,7 @@
     <module>apollo-scala</module>
     <module>apollo-util</module>
     <module>apollo-transport</module>
-    <module>apollo-store</module>
-    <!-- <module>apollo-cassandra</module> -->
+    <module>apollo-cassandra</module>
     <module>apollo-broker</module>
     <module>apollo-selector</module>
     <module>apollo-tcp</module>



Mime
View raw message