Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 36683 invoked from network); 7 Jul 2010 03:52:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Jul 2010 03:52:33 -0000 Received: (qmail 35896 invoked by uid 500); 7 Jul 2010 03:52:33 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 35845 invoked by uid 500); 7 Jul 2010 03:52:31 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 35838 invoked by uid 99); 7 Jul 2010 03:52:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jul 2010 03:52:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jul 2010 03:52:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB2472388A68; Wed, 7 Jul 2010 03:50:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r961087 [4/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 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100707035057.DB2472388A68@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/AsciiBufferAdapter.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/AsciiBufferAdapter.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/AsciiBufferAdapter.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/AsciiBufferAdapter.java Wed Jul 7 03:50:42 2010 @@ -2,7 +2,7 @@ package org.apache.activemq.apollo.jaxb; import javax.xml.bind.annotation.adapters.XmlAdapter; -import org.apache.activemq.util.buffer.AsciiBuffer; +import org.fusesource.hawtbuf.AsciiBuffer; class AsciiBufferAdapter extends XmlAdapter { @Override Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/KahaDBStoreXml.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/KahaDBStoreXml.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/KahaDBStoreXml.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/KahaDBStoreXml.java Wed Jul 7 03:50:42 2010 @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlAttr import javax.xml.bind.annotation.XmlRootElement; import org.apache.activemq.broker.store.Store; -import org.apache.activemq.broker.store.kahadb.KahaDBStore; +import org.apache.activemq.broker.store.hawtdb.HawtDBStore; @XmlRootElement(name="kahadb-store") @XmlAccessorType(XmlAccessType.FIELD) @@ -50,21 +50,21 @@ public class KahaDBStoreXml extends Stor private File directory; public Store createStore() { - KahaDBStore rc = new KahaDBStore(); + HawtDBStore rc = new HawtDBStore(); if( checkpointInterval!=null ) rc.setCheckpointInterval(checkpointInterval); if( cleanupInterval!=null ) rc.setCleanupInterval(cleanupInterval); if( purgeOnStartup!=null ) rc.setDeleteAllMessages(purgeOnStartup); - if( indexWriteAsync!=null ) - rc.setEnableIndexWriteAsync(indexWriteAsync); - if( journalDiskSyncs!=null ) - rc.setEnableJournalDiskSyncs(journalDiskSyncs); +// if( indexWriteAsync!=null ) +// rc.setEnableIndexWriteAsync(indexWriteAsync); +// if( journalDiskSyncs!=null ) +// rc.setEnableJournalDiskSyncs(journalDiskSyncs); if( failIfDatabaseIsLocked!=null ) rc.setFailIfDatabaseIsLocked(failIfDatabaseIsLocked); - if( indexWriteBatchSize!=null ) - rc.setIndexWriteBatchSize(indexWriteBatchSize); +// if( indexWriteBatchSize!=null ) +// rc.setIndexWriteBatchSize(indexWriteBatchSize); if( journalMaxFileLength!=null ) rc.setJournalMaxFileLength(journalMaxFileLength); if( directory!=null ) Modified: activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-jaxb/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java Wed Jul 7 03:50:42 2010 @@ -23,13 +23,9 @@ import javax.xml.bind.annotation.XmlAcce import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.activemq.apollo.broker.BrokerDatabase; import org.apache.activemq.apollo.broker.VirtualHost; -import org.apache.activemq.util.buffer.AsciiBuffer; @XmlRootElement(name = "virtual-host") @XmlAccessorType(XmlAccessType.FIELD) Modified: activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-selector/src/main/java/org/apache/activemq/filter/XalanXPathEvaluator.java Wed Jul 7 03:50:42 2010 @@ -22,8 +22,8 @@ import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.activemq.util.buffer.Buffer; -import org.apache.activemq.util.buffer.BufferInputStream; +import org.fusesource.hawtbuf.Buffer; +import org.fusesource.hawtbuf.BufferInputStream; import org.apache.xpath.CachedXPathAPI; import org.apache.xpath.objects.XObject; import org.w3c.dom.Document; Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/Stomp.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/Stomp.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/Stomp.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/Stomp.java Wed Jul 7 03:50:42 2010 @@ -16,8 +16,8 @@ */ package org.apache.activemq.apollo.stomp; -import org.apache.activemq.util.buffer.AsciiBuffer; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.AsciiBuffer; +import org.fusesource.hawtbuf.Buffer; public interface Stomp { Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala Wed Jul 7 03:50:42 2010 @@ -18,7 +18,7 @@ package org.apache.activemq.apollo.stomp import _root_.java.util.LinkedList import _root_.org.apache.activemq.filter.{Expression, MessageEvaluationContext} -import _root_.org.apache.activemq.util.buffer._ +import _root_.org.fusesource.hawtbuf._ import collection.mutable.ListBuffer import org.apache.activemq.apollo.broker.{Destination, BufferConversions, Message} Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala Wed Jul 7 03:50:42 2010 @@ -18,7 +18,7 @@ package org.apache.activemq.apollo.stomp import _root_.org.apache.activemq.wireformat.{WireFormat} import _root_.org.fusesource.hawtdispatch.{DispatchQueue, BaseRetained} -import _root_.org.apache.activemq.util.buffer._ +import _root_.org.fusesource.hawtbuf._ import collection.mutable.{ListBuffer, HashMap} import _root_.org.fusesource.hawtdispatch.ScalaDispatch._ Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompWireFormat.scala URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompWireFormat.scala?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompWireFormat.scala (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompWireFormat.scala Wed Jul 7 03:50:42 2010 @@ -21,7 +21,7 @@ import _root_.org.apache.activemq.apollo import _root_.org.apache.activemq.wireformat.{WireFormatFactory, WireFormat} import java.nio.ByteBuffer -import _root_.org.apache.activemq.util.buffer._ +import _root_.org.fusesource.hawtbuf._ import collection.mutable.{ListBuffer, HashMap} import AsciiBuffer._ import Stomp._ Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompBrokerPerfTest.scala Wed Jul 7 03:50:42 2010 @@ -21,7 +21,7 @@ import _root_.org.apache.activemq.apollo import _root_.org.apache.activemq.apollo.broker.perf._ import _root_.org.apache.activemq.apollo.stomp._ -import _root_.org.apache.activemq.util.buffer._ +import _root_.org.fusesource.hawtbuf._ import collection.mutable.{ListBuffer, HashMap} import AsciiBuffer._ Modified: activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompLoadClient.scala URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompLoadClient.scala?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompLoadClient.scala (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-stomp/src/test/scala/org/apache/activemq/apollo/stomp/perf/StompLoadClient.scala Wed Jul 7 03:50:42 2010 @@ -18,7 +18,7 @@ package org.apache.activemq.apollo.stomp import _root_.java.io._ import _root_.java.util.concurrent.atomic.{AtomicBoolean, AtomicLong} -import _root_.org.apache.activemq.util.buffer.AsciiBuffer +import _root_.org.fusesource.hawtbuf.AsciiBuffer import java.net.{ProtocolException, InetSocketAddress, URI, Socket} import java.lang.String._ Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/QueueDescriptor.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/QueueDescriptor.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/QueueDescriptor.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/QueueDescriptor.java Wed Jul 7 03:50:42 2010 @@ -16,7 +16,7 @@ */ package org.apache.activemq.broker.store; -import org.apache.activemq.util.buffer.AsciiBuffer; +import org.fusesource.hawtbuf.AsciiBuffer; public class QueueDescriptor { Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/Store.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/Store.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/Store.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/Store.java Wed Jul 7 03:50:42 2010 @@ -21,9 +21,8 @@ import java.util.Collection; import java.util.Iterator; import org.apache.activemq.Service; -import org.apache.activemq.broker.store.QueueDescriptor; -import org.apache.activemq.util.buffer.AsciiBuffer; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.AsciiBuffer; +import org.fusesource.hawtbuf.Buffer; /** * Interface to persistently store and access data needed by the messaging Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/memory/MemoryStore.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/memory/MemoryStore.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/memory/MemoryStore.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/main/java/org/apache/activemq/broker/store/memory/MemoryStore.java Wed Jul 7 03:50:42 2010 @@ -30,9 +30,9 @@ import java.util.concurrent.locks.Reentr import org.apache.activemq.broker.store.QueueDescriptor; import org.apache.activemq.broker.store.Store; import org.apache.activemq.util.Comparators; -import org.apache.activemq.util.buffer.AsciiBuffer; -import org.apache.activemq.util.buffer.Buffer; -import org.apache.activemq.util.buffer.ByteArrayOutputStream; +import org.fusesource.hawtbuf.AsciiBuffer; +import org.fusesource.hawtbuf.Buffer; +import org.fusesource.hawtbuf.ByteArrayOutputStream; /** * An in memory implementation of the {@link Store} interface. It does not Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StorePerformanceBase.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StorePerformanceBase.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StorePerformanceBase.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StorePerformanceBase.java Wed Jul 7 03:50:42 2010 @@ -33,9 +33,8 @@ import org.apache.activemq.broker.store. import org.apache.activemq.metric.MetricAggregator; import org.apache.activemq.metric.MetricCounter; import org.apache.activemq.metric.Period; -import org.apache.activemq.broker.store.QueueDescriptor; -import org.apache.activemq.util.buffer.AsciiBuffer; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.AsciiBuffer; +import org.fusesource.hawtbuf.Buffer; public abstract class StorePerformanceBase extends TestCase { Modified: activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StoreTestBase.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StoreTestBase.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StoreTestBase.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-store/src/test/java/org/apache/activemq/broker/store/StoreTestBase.java Wed Jul 7 03:50:42 2010 @@ -31,9 +31,8 @@ import org.apache.activemq.broker.store. import org.apache.activemq.broker.store.Store.Session; import org.apache.activemq.broker.store.Store.SubscriptionRecord; import org.apache.activemq.broker.store.Store.VoidCallback; -import org.apache.activemq.broker.store.QueueDescriptor; -import org.apache.activemq.util.buffer.AsciiBuffer; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.AsciiBuffer; +import org.fusesource.hawtbuf.Buffer; public abstract class StoreTestBase extends TestCase { Modified: activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-tcp/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java Wed Jul 7 03:50:42 2010 @@ -18,10 +18,10 @@ package org.apache.activemq.transport.tc import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.TransportListener; -import org.apache.activemq.util.buffer.DataByteArrayOutputStream; import org.apache.activemq.wireformat.WireFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.fusesource.hawtbuf.DataByteArrayOutputStream; import org.fusesource.hawtdispatch.Dispatch; import org.fusesource.hawtdispatch.DispatchQueue; import org.fusesource.hawtdispatch.DispatchSource; Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransport.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransport.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransport.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/transport/pipe/PipeTransport.java Wed Jul 7 03:50:42 2010 @@ -18,7 +18,7 @@ package org.apache.activemq.transport.pi import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.TransportListener; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; import org.apache.activemq.wireformat.WireFormat; import org.fusesource.hawtdispatch.*; Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/MultiWireFormatFactory.java Wed Jul 7 03:50:42 2010 @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.activemq.util.FactoryFinder; -import org.apache.activemq.util.buffer.Buffer; -import org.apache.activemq.util.buffer.ByteArrayInputStream; -import org.apache.activemq.util.buffer.ByteArrayOutputStream; +import org.fusesource.hawtbuf.Buffer; +import org.fusesource.hawtbuf.ByteArrayInputStream; +import org.fusesource.hawtbuf.ByteArrayOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormat.java Wed Jul 7 03:50:42 2010 @@ -25,14 +25,11 @@ import java.io.InputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import java.nio.channels.ReadableByteChannel; -import java.util.Map; -import org.apache.activemq.transport.Transport; import org.apache.activemq.util.ClassLoadingAwareObjectInputStream; -import org.apache.activemq.util.buffer.Buffer; -import org.apache.activemq.util.buffer.ByteArrayInputStream; -import org.apache.activemq.util.buffer.ByteArrayOutputStream; +import org.fusesource.hawtbuf.Buffer; +import org.fusesource.hawtbuf.ByteArrayInputStream; +import org.fusesource.hawtbuf.ByteArrayOutputStream; /** * A simple implementation which uses Object Stream serialization. Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormatFactory.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormatFactory.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormatFactory.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/ObjectStreamWireFormatFactory.java Wed Jul 7 03:50:42 2010 @@ -1,6 +1,6 @@ package org.apache.activemq.wireformat; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; public class ObjectStreamWireFormatFactory implements WireFormatFactory { Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormat.java Wed Jul 7 03:50:42 2010 @@ -20,12 +20,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.channels.ReadableByteChannel; -import java.nio.channels.SocketChannel; -import java.util.Map; -import org.apache.activemq.transport.Transport; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; /** Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/main/java/org/apache/activemq/wireformat/WireFormatFactory.java Wed Jul 7 03:50:42 2010 @@ -16,7 +16,7 @@ */ package org.apache.activemq.wireformat; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; public interface WireFormatFactory { Modified: activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-transport/src/test/java/org/apache/activemq/wireformat/mock/MockWireFormatFactory.java Wed Jul 7 03:50:42 2010 @@ -4,11 +4,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.channels.ReadableByteChannel; -import java.util.Map; -import org.apache.activemq.transport.Transport; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; import org.apache.activemq.wireformat.WireFormat; import org.apache.activemq.wireformat.WireFormatFactory; Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-util/pom.xml Wed Jul 7 03:50:42 2010 @@ -44,6 +44,12 @@ + org.fusesource.hawtbuf + hawtbuf-core + ${hawtbuf-version} + + + org.apache.geronimo.specs geronimo-jms_1.1_spec 1.1.1 Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/Hasher.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/Hasher.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/Hasher.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/Hasher.java Wed Jul 7 03:50:42 2010 @@ -19,15 +19,14 @@ package org.apache.activemq.util; import org.apache.activemq.util.marshaller.Marshaller; import org.apache.activemq.util.marshaller.VariableMarshaller; -import org.apache.activemq.util.buffer.DataByteArrayOutputStream; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; +import org.fusesource.hawtbuf.DataByteArrayOutputStream; import java.io.IOException; import java.io.DataOutput; import java.io.DataInput; import java.util.zip.Checksum; import java.util.zip.CRC32; -import java.util.zip.Adler32; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/FixedBufferMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/FixedBufferMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/FixedBufferMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/FixedBufferMarshaller.java Wed Jul 7 03:50:42 2010 @@ -20,7 +20,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; /** * Implementation of a Marshaller for Buffer objects Modified: activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/VariableBufferMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/VariableBufferMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/VariableBufferMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/activemq-util/src/main/java/org/apache/activemq/util/marshaller/VariableBufferMarshaller.java Wed Jul 7 03:50:42 2010 @@ -20,7 +20,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; /** * Implementation of a Marshaller for Buffer objects Modified: activemq/sandbox/activemq-apollo-actor/pom.xml URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/pom.xml (original) +++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul 7 03:50:42 2010 @@ -92,6 +92,7 @@ 1.1-SNAPSHOT 1.0-SNAPSHOT 1.1-SNAPSHOT + 1.0-SNAPSHOT 2.8.0.Beta1 1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT @@ -127,7 +128,6 @@ activemq-util - activemq-protobuf activemq-transport activemq-store activemq-broker @@ -160,12 +160,12 @@ - - - apache.snapshots - https://repository.apache.org/content/repositories/snapshots/ - - + + + + + + @@ -245,7 +245,7 @@ 1.0 - org.apache.activemq.protobuf + org.fusesource.hawtbuf.proto activemq-protobuf 1.1-SNAPSHOT Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoded.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoded.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoded.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/Encoded.java Wed Jul 7 03:50:42 2010 @@ -20,7 +20,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/BaseEncoder.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/BaseEncoder.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/BaseEncoder.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/BaseEncoder.java Wed Jul 7 03:50:42 2010 @@ -28,7 +28,7 @@ import org.apache.activemq.amqp.generato import org.apache.activemq.amqp.generator.handcoded.marshaller.v1_0_0.AmqpSymbolMarshaller.SYMBOL_ENCODING; import org.apache.activemq.amqp.generator.handcoded.BitUtils; import org.apache.activemq.amqp.generator.handcoded.marshaller.AmqpEncodingError; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// @@ -541,4 +541,4 @@ class BaseEncoder implements PrimitiveEn dos.writeLong(val.getMostSignificantBits()); dos.writeLong(val.getLeastSignificantBits()); } -} \ No newline at end of file +} Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/Encoder.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/Encoder.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/Encoder.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/handcoded/org/apache/activemq/amqp/generator/handcoded/marshaller/v1_0_0/Encoder.java Wed Jul 7 03:50:42 2010 @@ -35,7 +35,7 @@ import org.apache.activemq.amqp.generato import org.apache.activemq.amqp.generator.handcoded.types.AmqpType; import org.apache.activemq.amqp.generator.handcoded.types.IAmqpList; import org.apache.activemq.amqp.generator.handcoded.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpClass.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpClass.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpClass.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/AmqpClass.java Wed Jul 7 03:50:42 2010 @@ -232,7 +232,7 @@ public class AmqpClass { imports.add(generator.getPackagePrefix() + ".marshaller.Encoded"); imports.add(generator.getMarshallerPackage() + ".Encoder"); imports.add(generator.getMarshallerPackage() + ".Encoder.*"); - imports.add("org.apache.activemq.util.buffer.Buffer"); + imports.add("org.fusesource.hawtbuf.Buffer"); if (isDescribed()) { @@ -271,7 +271,7 @@ public class AmqpClass { imports.add(generator.getPackagePrefix() + ".marshaller.AmqpEncodingError"); imports.add(generator.getPackagePrefix() + ".marshaller.AmqpMarshaller"); imports.add(generator.getPackagePrefix() + ".marshaller.Encoded"); - imports.add("org.apache.activemq.util.buffer.Buffer"); + imports.add("org.fusesource.hawtbuf.Buffer"); imports.add("java.io.IOException"); imports.add("java.io.DataOutput"); imports.add("java.io.DataInput"); Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/TypeRegistry.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/TypeRegistry.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/TypeRegistry.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/src/main/java/org/apache/activemq/amqp/generator/TypeRegistry.java Wed Jul 7 03:50:42 2010 @@ -2,7 +2,6 @@ package org.apache.activemq.amqp.generat import java.util.Collection; import java.util.HashMap; -import java.util.StringTokenizer; public class TypeRegistry { Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/broker/AmqpMessageDelivery.java Wed Jul 7 03:50:42 2010 @@ -7,8 +7,8 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.apollo.broker.BrokerMessageDelivery; import org.apache.activemq.apollo.broker.Destination; import org.apache.activemq.filter.MessageEvaluationContext; -import org.apache.activemq.util.buffer.AsciiBuffer; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.AsciiBuffer; +import org.fusesource.hawtbuf.Buffer; public class AmqpMessageDelivery extends BrokerMessageDelivery { Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/AmqpMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/AmqpMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/AmqpMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/AmqpMarshaller.java Wed Jul 7 03:50:42 2010 @@ -78,7 +78,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpXid; import org.apache.activemq.amqp.protocol.types.IAmqpList; import org.apache.activemq.amqp.protocol.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// @@ -418,4 +418,4 @@ public interface AmqpMarshaller { public Encoded decodeAmqpUint(Buffer source, int offset) throws AmqpEncodingError; public Encoded unmarshalAmqpUint(DataInput in) throws IOException, AmqpEncodingError; -} \ No newline at end of file +} Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/Encoded.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/Encoded.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/Encoded.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/Encoded.java Wed Jul 7 03:50:42 2010 @@ -20,7 +20,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.activemq.amqp.protocol.marshaller.AmqpEncodingError; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpAttachMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpAttachMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpAttachMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpAttachMarshaller.java Wed Jul 7 03:50:42 2010 @@ -34,7 +34,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUint; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBarMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBarMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBarMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBarMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBinaryMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBinaryMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBinaryMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBinaryMarshaller.java Wed Jul 7 03:50:42 2010 @@ -27,7 +27,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpBinary; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBooleanMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBooleanMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBooleanMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpBooleanMarshaller.java Wed Jul 7 03:50:42 2010 @@ -28,7 +28,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpBoolean; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpByteMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpByteMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpByteMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpByteMarshaller.java Wed Jul 7 03:50:42 2010 @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpByte; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCharMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCharMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCharMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCharMarshaller.java Wed Jul 7 03:50:42 2010 @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpChar; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCloseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCloseMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCloseMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCloseMarshaller.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.amqp.protocol.marshaller.v1_0_0; +package org.apache.activemq.amqp.protocol.marshaller.v1_0_0; import java.io.DataInput; import java.io.IOException; @@ -30,7 +30,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.buffer.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCompletedMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCompletedMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCompletedMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpCompletedMarshaller.java Wed Jul 7 03:50:42 2010 @@ -30,7 +30,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpConnectionErrorMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpConnectionErrorMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpConnectionErrorMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpConnectionErrorMarshaller.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.amqp.protocol.marshaller.v1_0_0; +package org.apache.activemq.amqp.protocol.marshaller.v1_0_0; import java.io.DataInput; import java.io.IOException; @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.AmqpUshort; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.buffer.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDetachMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDetachMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDetachMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDetachMarshaller.java Wed Jul 7 03:50:42 2010 @@ -32,7 +32,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDispositionMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDispositionMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDispositionMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDispositionMarshaller.java Wed Jul 7 03:50:42 2010 @@ -32,7 +32,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDoubleMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDoubleMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDoubleMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDoubleMarshaller.java Wed Jul 7 03:50:42 2010 @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpDouble; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDrainMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDrainMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDrainMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpDrainMarshaller.java Wed Jul 7 03:50:42 2010 @@ -30,7 +30,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpEnlistMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpEnlistMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpEnlistMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpEnlistMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.AmqpXid; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFilterMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFilterMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFilterMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFilterMarshaller.java Wed Jul 7 03:50:42 2010 @@ -28,7 +28,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFloatMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFloatMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFloatMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFloatMarshaller.java Wed Jul 7 03:50:42 2010 @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpFloat; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFlowMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFlowMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFlowMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFlowMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFooterMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFooterMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFooterMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFooterMarshaller.java Wed Jul 7 03:50:42 2010 @@ -29,7 +29,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFragmentMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFragmentMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFragmentMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpFragmentMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUint; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpHeaderMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpHeaderMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpHeaderMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpHeaderMarshaller.java Wed Jul 7 03:50:42 2010 @@ -33,7 +33,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUint; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpIntMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpIntMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpIntMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpIntMarshaller.java Wed Jul 7 03:50:42 2010 @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpInt; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkErrorMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkErrorMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkErrorMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkErrorMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.AmqpUshort; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLinkMarshaller.java Wed Jul 7 03:50:42 2010 @@ -34,7 +34,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUbyte; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpListMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpListMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpListMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpListMarshaller.java Wed Jul 7 03:50:42 2010 @@ -29,7 +29,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpList; import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLongMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLongMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLongMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpLongMarshaller.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.amqp.protocol.marshaller.v1_0_0; +package org.apache.activemq.amqp.protocol.marshaller.v1_0_0; import java.io.DataInput; import java.io.DataOutput; @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpLong; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.buffer.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMapMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMapMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMapMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMapMarshaller.java Wed Jul 7 03:50:42 2010 @@ -29,7 +29,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpMap; import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpMarshaller.java Wed Jul 7 03:50:42 2010 @@ -83,7 +83,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpXid; import org.apache.activemq.amqp.protocol.types.IAmqpList; import org.apache.activemq.amqp.protocol.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// @@ -976,4 +976,4 @@ public class AmqpMarshaller implements o public Encoded unmarshalAmqpUint(DataInput in) throws IOException, AmqpEncodingError { return AmqpUintMarshaller.createEncoded(in); } -} \ No newline at end of file +} Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNoopMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNoopMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNoopMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNoopMarshaller.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.amqp.protocol.marshaller.v1_0_0; +package org.apache.activemq.amqp.protocol.marshaller.v1_0_0; import java.io.DataInput; import java.io.IOException; @@ -29,7 +29,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.buffer.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNullMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNullMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNullMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpNullMarshaller.java Wed Jul 7 03:50:42 2010 @@ -25,7 +25,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder; import org.apache.activemq.amqp.protocol.marshaller.v1_0_0.Encoder.*; import org.apache.activemq.amqp.protocol.types.AmqpNull; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpOpenMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpOpenMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpOpenMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpOpenMarshaller.java Wed Jul 7 03:50:42 2010 @@ -34,7 +34,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.AmqpUshort; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpPropertiesMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpPropertiesMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpPropertiesMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpPropertiesMarshaller.java Wed Jul 7 03:50:42 2010 @@ -30,7 +30,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpList; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpRejectedMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpRejectedMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpRejectedMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpRejectedMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!// Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpReleasedMarshaller.java URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpReleasedMarshaller.java?rev=961087&r1=961086&r2=961087&view=diff ============================================================================== --- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpReleasedMarshaller.java (original) +++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/src/main/java/org/apache/activemq/amqp/protocol/marshaller/v1_0_0/AmqpReleasedMarshaller.java Wed Jul 7 03:50:42 2010 @@ -31,7 +31,7 @@ import org.apache.activemq.amqp.protocol import org.apache.activemq.amqp.protocol.types.AmqpType; import org.apache.activemq.amqp.protocol.types.AmqpUlong; import org.apache.activemq.amqp.protocol.types.IAmqpMap; -import org.apache.activemq.util.buffer.Buffer; +import org.fusesource.hawtbuf.Buffer; //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// //!!!!!!!!THIS CLASS IS AUTOGENERATED DO NOT MODIFY DIRECTLY!!!!!!!!!!!!//