activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1052004 [1/2] - in /activemq/activemq-apollo/trunk: apollo-bdb/src/main/proto/ apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/ apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/ apollo-bdb/src/main...
Date Wed, 22 Dec 2010 17:36:57 GMT
Author: chirino
Date: Wed Dec 22 17:36:52 2010
New Revision: 1052004

URL: http://svn.apache.org/viewvc?rev=1052004&view=rev
Log:
renamed the apollo.store package to apollo.broker.store

Added:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/bdb/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/bdb/dto/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/bdb/dto/jaxb.index
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/store/bdb/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBClient.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBClient.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStore.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreFactory.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/HelperTrait.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/HelperTrait.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/package-info.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/package-info.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/bdb/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/bdb/dto/
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.jade
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/store/bdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreBenchmark.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreBenchmark.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreTest.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreTest.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/dto/
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/dto/XmlCodecTest.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/dto/XmlCodecTest.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/MessageRecord.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRange.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRecord.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueRecord.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueStatus.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/Store.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreFactory.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreUOW.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/SubscriptionRecord.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreBenchmarkSupport.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/jaxb.index
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/package-info.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/package-info.java
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraClient.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStore.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreFactory.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/Schema.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/dto/CassandraStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/log4j.properties
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraServerMixin.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreTest.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/XmlCodecTest.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/dto/XmlCodecTest.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/jaxb.index
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBClient.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPool.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPoolFactory.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolFactory.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStore.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreFactory.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/Helpers.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/package-info.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreBenchmark.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreTest.scala
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/XmlCodecTest.java
      - copied, changed from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java
Removed:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/store/bdb/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBClient.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/HelperTrait.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/package-info.java
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/store/bdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreBenchmark.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreTest.scala
    activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/dto/XmlCodecTest.java
    activemq/activemq-apollo/trunk/apollo-broker/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
    activemq/activemq-apollo/trunk/apollo-broker/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
    activemq/activemq-apollo/trunk/apollo-broker/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
    activemq/activemq-apollo/trunk/apollo-broker/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
    activemq/activemq-apollo/trunk/apollo-broker/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
    activemq/activemq-apollo/trunk/apollo-broker/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
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/package-info.java
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/dto/CassandraStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/dto/XmlCodecTest.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolFactory.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java
Modified:
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/proto/data.proto
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
    activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/MultiProtocol.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/ProtocolFactory.scala
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/proto/data.proto
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
    activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
    activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/log4j.properties
    activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/log4j.properties
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/proto/data.proto
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pool-factory.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
    activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/main/proto/data.proto
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/proto/data.proto?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/proto/data.proto (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/proto/data.proto Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-package org.apache.activemq.apollo.store.bdb.model;
+package org.apache.activemq.apollo.broker.store.bdb.model;
 
 option java_multiple_files = true;
 

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index Wed Dec 22 17:36:52 2010
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.apache.activemq.apollo.store.bdb.BDBStoreFactory
\ No newline at end of file
+org.apache.activemq.apollo.broker.store.bdb.BDBStoreFactory

Modified: activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index Wed Dec 22 17:36:52 2010
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.apache.activemq.apollo.store.bdb.dto
\ No newline at end of file
+org.apache.activemq.apollo.broker.store.bdb.dto

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/bdb/dto/jaxb.index (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/store/bdb/dto/jaxb.index)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/bdb/dto/jaxb.index?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/broker/store/bdb/dto/jaxb.index&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/resources/org/apache/activemq/apollo/store/bdb/dto/jaxb.index&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBClient.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBClient.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBClient.scala?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBClient.scala&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBClient.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBClient.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBClient.scala Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb
+package org.apache.activemq.apollo.broker.store.bdb
 
 import dto.BDBStoreDTO
 import java.{lang=>jl}
@@ -22,7 +22,7 @@ import java.{util=>ju}
 
 import java.util.concurrent.atomic.AtomicInteger
 import collection.mutable.ListBuffer
-import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.broker.store._
 import org.apache.activemq.apollo.util._
 import com.sleepycat.je._
 
@@ -384,4 +384,4 @@ class BDBClient(store: BDBStore) extends
     }
   }
 
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStore.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStore.scala?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStore.scala&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStore.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStore.scala Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb
+package org.apache.activemq.apollo.broker.store.bdb
 
 import dto.{BDBStoreDTO, BDBStoreStatusDTO}
 import java.util.concurrent.atomic.AtomicLong
