activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r961087 [1/7] - in /activemq/sandbox/activemq-apollo-actor: ./ activemq-broker/ activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/ activemq-broker/src/tes...
Date Wed, 07 Jul 2010 03:50:51 GMT
Author: chirino
Date: Wed Jul  7 03:50:42 2010
New Revision: 961087

URL: http://svn.apache.org/viewvc?rev=961087&view=rev
Log:
refactored the
  org.apache.activemq.util.buffer.* packages to org.fusesource.hawtbuf.*
and
  org.apache.activemq.protobuf.* packages to org.fusesource.hawtbuf.proto.*

Added:
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/DestinationEntity.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/DestinationEntity.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/KahaDBStore.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/Marshallers.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/Marshallers.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/MessageKeys.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/MessageKeys.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/RootEntity.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/RootEntity.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/hawtdb-data.proto
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/kahadb-data.proto
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/hawtdb
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStorePerformance.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStorePerformance.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/hawtdb/HawtDBStoreTest.java
      - copied, changed from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStoreTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/apache/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/apache/activemq/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/apache/activemq/broker/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/apache/activemq/broker/store/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/apache/activemq/broker/store/hawtdb/
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/target/generated-sources/proto/org/apache/activemq/broker/store/hawtdb/Data.java
Removed:
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/DestinationEntity.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/KahaDBStore.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/Marshallers.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/MessageKeys.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/RootEntity.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/proto/kahadb-data.proto
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/resources/META-INF/services/org/apache/activemq/broker/store/kaha-db
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStorePerformance.java
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/test/java/org/apache/activemq/broker/store/kahadb/KahaDBStoreTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/LICENSE
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/NOTICE
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/README.txt
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/deferred_decode.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/multiple_files_test.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/unittest.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/unittest_embed_optimize_for.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/unittest_import.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/unittest_mset.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/main/proto/unittest_optimize_for.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/ide-resources/log4j.properties
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/com/google/protobuf/GeneratedMessageTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/com/google/protobuf/MessageTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/com/google/protobuf/TestUtil.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/com/google/protobuf/WireFormatTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/com/google/protobuf/multiple_files_test.proto
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/org/apache/activemq/protobuf/DeferredUnmarshalTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf-test/src/test/java/org/apache/activemq/protobuf/EqualsTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/LICENSE
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/NOTICE
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/README.txt
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/BaseMessage.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/CodedInputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/CodedOutputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/DeferredDecodeMessage.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/InvalidProtocolBufferException.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/Message.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/MessageBuffer.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/MessageBufferSupport.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/PBMessage.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/UninitializedMessageException.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/WireFormat.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/CommandLineSupport.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/CompilerException.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/EnumDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/EnumFieldDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/ExtensionsDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/FieldDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/JavaGenerator.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MessageDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/MethodDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/OptionDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/ParserSupport.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/ProtoDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/ProtoMojo.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/ProtoTask.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/ServiceDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/TextFormat.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/TypeDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/javacc/proto-parser.jj
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/main/resources/META-INF/NOTICE
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/activemq-protobuf/src/test/ide-resources/log4j.properties
    activemq/sandbox/activemq-apollo-actor/activemq-protobuf/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/AsciiBuffer.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/Buffer.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/BufferEditor.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/BufferInputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/BufferOutputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/ByteArrayInputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/ByteArrayOutputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/DataByteArrayInputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/DataByteArrayOutputStream.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/buffer/UTF8Buffer.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayInputStreamTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/test/java/org/apache/activemq/util/DataByteArrayOutputStreamTest.java
