Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/dto/CassandraStoreDTO.java) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.java&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/dto/CassandraStoreDTO.java&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/store/cassandra/dto/CassandraStoreDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-cassandra/src/main/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/CassandraStoreDTO.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.cassandra.dto; +package org.apache.activemq.apollo.broker.store.cassandra.dto; import org.apache.activemq.apollo.dto.StoreDTO; import org.codehaus.jackson.annotate.JsonProperty;
Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/dto/simple.xml) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/dto/simple.xml&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/dto/simple.xml&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== (empty) Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/log4j.properties (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/log4j.properties?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/log4j.properties&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/log4j.properties&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== (empty) Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/broker/store/cassandra/storage-conf.xml&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/resources/org/apache/activemq/apollo/store/cassandra/storage-conf.xml&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== (empty) Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraServerMixin.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraServerMixin.scala?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraServerMixin.scala&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraServerMixin.scala (original) +++ activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraServerMixin.scala Wed Dec 22 17:36:52 2010 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.activemq.apollo.store.cassandra +package org.apache.activemq.apollo.broker.store.cassandra import org.apache.cassandra.thrift.CassandraDaemon import org.apache.cassandra.config.DatabaseDescriptor Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreTest.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreTest.scala?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreTest.scala&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/CassandraStoreTest.scala (original) +++ activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/CassandraStoreTest.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.cassandra +package org.apache.activemq.apollo.broker.store.cassandra -import org.apache.activemq.apollo.store._ +import org.apache.activemq.apollo.broker.store._ /** * @author <a href="http://hiramchirino.com";>Hiram Chirino</a> Copied: activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/XmlCodecTest.java (from r1052003, activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/dto/XmlCodecTest.java) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/XmlCodecTest.java?p2=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/XmlCodecTest.java&p1=activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/dto/XmlCodecTest.java&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/store/cassandra/dto/XmlCodecTest.java (original) +++ activemq/activemq-apollo/trunk/apollo-cassandra/src/test/scala/org/apache/activemq/apollo/broker/store/cassandra/dto/XmlCodecTest.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.cassandra.dto; +package org.apache.activemq.apollo.broker.store.cassandra.dto; import org.apache.activemq.apollo.dto.BrokerDTO; import org.apache.activemq.apollo.dto.VirtualHostDTO; Modified: activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/log4j.properties URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/log4j.properties?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/log4j.properties (original) +++ activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/commands/etc/log4j.properties Wed Dec 22 17:36:52 2010 @@ -29,7 +29,7 @@ log4j.logger.org.apache.activemq.apollo= # log4j.logger.org.apache.activemq.apollo.broker=DEBUG # log4j.logger.org.apache.activemq.apollo.web=DEBUG # log4j.logger.org.apache.activemq.apollo.cli=DEBUG -# log4j.logger.org.apache.activemq.apollo.store.hawtdb=DEBUG +# log4j.logger.org.apache.activemq.apollo.broker.store.hawtdb=DEBUG # Console Settings log4j.appender.console=org.apache.log4j.ConsoleAppender @@ -44,4 +44,4 @@ log4j.appender.logfile.maxFileSize=5MB log4j.appender.logfile.maxBackupIndex=5 log4j.appender.logfile.append=true log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n \ No newline at end of file +log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n Modified: activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/log4j.properties?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/log4j.properties (original) +++ activemq/activemq-apollo/trunk/apollo-cli/src/test/resources/log4j.properties Wed Dec 22 17:36:52 2010 @@ -28,7 +28,7 @@ log4j.logger.org.apache.activemq.apollo= # log4j.logger.org.apache.activemq.apollo.broker=DEBUG # log4j.logger.org.apache.activemq.apollo.web=DEBUG # log4j.logger.org.apache.activemq.apollo.cli=DEBUG -# log4j.logger.org.apache.activemq.apollo.store.hawtdb=DEBUG +# log4j.logger.org.apache.activemq.apollo.broker.store.hawtdb=DEBUG # Console Settings log4j.appender.console=org.apache.log4j.ConsoleAppender @@ -43,4 +43,4 @@ log4j.appender.logfile.maxFileSize=5MB log4j.appender.logfile.maxBackupIndex=5 log4j.appender.logfile.append=true log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n \ No newline at end of file +log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/proto/data.proto URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/proto/data.proto?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/proto/data.proto (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/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.hawtdb.model; +package org.apache.activemq.apollo.broker.store.hawtdb.model; option java_multiple_files = true; Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pool-factory.index URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pool-factory.index?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pool-factory.index (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/direct-buffer-pool-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.hawtdb.HawtDBDirectBufferPoolFactory \ No newline at end of file +org.apache.activemq.apollo.broker.store.hawtdb.HawtDBDirectBufferPoolFactory Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/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-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/store-factory.index (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/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.hawtdb.HawtDBStoreFactory \ No newline at end of file +org.apache.activemq.apollo.broker.store.hawtdb.HawtDBStoreFactory Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/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-hawtdb/src/main/resources/META-INF/services/org.apache.activemq.apollo/xml-packages.index (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/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.hawtdb.dto \ No newline at end of file +org.apache.activemq.apollo.broker.store.hawtdb.dto Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/jaxb.index (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/jaxb.index?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/jaxb.index&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/resources/org/apache/activemq/apollo/store/hawtdb/dto/jaxb.index&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== (empty) Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBClient.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBClient.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBClient.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBClient.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBClient.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb import dto.HawtDBStoreDTO import java.{lang=>jl} @@ -24,8 +24,8 @@ import java.io.File import java.io.IOException import java.util.concurrent.atomic.{AtomicInteger, AtomicLong} import org.fusesource.hawtdb.internal.journal.{JournalListener, Journal, Location} -import org.apache.activemq.apollo.store.hawtdb.model.Type._ -import org.apache.activemq.apollo.store.hawtdb.model._ +import org.apache.activemq.apollo.broker.store.hawtdb.model.Type._ +import org.apache.activemq.apollo.broker.store.hawtdb.model._ import org.fusesource.hawtbuf._ import org.fusesource.hawtdispatch._ import collection.mutable.{LinkedHashMap, ListBuffer} @@ -34,7 +34,7 @@ import ju.{TreeSet, HashSet} import java.util.concurrent.TimeUnit import org.fusesource.hawtdb.api._ -import org.apache.activemq.apollo.store._ +import org.apache.activemq.apollo.broker.store._ import org.apache.activemq.apollo.util._ import OptionSupport._ Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPool.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPool.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPool.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPool.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPool.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb import java.nio.ByteBuffer import java.io.File @@ -72,4 +72,4 @@ class HawtDBDirectBufferPool(val file:Fi val slice = original.slice new HawtMemoryAllocation(page, page_count, original, slice) } -} \ No newline at end of file +} Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPoolFactory.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolFactory.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPoolFactory.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPoolFactory.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolFactory.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBDirectBufferPoolFactory.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBDirectBufferPoolFactory.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb import java.io.File import java.lang.String @@ -47,4 +47,4 @@ class HawtDBDirectBufferPoolFactory exte def validate(config: String):Boolean = { config.startsWith(prefix) && !config.substring(prefix.length).isEmpty } -} \ No newline at end of file +} Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStore.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStore.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStore.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStore.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStore.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb import collection.mutable.ListBuffer import dto.{HawtDBStoreStatusDTO, HawtDBStoreDTO} @@ -25,7 +25,7 @@ import java.io.File import java.util.concurrent._ import atomic.{AtomicInteger, AtomicLong} import org.apache.activemq.apollo.dto._ -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.{DispatchQueue, BaseRetained, ListEventAggregator} Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreFactory.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreFactory.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreFactory.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreFactory.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreFactory.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb import dto.HawtDBStoreDTO -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 HawtDBStoreFactory extends StoreFa null } } -} \ No newline at end of file +} Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/Helpers.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/Helpers.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/Helpers.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/Helpers.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/Helpers.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb import model._ import model.Type.TypeCreatable @@ -24,7 +24,7 @@ import java.io.{IOException, DataInput, import org.fusesource.hawtdb.internal.journal.{LocationCodec, Location} import org.fusesource.hawtdb.api._ import org.fusesource.hawtbuf.proto.{MessageBuffer, PBMessage} -import org.apache.activemq.apollo.store.{MessageRecord, QueueRecord, QueueEntryRecord} +import org.apache.activemq.apollo.broker.store.{MessageRecord, QueueRecord, QueueEntryRecord} /** * <p> @@ -157,4 +157,4 @@ object Helpers { SUBSCRIPTIONS_INDEX_FACTORY.setValueCodec(AddSubscription.FRAMED_CODEC); SUBSCRIPTIONS_INDEX_FACTORY.setDeferredEncoding(true); -} \ No newline at end of file +} Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.java&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreDTO.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.hawtdb.dto; +package org.apache.activemq.apollo.broker.store.hawtdb.dto; import org.apache.activemq.apollo.dto.StoreDTO; -import org.codehaus.jackson.annotate.JsonProperty; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.java&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.java (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.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.hawtdb.dto; +package org.apache.activemq.apollo.broker.store.hawtdb.dto; import org.apache.activemq.apollo.dto.IntMetricDTO; import org.apache.activemq.apollo.dto.StoreStatusDTO; @@ -41,4 +41,4 @@ public class HawtDBStoreStatusDTO extend @XmlElement(name="message-load-batch-size") public IntMetricDTO message_load_batch_size; -} \ No newline at end of file +} Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/package-info.java (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/package-info.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/package-info.java&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/store/hawtdb/dto/package-info.java (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/scala/org/apache/activemq/apollo/broker/store/hawtdb/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.hawtdb.dto; +package org.apache.activemq.apollo.broker.store.hawtdb.dto; Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.jade (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.jade?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/broker/store/hawtdb/dto/HawtDBStoreStatusDTO.jade&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/main/webapp/WEB-INF/org/apache/activemq/apollo/store/hawtdb/dto/HawtDBStoreStatusDTO.jade&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== (empty) Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/broker/store/hawtdb/dto/simple.xml&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/resources/org/apache/activemq/apollo/store/hawtdb/dto/simple.xml&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== (empty) Copied: activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreBenchmark.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreBenchmark.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreBenchmark.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreBenchmark.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreBenchmark.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb -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-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreTest.scala (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreTest.scala?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreTest.scala&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/HawtDBStoreTest.scala (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/HawtDBStoreTest.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.hawtdb +package org.apache.activemq.apollo.broker.store.hawtdb -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-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/XmlCodecTest.java (from r1052003, activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java) URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/XmlCodecTest.java?p2=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/XmlCodecTest.java&p1=activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java&r1=1052003&r2=1052004&rev=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/store/hawtdb/dto/XmlCodecTest.java (original) +++ activemq/activemq-apollo/trunk/apollo-hawtdb/src/test/scala/org/apache/activemq/apollo/broker/store/hawtdb/dto/XmlCodecTest.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.hawtdb.dto; +package org.apache.activemq.apollo.broker.store.hawtdb.dto; import org.apache.activemq.apollo.dto.BrokerDTO; import org.apache.activemq.apollo.dto.VirtualHostDTO; Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompCodec.scala Wed Dec 22 17:36:52 2010 @@ -27,7 +27,7 @@ import _root_.scala.collection.JavaConve import java.io.{EOFException, DataOutput, DataInput, IOException} import java.nio.channels.{SocketChannel, WritableByteChannel, ReadableByteChannel} import org.apache.activemq.apollo.transport._ -import org.apache.activemq.apollo.store.MessageRecord +import org.apache.activemq.apollo.broker.store.MessageRecord import _root_.org.fusesource.hawtbuf._ import Buffer._ import org.apache.activemq.apollo.util._ Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala Wed Dec 22 17:36:52 2010 @@ -22,7 +22,7 @@ import java.lang.String import protocol.{ProtocolFactory, Protocol} import Stomp._ import org.apache.activemq.apollo.transport._ -import org.apache.activemq.apollo.store._ +import org.apache.activemq.apollo.broker.store._ /** * @author <a href="http://hiramchirino.com";>Hiram Chirino</a> */ Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Wed Dec 22 17:36:52 2010 @@ -28,7 +28,7 @@ import Stomp._ import java.io.IOException import org.apache.activemq.apollo.selector.SelectorParser import org.apache.activemq.apollo.filter.{BooleanExpression, FilterException} -import org.apache.activemq.apollo.store._ +import org.apache.activemq.apollo.broker.store._ import org.apache.activemq.apollo.util._ import java.util.concurrent.TimeUnit import java.util.Map.Entry Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/log4j.properties Wed Dec 22 17:36:52 2010 @@ -28,7 +28,7 @@ log4j.logger.org.apache.activemq.apollo= # log4j.logger.org.apache.activemq.apollo.broker=DEBUG # log4j.logger.org.apache.activemq.apollo.web=DEBUG # log4j.logger.org.apache.activemq.apollo.cli=DEBUG -# log4j.logger.org.apache.activemq.apollo.store.hawtdb=DEBUG +# log4j.logger.org.apache.activemq.apollo.broker.store.hawtdb=DEBUG # Console Settings log4j.appender.console=org.apache.log4j.ConsoleAppender @@ -43,4 +43,4 @@ log4j.appender.logfile.maxFileSize=5MB log4j.appender.logfile.maxBackupIndex=5 log4j.appender.logfile.append=true log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n \ No newline at end of file +log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala?rev=1052004&r1=1052003&r2=1052004&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala Wed Dec 22 17:36:52 2010 @@ -19,8 +19,8 @@ package org.apache.activemq.apollo.stomp import _root_.org.apache.activemq.apollo.broker.perf._ import java.io.File import org.apache.activemq.apollo.dto.BrokerDTO -import org.apache.activemq.apollo.store.bdb.dto.BDBStoreDTO -import org.apache.activemq.apollo.store.hawtdb.dto.HawtDBStoreDTO +import org.apache.activemq.apollo.broker.store.bdb.dto.BDBStoreDTO +import org.apache.activemq.apollo.broker.store.hawtdb.dto.HawtDBStoreDTO class BasicNonPersistentTest extends BasicScenarios with StompScenario { override def description = "Using the STOMP protocol over TCP"