@@ -22,7 +22,7 @@ import collection.Seq
 import org.fusesource.hawtdispatch._
 import java.io.File
 import java.util.concurrent._
-import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.broker.store._
 import org.apache.activemq.apollo.util._
 import ReporterLevel._
 import org.fusesource.hawtdispatch.ListEventAggregator

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreFactory.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStoreFactory.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreFactory.scala?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreFactory.scala&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStoreFactory.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/BDBStoreFactory.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreFactory.scala Wed Dec 22 17:36:52 2010
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb
+package org.apache.activemq.apollo.broker.store.bdb
 
 import dto.BDBStoreDTO
-import org.apache.activemq.apollo.store.StoreFactory
+import org.apache.activemq.apollo.broker.store.StoreFactory
 import org.apache.activemq.apollo.dto.StoreDTO
 import org.apache.activemq.apollo.util._
 import ReporterLevel._
@@ -51,4 +51,4 @@ class BDBStoreFactory extends StoreFacto
        null
      }
    }
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/HelperTrait.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/HelperTrait.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/HelperTrait.scala?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/HelperTrait.scala&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/HelperTrait.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/HelperTrait.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/HelperTrait.scala Wed Dec 22 17:36:52 2010
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb
+package org.apache.activemq.apollo.broker.store.bdb
 
 import model._
-import org.apache.activemq.apollo.store.{MessageRecord, QueueRecord, QueueEntryRecord}
+import org.apache.activemq.apollo.broker.store.{MessageRecord, QueueRecord, QueueEntryRecord}
 import java.util.Comparator
 import java.nio.ByteBuffer
 import com.sleepycat.je._

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreDTO.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreDTO.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreDTO.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb.dto;
+package org.apache.activemq.apollo.broker.store.bdb.dto;
 
 import org.apache.activemq.apollo.dto.StoreDTO;
 

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb.dto;
+package org.apache.activemq.apollo.broker.store.bdb.dto;
 
 import org.apache.activemq.apollo.dto.IntMetricDTO;
 import org.apache.activemq.apollo.dto.StoreStatusDTO;