Modified:
    activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destination.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destinations.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/XidImpl.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/AnyChildPathNode.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMap.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapEntry.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapNode.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathNode.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathSupport.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PrefixPathFilter.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/SimplePathFilter.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/WildcardPathFilter.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/SharedQueueTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapTest.java
    activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala
    activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/AsciiBufferAdapter.java
    activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/KahaDBStoreXml.java
    activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java
    activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/Stomp.java
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompWireFormat.scala
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala
    activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompLoadClient.scala
    activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/QueueDescriptor.java
    activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/Store.java
    activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/memory/MemoryStore.java
    activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StorePerformanceBase.java
    activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StoreTestBase.java
    activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransport.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormatFactory.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java
    activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/Hasher.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/FixedBufferMarshaller.java
    activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/VariableBufferMarshaller.java
    activemq/sandbox/activemq-apollo-actor/pom.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoded.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/BaseEncoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/Encoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpClass.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/TypeRegistry.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/AmqpMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/Encoded.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpAttachMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBarMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBinaryMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBooleanMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpByteMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCharMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCloseMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCompletedMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpConnectionErrorMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDetachMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDispositionMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDoubleMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDrainMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpEnlistMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFilterMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFloatMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFlowMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFooterMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFragmentMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpHeaderMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpIntMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkErrorMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpListMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLongMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMapMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNoopMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNullMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpOpenMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpPropertiesMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpRejectedMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpReleasedMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpRelinkMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSaslChallengeMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSaslInitMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSaslMechanismsMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSaslOutcomeMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSaslResponseMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSessionErrorMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpShortMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSourceMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpStringMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpSymbolMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpTargetMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpTimestampMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpTransferMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpTxnMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpUbyteMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpUintMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpUlongMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpUnlinkMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpUshortMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpUuidMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpXidMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/BaseEncoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/Encoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/PrimitiveEncoder.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpAddress.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpAttach.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpBar.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpBinary.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpBoolean.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpByte.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpChar.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpClose.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpCompleted.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpConnectionError.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpDeliveryTag.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpDetach.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpDisposition.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpDouble.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpDrain.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpEnlist.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFilter.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFilterSet.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFloat.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFlow.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFooter.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpFragment.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpHandle.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpHeader.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpInt.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLink.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLinkError.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpList.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpLong.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMap.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpMessageAttributes.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpNoop.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpNull.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpOpen.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpOptions.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpProperties.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRejected.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpReleased.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpRelink.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslChallenge.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslInit.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslMechanisms.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslOutcome.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSaslResponse.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSequenceNo.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionError.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSessionName.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpShort.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSource.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpString.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpSymbol.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTarget.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTimestamp.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTransfer.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpTxn.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUbyte.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUint.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUlong.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUnlink.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUshort.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpUuid.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/AmqpXid.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/types/TypeFactory.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormat.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/wireformat/AmqpWireFormatFactory.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/src/test/java/org/apache/activemq/legacy/test2/DurableSubscriptionTestSupport.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenWireMessageDelivery.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireMessageEvaluationContext.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/broker/openwire/OpenwireProtocolHandler.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQDestination.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQQueue.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/ActiveMQTopic.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/Message.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/command/WireFormatInfo.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v2/BaseDataStreamMarshaller.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v3/BaseDataStreamMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v4/BaseDataStreamMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/openwire/v5/BaseDataStreamMarshaller.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/main/java/org/apache/activemq/util/MarshallingSupport.java   (contents, props changed)
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/MessageTestSupport.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v2/WireFormatInfoTest.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v4/MessageTestSupport.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/src/test/java/org/apache/activemq/openwire/v5/MessageTestSupport.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/ExclusivePersistentQueue.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/PartitionedQueue.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedPriorityQueue.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueue.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/main/java/org/apache/activemq/queue/SharedQueueOld.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Message.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockBrokerTest.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/MockClient.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/perf/Router.java
    activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/src/test/java/org/apache/activemq/queue/actor/transport/pipe/PipeTransportFactory.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/api/Paged.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeIndex.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/BTreeNode.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/index/HashIndex.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/io/MemoryMappedFile.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAccessor.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/DataFileAppender.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/Journal.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/journal/ReplicationTarget.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/Extent.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentInputStream.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/ExtentOutputStream.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/HawtTransaction.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/main/java/org/apache/hawtdb/internal/page/PageFile.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/MicroBenchmark.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/BTreeIndexBenchmark.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/HashIndexBenchmark.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/index/IndexBenchmark.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/journal/JournalTest.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/ConcurrentPageFileTest.java
    activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/src/test/java/org/apache/hawtdb/internal/page/TransactionBenchmark.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAccessor.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/journal/ReplicationTarget.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
    activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/src/test/java/org/apache/kahadb/journal/JournalTest.java

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/pom.xml Wed Jul  7 03:50:42 2010
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-kaha</artifactId>
+      <artifactId>activemq-hawtdb</artifactId>
       <version>6.0-SNAPSHOT</version>
     </dependency>
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Broker.scala Wed Jul  7 03:50:42 2010
@@ -20,7 +20,6 @@ import _root_.java.io.{File}
 import _root_.org.apache.activemq.transport._
 import _root_.org.apache.activemq.Service
 import _root_.java.lang.{String}
-import _root_.org.apache.activemq.util.buffer.{Buffer, UTF8Buffer, AsciiBuffer}
 import _root_.org.apache.activemq.util.{FactoryFinder, IOHelper}
 import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
 import _root_.scala.collection.JavaConversions._
@@ -28,6 +27,7 @@ import _root_.scala.reflect.BeanProperty
 import org.fusesource.hawtdispatch.{Dispatch, DispatchQueue, BaseRetained}
 import java.util.{HashSet, LinkedList, LinkedHashMap, ArrayList}
 import java.util.concurrent.{TimeUnit, CountDownLatch}
+import org.fusesource.hawtbuf._
 
 /**
  * <p>

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Delivery.scala Wed Jul  7 03:50:42 2010
@@ -19,10 +19,10 @@ package org.apache.activemq.apollo.broke
 import _root_.java.util.{LinkedList}
 import _root_.org.apache.activemq.filter.{MessageEvaluationContext}
 import _root_.java.lang.{String}
-import _root_.org.apache.activemq.util.buffer.{Buffer, AsciiBuffer}
 import _root_.org.fusesource.hawtdispatch._
 import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
 import org.apache.activemq.transport.Transport
+import org.fusesource.hawtbuf._
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destination.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destination.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destination.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destination.java Wed Jul  7 03:50:42 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.broker;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  */

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destinations.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destinations.scala?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destinations.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Destinations.scala Wed Jul  7 03:50:42 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.broker
 