@@ -41,4 +41,4 @@ public class BDBStoreStatusDTO extends S
     @XmlElement(name="message-load-batch-size")
     public IntMetricDTO message_load_batch_size;
 
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/package-info.java (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/package-info.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/package-info.java?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/package-info.java&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/package-info.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/store/bdb/dto/package-info.java (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/main/scala/org/apache/activemq/apollo/broker/store/bdb/dto/package-info.java Wed Dec 22 17:36:52 2010
@@ -24,5 +24,5 @@
 @javax.xml.bind.annotation.XmlSchema(
         namespace = "http://activemq.apache.org/schema/activemq/apollo",
         elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.activemq.apollo.store.bdb.dto;
+package org.apache.activemq.apollo.broker.store.bdb.dto;
 

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.jade (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/bdb/dto/BDBStoreStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/bdb/dto/BDBStoreStatusDTO.jade&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/store/bdb/dto/simple.xml)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/broker/store/bdb/dto/simple.xml&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/test/resources/org/apache/activemq/apollo/store/bdb/dto/simple.xml&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreBenchmark.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreBenchmark.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreBenchmark.scala?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreBenchmark.scala&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreBenchmark.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreBenchmark.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreBenchmark.scala Wed Dec 22 17:36:52 2010
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb
+package org.apache.activemq.apollo.broker.store.bdb
 
-import org.apache.activemq.apollo.store.StoreBenchmarkSupport
-import org.apache.activemq.apollo.store.Store
+import org.apache.activemq.apollo.broker.store.StoreBenchmarkSupport
+import org.apache.activemq.apollo.broker.store.Store
 
 
 /**

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreTest.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreTest.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreTest.scala?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreTest.scala&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreTest.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/BDBStoreTest.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/BDBStoreTest.scala Wed Dec 22 17:36:52 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb
+package org.apache.activemq.apollo.broker.store.bdb
 
-import org.apache.activemq.apollo.store.{Store, StoreFunSuiteSupport}
+import org.apache.activemq.apollo.broker.store.{Store, StoreFunSuiteSupport}
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>

Copied: activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/dto/XmlCodecTest.java (from r1052003, activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/dto/XmlCodecTest.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/dto/XmlCodecTest.java?p2=activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/dto/XmlCodecTest.java&p1=activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/dto/XmlCodecTest.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/store/bdb/dto/XmlCodecTest.java (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/src/test/scala/org/apache/activemq/apollo/broker/store/bdb/dto/XmlCodecTest.java Wed Dec 22 17:36:52 2010
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.bdb.dto;
+package org.apache.activemq.apollo.broker.store.bdb.dto;
 
 import org.apache.activemq.apollo.dto.BrokerDTO;
-import org.apache.activemq.apollo.dto.ConnectorDTO;
 import org.apache.activemq.apollo.dto.VirtualHostDTO;
 import org.apache.activemq.apollo.dto.XmlCodec;
 import org.junit.Test;

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala Wed Dec 22 17:36:52 2010
@@ -21,7 +21,7 @@ import _root_.org.fusesource.hawtdispatc
 import org.fusesource.hawtbuf._
 import protocol.Protocol
 import org.apache.activemq.apollo.filter.Filterable
-import org.apache.activemq.apollo.store.{StoreUOW, MessageRecord}
+import org.apache.activemq.apollo.broker.store.{StoreUOW, MessageRecord}
 import org.apache.activemq.apollo.util.{Log, Logging}
 
 object DeliveryProducer extends Log

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Wed Dec 22 17:36:52 2010
@@ -23,10 +23,10 @@ import _root_.org.fusesource.hawtdispatc
 import java.util.concurrent.atomic.AtomicInteger
 
 import collection.{SortedMap}
-import org.apache.activemq.apollo.store.{StoreUOW}
+import org.apache.activemq.apollo.broker.store.{StoreUOW}
 import protocol.ProtocolFactory
 import collection.mutable.ListBuffer
-import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.broker.store._
 import org.apache.activemq.apollo.util._
 import org.apache.activemq.apollo.util.list._
 import org.fusesource.hawtdispatch.{Dispatch, ListEventAggregator, DispatchQueue, BaseRetained}

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala Wed Dec 22 17:36:52 2010
@@ -26,7 +26,7 @@ import collection.JavaConversions
 import org.apache.activemq.apollo.util._
 import collection.mutable.{ListBuffer, HashMap}
 import scala.collection.immutable.List
-import org.apache.activemq.apollo.store.{StoreUOW, QueueRecord}
+import org.apache.activemq.apollo.broker.store.{StoreUOW, QueueRecord}
 import Buffer._
 import org.apache.activemq.apollo.util.path.{Path, Part, PathMap, PathParser}
 import java.util.ArrayList

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala Wed Dec 22 17:36:52 2010
@@ -22,7 +22,7 @@ import _root_.scala.collection.JavaConve
 import org.fusesource.hawtdispatch._
 
 import java.util.concurrent.TimeUnit
-import org.apache.activemq.apollo.store.{Store, StoreFactory}
+import org.apache.activemq.apollo.broker.store.{Store, StoreFactory}
 import org.apache.activemq.apollo.util._
 import path.PathFilter
 import ReporterLevel._

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/MultiProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/MultiProtocol.scala?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/MultiProtocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/MultiProtocol.scala Wed Dec 22 17:36:52 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.broke
 
 import org.apache.activemq.apollo.broker.{Message, ProtocolException}
 import org.fusesource.hawtbuf.{AsciiBuffer, Buffer}
-import org.apache.activemq.apollo.store.MessageRecord
+import org.apache.activemq.apollo.broker.store.MessageRecord
 import org.apache.activemq.apollo.transport.{ProtocolCodec}
 import java.nio.channels.{WritableByteChannel, ReadableByteChannel}
 import java.nio.ByteBuffer

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/ProtocolFactory.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/ProtocolFactory.scala?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/ProtocolFactory.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/ProtocolFactory.scala Wed Dec 22 17:36:52 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.apollo.broke
 import java.io.{IOException}
 import org.fusesource.hawtbuf.{Buffer, AsciiBuffer}
 import org.apache.activemq.apollo.util.ClassFinder
-import org.apache.activemq.apollo.store.MessageRecord
+import org.apache.activemq.apollo.broker.store.MessageRecord
 import org.apache.activemq.apollo.transport._
 import org.apache.activemq.apollo.broker.{Delivery, Message, BrokerConnection}
 import org.apache.activemq.apollo.dto.ConnectionStatusDTO

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/DelayingStoreSupport.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/DelayingStoreSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala Wed Dec 22 17:36:52 2010
@@ -1,5 +1,3 @@
-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
@@ -16,6 +14,8 @@ package org.apache.activemq.apollo.store
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.activemq.apollo.broker.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/broker/store/MessageRecord.java (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/MessageRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/MessageRecord.java&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/MessageRecord.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/MessageRecord.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store;
+package org.apache.activemq.apollo.broker.store;
 
 import org.apache.activemq.apollo.util.DirectBuffer;
 import org.fusesource.hawtbuf.AsciiBuffer;

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRange.java (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/QueueEntryRange.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRange.java&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRange.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRange.java Wed Dec 22 17:36:52 2010
@@ -14,9 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store;
-
-import org.fusesource.hawtbuf.Buffer;
+package org.apache.activemq.apollo.broker.store;
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
@@ -26,4 +24,4 @@ public class QueueEntryRange {
     public long lastQueueSeq;
     public int count;
     public int size;
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRecord.java (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/QueueEntryRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRecord.java&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueEntryRecord.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueEntryRecord.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store;
+package org.apache.activemq.apollo.broker.store;
 
 import org.fusesource.hawtbuf.Buffer;
 

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueRecord.java (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/QueueRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueRecord.java&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueRecord.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueRecord.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store;
+package org.apache.activemq.apollo.broker.store;
 
 import org.fusesource.hawtbuf.AsciiBuffer;
 import org.fusesource.hawtbuf.Buffer;
@@ -27,4 +27,4 @@ public class QueueRecord {
     public long key = -1;
     public AsciiBuffer binding_kind;
     public Buffer binding_data;
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueStatus.java (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/QueueStatus.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueStatus.java&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/QueueStatus.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/QueueStatus.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store;
+package org.apache.activemq.apollo.broker.store;
 
 /**
  * Result Holder for queue related queries.

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/Store.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/Store.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/Store.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/Store.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/Store.scala Wed Dec 22 17:36:52 2010
@@ -1,4 +1,4 @@
-package org.apache.activemq.apollo.store
+package org.apache.activemq.apollo.broker.store
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -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/broker/store/StoreFactory.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/StoreFactory.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreFactory.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreFactory.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreFactory.scala Wed Dec 22 17:36:52 2010
@@ -1,4 +1,4 @@
-package org.apache.activemq.apollo.store
+package org.apache.activemq.apollo.broker.store
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,4 +69,4 @@ object StoreFactory {
     ERROR
   }
 
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreUOW.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/StoreUOW.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreUOW.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/StoreUOW.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/StoreUOW.scala Wed Dec 22 17:36:52 2010
@@ -1,5 +1,3 @@
-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
@@ -16,8 +14,10 @@ package org.apache.activemq.apollo.store
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.activemq.apollo.broker.store
+
 import org.fusesource.hawtdispatch.{Retained}
-import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.broker.store._
 
 /**
  * A store uow is used to perform persistent
@@ -71,4 +71,4 @@ trait StoreUOW extends Retained {
    */
   def onComplete(callback: Runnable)
 
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/SubscriptionRecord.java (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/SubscriptionRecord.java?p2=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/SubscriptionRecord.java&p1=activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/store/SubscriptionRecord.java (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/SubscriptionRecord.java Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store;
+package org.apache.activemq.apollo.broker.store;
 
 import org.fusesource.hawtbuf.AsciiBuffer;
 import org.fusesource.hawtbuf.Buffer;

Copied: activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreBenchmarkSupport.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/StoreBenchmarkSupport.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreBenchmarkSupport.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreBenchmarkSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreBenchmarkSupport.scala Wed Dec 22 17:36:52 2010
@@ -1,4 +1,4 @@
-package org.apache.activemq.apollo.store
+package org.apache.activemq.apollo.broker.store
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -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/broker/store/StoreFunSuiteSupport.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-broker/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/broker/store/StoreFunSuiteSupport.scala?p2=activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala&p1=activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/store/StoreFunSuiteSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/scala/org/apache/activemq/apollo/broker/store/StoreFunSuiteSupport.scala Wed Dec 22 17:36:52 2010
@@ -1,4 +1,4 @@
-package org.apache.activemq.apollo.store
+package org.apache.activemq.apollo.broker.store
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -207,4 +207,4 @@ abstract class StoreFunSuiteSupport exte
   }
 
 
-}
\ No newline at end of file
+}

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/proto/data.proto
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/proto/data.proto?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/proto/data.proto (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/proto/data.proto Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-package org.apache.activemq.apollo.store.cassandra;
+package org.apache.activemq.apollo.broker.store.cassandra;
 
 option java_multiple_files = true;
 
@@ -37,4 +37,4 @@ message PBQueueRecord {
   required int64 key=1;
   optional bytes binding_kind = 2 [java_override_type = "AsciiBuffer"];
   optional bytes binding_data = 3;
-}
\ No newline at end of file
+}

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index Wed Dec 22 17:36:52 2010
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.apache.activemq.apollo.store.cassandra.CassandraStoreFactory
\ No newline at end of file
+org.apache.activemq.apollo.broker.store.cassandra.CassandraStoreFactory

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index?rev=1052004&r1=1052003&r2=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index Wed Dec 22 17:36:52 2010
@@ -14,4 +14,4 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.apache.activemq.apollo.store.cassandra.dto
\ No newline at end of file
+org.apache.activemq.apollo.broker.store.cassandra.dto

Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/jaxb.index (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/jaxb.index)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/jaxb.index?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/jaxb.index&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/jaxb.index&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
    (empty)

Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/package-info.java (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/package-info.java)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/package-info.java?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/package-info.java&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/package-info.java&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/store/cassandra/dto/package-info.java (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/package-info.java Wed Dec 22 17:36:52 2010
@@ -24,4 +24,4 @@
 @javax.xml.bind.annotation.XmlSchema(
         namespace = "http://activemq.apache.org/schema/activemq/apollo",
         elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.activemq.apollo.store.cassandra.dto;
\ No newline at end of file
+package org.apache.activemq.apollo.broker.store.cassandra.dto;

Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraClient.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraClient.scala?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraClient.scala&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraClient.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraClient.scala Wed Dec 22 17:36:52 2010
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.cassandra
+package org.apache.activemq.apollo.broker.store.cassandra
 
 import com.shorrockin.cascal.session._
 import com.shorrockin.cascal.utils.Conversions._
 import java.util.{HashMap}
 import org.fusesource.hawtbuf.AsciiBuffer._
 import org.fusesource.hawtbuf.{AsciiBuffer, DataByteArrayInputStream, DataByteArrayOutputStream, Buffer}
-import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.broker.store._
 import collection.mutable.ListBuffer
 
 /**
@@ -252,4 +252,4 @@ class CassandraClient() {
         }
     }
   }
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStore.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStore.scala?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStore.scala&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStore.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStore.scala Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.cassandra
+package org.apache.activemq.apollo.broker.store.cassandra
 
 import dto.CassandraStoreDTO
 import org.apache.activemq.apollo.dto._
@@ -28,7 +28,7 @@ import com.shorrockin.cascal.utils.Conve
 import org.fusesource.hawtdispatch._
 import org.fusesource.hawtdispatch.ListEventAggregator
 import java.util.concurrent._
-import org.apache.activemq.apollo.store._
+import org.apache.activemq.apollo.broker.store._
 import org.apache.activemq.apollo.util._
 import ReporterLevel._
 import org.apache.activemq.apollo.util.OptionSupport._

Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreFactory.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreFactory.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreFactory.scala?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreFactory.scala&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreFactory.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreFactory.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreFactory.scala Wed Dec 22 17:36:52 2010
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.cassandra
+package org.apache.activemq.apollo.broker.store.cassandra
 
 import dto.CassandraStoreDTO
-import org.apache.activemq.apollo.store.StoreFactory
+import org.apache.activemq.apollo.broker.store.StoreFactory
 import org.apache.activemq.apollo.util._
 import ReporterLevel._
 import org.apache.activemq.apollo.dto.StoreDTO
@@ -51,4 +51,4 @@ class CassandraStoreFactory extends Stor
        null
      }
    }
-}
\ No newline at end of file
+}

Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/Schema.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala)
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/Schema.scala?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/Schema.scala&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala&r1=1052003&r2=1052004&rev=1052004&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/Schema.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/Schema.scala Wed Dec 22 17:36:52 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.apollo.store.cassandra
+package org.apache.activemq.apollo.broker.store.cassandra
 
 import org.fusesource.hawtbuf.AsciiBuffer._
 import org.fusesource.hawtbuf.Buffer
@@ -45,4 +45,4 @@ case class Schema(name:String) {
 //    val columns = names.map{n => (key \ (n, "")).name}
 //    ColumnPredicate(columns)
 //  }
-}
\ No newline at end of file
+}



Mime
View raw message