-import _root_.org.apache.activemq.util.buffer.{AsciiBuffer}
+import _root_.org.fusesource.hawtbuf._
 import BufferConversions._
 
 /**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala Wed Jul  7 03:50:42 2010
@@ -17,7 +17,7 @@
 package org.apache.activemq.apollo.broker
 
 import _root_.java.util.concurrent.atomic.AtomicLong
-import _root_.org.apache.activemq.util.buffer._
+import _root_.org.fusesource.hawtbuf._
 import _root_.org.fusesource.hawtdispatch._
 import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
 

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala Wed Jul  7 03:50:42 2010
@@ -21,11 +21,11 @@ import _root_.org.apache.activemq.broker
 import _root_.org.apache.activemq.broker.store.{Store}
 import _root_.org.apache.activemq.Service
 import _root_.java.lang.{String}
-import _root_.org.apache.activemq.util.buffer.{AsciiBuffer}
 import _root_.org.fusesource.hawtdispatch.{ScalaDispatch, DispatchQueue}
 import _root_.scala.collection.JavaConversions._
 import _root_.scala.reflect.BeanProperty
 import path.PathFilter
+import org.fusesource.hawtbuf.AsciiBuffer
 
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/XidImpl.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/XidImpl.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/XidImpl.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/XidImpl.java Wed Jul  7 03:50:42 2010
@@ -22,8 +22,8 @@ import java.io.IOException;
 
 import javax.transaction.xa.Xid;
 
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
 
 /**
  * An implementation of JTA transaction identifier (javax.transaction.xa.Xid).

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/AnyChildPathNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/AnyChildPathNode.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/AnyChildPathNode.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/AnyChildPathNode.java Wed Jul  7 03:50:42 2010
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Set;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * An implementation of {@link PathNode} which navigates all the children of the given node

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathFilter.java Wed Jul  7 03:50:42 2010
@@ -23,7 +23,7 @@ import org.apache.activemq.apollo.broker
 import org.apache.activemq.filter.BooleanExpression;
 import org.apache.activemq.filter.FilterException;
 import org.apache.activemq.filter.MessageEvaluationContext;
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 
 /**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMap.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMap.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMap.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMap.java Wed Jul  7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * A Map-like data structure allowing values to be indexed by

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapEntry.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapEntry.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapEntry.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapEntry.java Wed Jul  7 03:50:42 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.apollo.broker.path;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * A base class for entry objects used to construct a path based policy

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapNode.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapNode.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathMapNode.java Wed Jul  7 03:50:42 2010
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * An implementation class used to implement {@link PathMap}

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathNode.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathNode.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathNode.java Wed Jul  7 03:50:42 2010
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Set;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * Represents a node in the {@link PathMap} tree

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathSupport.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathSupport.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PathSupport.java Wed Jul  7 03:50:42 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.apollo.broke
 
 import java.util.ArrayList;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * Helper class for decomposing a AsciiBuffer based path into it path component parts.

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PrefixPathFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PrefixPathFilter.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PrefixPathFilter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/PrefixPathFilter.java Wed Jul  7 03:50:42 2010
@@ -19,7 +19,7 @@ package org.apache.activemq.apollo.broke
 
 import java.util.ArrayList;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 
 /**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/SimplePathFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/SimplePathFilter.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/SimplePathFilter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/SimplePathFilter.java Wed Jul  7 03:50:42 2010
@@ -17,7 +17,7 @@
 
 package org.apache.activemq.apollo.broker.path;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * Matches messages sent to an exact path

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/WildcardPathFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/WildcardPathFilter.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/WildcardPathFilter.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/path/WildcardPathFilter.java Wed Jul  7 03:50:42 2010
@@ -19,8 +19,7 @@ package org.apache.activemq.apollo.broke
 
 import java.util.ArrayList;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
-
+import org.fusesource.hawtbuf.AsciiBuffer;
 
 
 /**

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/SharedQueueTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/SharedQueueTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/SharedQueueTest.java Wed Jul  7 03:50:42 2010
@@ -70,7 +70,7 @@ public class SharedQueueTest extends Tes
 //    protected Store createStore() throws Exception {
 //        Store store = null;
 //        if (USE_KAHA_DB) {
-//            store = StoreFactory.createStore("kaha-db");
+//            store = StoreFactory.createStore("hawtdb");
 //        } else {
 //            store = StoreFactory.createStore("memory");
 //        }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapMemoryTest.java Wed Jul  7 03:50:42 2010
@@ -18,7 +18,7 @@ package org.apache.activemq.apollo.broke
 
 import java.util.Set;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapTest.java?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapTest.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/path/PathMapTest.java Wed Jul  7 03:50:42 2010
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

Modified: activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-broker/src/test/scala/org/apache/activemq/apollo/broker/perf/BaseBrokerPerfSupport.scala Wed Jul  7 03:50:42 2010
@@ -25,7 +25,6 @@ import org.apache.activemq.transport.Tra
 
 import _root_.scala.collection.JavaConversions._
 import _root_.org.fusesource.hawtdispatch.ScalaDispatch._
-import org.apache.activemq.util.buffer.AsciiBuffer
 import org.apache.activemq.broker.store.{Store, StoreFactory}
 import java.io.{File, IOException}
 import java.util.ArrayList
@@ -33,6 +32,7 @@ import org.fusesource.hawtdispatch.BaseR
 import java.util.concurrent.{CountDownLatch, TimeUnit}
 import org.apache.activemq.apollo.broker._
 import org.scalatest._
+import _root_.org.fusesource.hawtbuf._
 
 object BaseBrokerPerfSupport {
   var PERFORMANCE_SAMPLES = Integer.parseInt(System.getProperty("PERFORMANCE_SAMPLES", "1"))
@@ -530,7 +530,7 @@ abstract class BaseBrokerPerfSupport ext
 
   protected def createStore(broker: Broker): Store = {
     val store = if (USE_KAHA_DB) {
-      StoreFactory.createStore("kaha-db");
+      StoreFactory.createStore("hawtdb");
     } else {
       StoreFactory.createStore("memory");
     }

Modified: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml?rev=961087&r1=961086&r2=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/pom.xml Wed Jul  7 03:50:42 2010
@@ -37,23 +37,20 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-store</artifactId>
       <version>6.0-SNAPSHOT</version>
-      <optional>false</optional>
     </dependency>
     
     <dependency>
       <groupId>org.fusesource.hawtdb</groupId>
       <artifactId>hawtdb</artifactId>
       <version>${hawtdb-version}</version>
-      <optional>false</optional>
     </dependency>
     
     <dependency>
-      <groupId>org.apache.activemq.protobuf</groupId>
-      <artifactId>activemq-protobuf</artifactId>
-      <version>${activemq-protobuf-version}</version>
-      <optional>false</optional>
-    </dependency>  
-  
+      <groupId>org.fusesource.hawtbuf</groupId>
+      <artifactId>hawtbuf-proto</artifactId>
+      <version>${hawtbuf-version}</version>
+    </dependency>
+
     <!-- Testing Dependencies -->    
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -81,8 +78,9 @@
     <plugins>
 
       <plugin>
-        <groupId>org.apache.activemq.protobuf</groupId>
-        <artifactId>activemq-protobuf</artifactId>
+        <groupId>org.fusesource.hawtbuf</groupId>
+        <artifactId>hawtbuf-proto</artifactId>
+        <version>${hawtbuf-version}</version>
         <configuration>
           <type>alt</type>
         </configuration>

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/DestinationEntity.java (from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/DestinationEntity.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/DestinationEntity.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/DestinationEntity.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/DestinationEntity.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/DestinationEntity.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/DestinationEntity.java Wed Jul  7 03:50:42 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -31,7 +31,7 @@ import org.apache.activemq.broker.store.
 import org.apache.activemq.broker.store.Store;
 import org.apache.activemq.broker.store.Store.DuplicateKeyException;
 import org.apache.activemq.broker.store.Store.QueueRecord;
-import org.apache.activemq.broker.store.kahadb.Data.QueueAddMessage;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueAddMessage;
 import org.fusesource.hawtdb.api.BTreeIndexFactory;
 import org.fusesource.hawtdb.api.SortedIndex;
 import org.fusesource.hawtdb.api.Transaction;

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java (from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/KahaDBStore.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/KahaDBStore.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/KahaDBStore.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/HawtDBStore.java Wed Jul  7 03:50:42 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,39 +30,39 @@ import java.util.concurrent.locks.Reentr
 
 import org.apache.activemq.broker.store.QueueDescriptor;
 import org.apache.activemq.broker.store.Store;
-import org.apache.activemq.broker.store.kahadb.Data.MapAdd;
-import org.apache.activemq.broker.store.kahadb.Data.MapEntryPut;
-import org.apache.activemq.broker.store.kahadb.Data.MapEntryRemove;
-import org.apache.activemq.broker.store.kahadb.Data.MapRemove;
-import org.apache.activemq.broker.store.kahadb.Data.MessageAdd;
-import org.apache.activemq.broker.store.kahadb.Data.QueueAdd;
-import org.apache.activemq.broker.store.kahadb.Data.QueueAddMessage;
-import org.apache.activemq.broker.store.kahadb.Data.QueueRemove;
-import org.apache.activemq.broker.store.kahadb.Data.QueueRemoveMessage;
-import org.apache.activemq.broker.store.kahadb.Data.SubscriptionAdd;
-import org.apache.activemq.broker.store.kahadb.Data.SubscriptionRemove;
-import org.apache.activemq.broker.store.kahadb.Data.Trace;
-import org.apache.activemq.broker.store.kahadb.Data.Type;
-import org.apache.activemq.broker.store.kahadb.Data.MapAdd.MapAddBean;
-import org.apache.activemq.broker.store.kahadb.Data.MapEntryPut.MapEntryPutBean;
-import org.apache.activemq.broker.store.kahadb.Data.MapEntryRemove.MapEntryRemoveBean;
-import org.apache.activemq.broker.store.kahadb.Data.MapRemove.MapRemoveBean;
-import org.apache.activemq.broker.store.kahadb.Data.MessageAdd.MessageAddBean;
-import org.apache.activemq.broker.store.kahadb.Data.QueueAdd.QueueAddBean;
-import org.apache.activemq.broker.store.kahadb.Data.QueueAddMessage.QueueAddMessageBean;
-import org.apache.activemq.broker.store.kahadb.Data.QueueRemove.QueueRemoveBean;
-import org.apache.activemq.broker.store.kahadb.Data.QueueRemoveMessage.QueueRemoveMessageBean;
-import org.apache.activemq.broker.store.kahadb.Data.SubscriptionAdd.SubscriptionAddBean;
-import org.apache.activemq.broker.store.kahadb.Data.SubscriptionRemove.SubscriptionRemoveBean;
-import org.apache.activemq.broker.store.kahadb.Data.Type.TypeCreatable;
-import org.apache.activemq.protobuf.InvalidProtocolBufferException;
-import org.apache.activemq.protobuf.MessageBuffer;
-import org.apache.activemq.protobuf.PBMessage;
+import org.apache.activemq.broker.store.hawtdb.Data.MapAdd;
+import org.apache.activemq.broker.store.hawtdb.Data.MapEntryPut;
+import org.apache.activemq.broker.store.hawtdb.Data.MapEntryRemove;
+import org.apache.activemq.broker.store.hawtdb.Data.MapRemove;
+import org.apache.activemq.broker.store.hawtdb.Data.MessageAdd;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueAdd;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueAddMessage;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueRemove;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueRemoveMessage;
+import org.apache.activemq.broker.store.hawtdb.Data.SubscriptionAdd;
+import org.apache.activemq.broker.store.hawtdb.Data.SubscriptionRemove;
+import org.apache.activemq.broker.store.hawtdb.Data.Trace;
+import org.apache.activemq.broker.store.hawtdb.Data.Type;
+import org.apache.activemq.broker.store.hawtdb.Data.MapAdd.MapAddBean;
+import org.apache.activemq.broker.store.hawtdb.Data.MapEntryPut.MapEntryPutBean;
+import org.apache.activemq.broker.store.hawtdb.Data.MapEntryRemove.MapEntryRemoveBean;
+import org.apache.activemq.broker.store.hawtdb.Data.MapRemove.MapRemoveBean;
+import org.apache.activemq.broker.store.hawtdb.Data.MessageAdd.MessageAddBean;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueAdd.QueueAddBean;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueAddMessage.QueueAddMessageBean;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueRemove.QueueRemoveBean;
+import org.apache.activemq.broker.store.hawtdb.Data.QueueRemoveMessage.QueueRemoveMessageBean;
+import org.apache.activemq.broker.store.hawtdb.Data.SubscriptionAdd.SubscriptionAddBean;
+import org.apache.activemq.broker.store.hawtdb.Data.SubscriptionRemove.SubscriptionRemoveBean;
+import org.apache.activemq.broker.store.hawtdb.Data.Type.TypeCreatable;
+import org.fusesource.hawtbuf.AsciiBuffer;
+import org.fusesource.hawtbuf.Buffer;
+import org.fusesource.hawtbuf.DataByteArrayInputStream;
+import org.fusesource.hawtbuf.proto.InvalidProtocolBufferException;
+import org.fusesource.hawtbuf.proto.MessageBuffer;
+import org.fusesource.hawtbuf.proto.PBMessage;
 import org.apache.activemq.util.LockFile;
-import org.apache.activemq.util.buffer.AsciiBuffer;
-import org.apache.activemq.util.buffer.Buffer;
-import org.apache.activemq.util.buffer.DataByteArrayInputStream;
-import org.apache.activemq.util.buffer.DataByteArrayOutputStream;
+import org.fusesource.hawtbuf.DataByteArrayOutputStream;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.fusesource.hawtdb.api.Transaction;
@@ -71,14 +71,14 @@ import org.fusesource.hawtdb.api.TxPageF
 import org.fusesource.hawtdb.internal.journal.Journal;
 import org.fusesource.hawtdb.internal.journal.Location;
 
-public class KahaDBStore implements Store {
+public class HawtDBStore implements Store {
 
     private static final int BEGIN_UNIT_OF_WORK = -1;
     private static final int END_UNIT_OF_WORK = -2;
     private static final int FLUSH = -3;
     private static final int CANCEL_UNIT_OF_WORK = -4;
 
-    private static final Log LOG = LogFactory.getLog(KahaDBStore.class);
+    private static final Log LOG = LogFactory.getLog(HawtDBStore.class);
     private static final int DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
 
     private static final org.fusesource.hawtdb.util.buffer.Buffer BEGIN_UNIT_OF_WORK_DATA = new org.fusesource.hawtdb.util.buffer.Buffer(new byte[] { BEGIN_UNIT_OF_WORK });

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/Marshallers.java (from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/Marshallers.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/Marshallers.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/Marshallers.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/Marshallers.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/Marshallers.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/Marshallers.java Wed Jul  7 03:50:42 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -22,8 +22,8 @@ import java.io.IOException;
 
 import org.apache.activemq.broker.store.QueueDescriptor;
 import org.apache.activemq.broker.store.Store.QueueRecord;
-import org.apache.activemq.util.buffer.AsciiBuffer;
-import org.apache.activemq.util.buffer.Buffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
+import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdb.util.marshaller.Marshaller;
 import org.fusesource.hawtdb.util.marshaller.VariableMarshaller;
 

Copied: activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/MessageKeys.java (from r961086, activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/MessageKeys.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/MessageKeys.java?p2=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/MessageKeys.java&p1=activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/MessageKeys.java&r1=961086&r2=961087&rev=961087&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/kahadb/MessageKeys.java (original)
+++ activemq/sandbox/activemq-apollo-actor/activemq-hawtdb/src/main/java/org/apache/activemq/broker/store/hawtdb/MessageKeys.java Wed Jul  7 03:50:42 2010
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker.store.kahadb;
+package org.apache.activemq.broker.store.hawtdb;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.util.buffer.AsciiBuffer;
+import org.fusesource.hawtbuf.AsciiBuffer;
 import org.apache.activemq.util.marshaller.Marshaller;
 import org.apache.activemq.util.marshaller.VariableMarshaller;
 import org.fusesource.hawtdb.internal.journal.Location;



Mime
View raw message